Merge pull request #356 from simpleton/bug/array_in_parcelable

FIX #354 `android.os.BadParcelableException: ClassNotFoundException …
joelittlejohn · May 15, 2015 · f062aef · f062aef
2 parents c048810 + a9846c4
commit f062aef
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/util/ParcelableHelper.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/util/ParcelableHelper.java
@@ -35,7 +35,11 @@ public void addWriteToParcel(JDefinedClass jclass) {
         method.param(int.class, "flags");
 
         for (JFieldVar f : jclass.fields().values()) {
-            method.body().invoke(dest, "writeValue").arg(f);
+            if (f.type().isArray()) {
+                method.body().invoke(dest, "writeList").arg(f);
+            } else {
+                method.body().invoke(dest, "writeValue").arg(f);
+            }
         }
     }
 
@@ -66,7 +70,21 @@ private void addCreateFromParcel(JDefinedClass jclass, JDefinedClass creatorClas
         JVar in = createFromParcel.param(Parcel.class, "in");
         JVar instance = createFromParcel.body().decl(jclass, "instance", JExpr._new(jclass));
         for (JFieldVar f : jclass.fields().values()) {
-            createFromParcel.body().assign(instance.ref(f), JExpr.cast(f.type(), in.invoke("readValue").arg(JExpr.direct(f.type().erasure().name() + ".class.getClassLoader()"))));
+            if (f.type().isArray()) {
+                createFromParcel.body()
+                        .invoke(in, "readList")
+                        .arg(instance.ref(f))
+                        .arg(JExpr.direct(f.type().erasure().name() + ".class.getClassLoader()"));
+             } else {
+                createFromParcel.body().assign(
+                        instance.ref(f),
+                        JExpr.cast(
+                                f.type(),
+                                in.invoke("readValue").arg(JExpr.direct(f.type().erasure().name() + ".class.getClassLoader()"))
+                        )
+                );
+            }
+
         }
         createFromParcel.body()._return(instance);
     }