Update encoder/decoder

Author: natario1

Parse/src/main/java/com/parse/ParseFile.java

@@ -225,14 +225,25 @@ public ParseFile(byte[] data, String contentType) {
   }
 
   /**
-   * Creates a new file instance from a Parcel {@code source}. This is used when unparceling
+   * Creates a new file instance from a {@link Parcel} source. This is used when unparceling
    * a non-dirty ParseFile. Subclasses that need Parcelable behavior should provide their own
    * {@link android.os.Parcelable.Creator} and override this constructor.
    *
    * @param source
    *          the source Parcel
    */
   protected ParseFile(Parcel source) {
+    this(source, ParseParcelDecoder.get());
+  }
+
+  /**
+   * Creates a new file instance from a {@link Parcel} using the given {@link ParseParcelDecoder}.
+   * The decoder is currently unused, but it might be in the future, plus this is the pattern we
+   * are using in parcelable classes.
+   * @param source the parcel
+   * @param decoder the decoder
+   */
+  ParseFile(Parcel source, ParseParcelDecoder decoder) {
     this(new State.Builder()
           .url(source.readString())
           .name(source.readString())
@@ -732,6 +743,10 @@ public int describeContents() {
 
   @Override
   public void writeToParcel(Parcel dest, int flags) {
+    writeToParcel(dest, ParseParcelEncoder.get());
+  }
+
+  void writeToParcel(Parcel dest, ParseParcelEncoder encoder) {
     if (isDirty()) {
       throw new RuntimeException("Unable to parcel an unsaved ParseFile.");
     }

Parse/src/main/java/com/parse/ParseParcelDecoder.java

@@ -59,6 +59,9 @@ public Object decode(Parcel source) {
       case ParseParcelEncoder.TYPE_OP:
         return ParseFieldOperations.decode(source, this);
 
+      case ParseParcelEncoder.TYPE_FILE:
+        return new ParseFile(source, this);
+
       case ParseParcelEncoder.TYPE_ACL:
         return new ParseACL(source, this);
 

Parse/src/main/java/com/parse/ParseParcelEncoder.java

@@ -53,6 +53,7 @@ private static boolean isValidType(Object value) {
   /* package */ final static String TYPE_NULL = "Null";
   /* package */ final static String TYPE_NATIVE = "Native";
   /* package */ final static String TYPE_OP = "Operation";
+  /* package */ final static String TYPE_FILE = "ParseFile";
 
   public void encode(Object object, Parcel dest) {
     try {
@@ -75,7 +76,8 @@ public void encode(Object object, Parcel dest) {
         ((ParseFieldOperation) object).encode(dest, this);
 
       } else if (object instanceof ParseFile) {
-        throw new IllegalArgumentException("Not supported yet");
+        dest.writeString(TYPE_FILE);
+        ((ParseFile) object).writeToParcel(dest, this);
 
       } else if (object instanceof ParseGeoPoint) {
         throw new IllegalArgumentException("Not supported yet");

Parse/src/test/java/com/parse/ParseObjectTest.java

@@ -497,7 +497,7 @@ public void testGetLongWithWrongValue() throws Exception {
 
   @Test
   public void testParcelable() throws Exception {
-    // TODO test ParseGeoPoint and ParseFile after merge
+    // TODO test ParseGeoPoint after merge
     ParseObject object = ParseObject.createWithoutData("Test", "objectId");
     object.isDeleted = true;
     object.put("long", 200L);
@@ -528,6 +528,9 @@ public void testParcelable() throws Exception {
     ParseRelation<ParseObject> rel = new ParseRelation<>(object, "relation");
     rel.add(related);
     object.put("relation", rel);
+    // File
+    ParseFile file = new ParseFile(new ParseFile.State.Builder().url("fileUrl").build());
+    object.put("file", file);
 
     Parcel parcel = Parcel.obtain();
     object.writeToParcel(parcel, 0);
@@ -553,6 +556,7 @@ public void testParcelable() throws Exception {
     assertEquals(newRel.getKey(), rel.getKey());
     assertEquals(newRel.getKnownObjects().size(), rel.getKnownObjects().size());
     newRel.hasKnownObject(related);
+    assertEquals(newObject.getParseFile("file").getUrl(), object.getParseFile("file").getUrl());
   }
 
   @Test