Status implements Parcelable (#155)

lostzen · Jan 13, 2017 · 27cd5af · 27cd5af
1 parent 560ce0a
commit 27cd5af
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 3 deletions.
diff --git a/lost/src/main/java/com/mapzen/android/lost/api/Status.java b/lost/src/main/java/com/mapzen/android/lost/api/Status.java
@@ -5,11 +5,13 @@
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.IntentSender;
+import android.os.Parcel;
+import android.os.Parcelable;
 
 /**
  * Represents the result of a {@link LocationServices} API call.
  */
-public class Status implements Result {
+public class Status implements Result, Parcelable {
 
   public static final int SUCCESS = 0;
   public static final int RESOLUTION_REQUIRED = 6;
@@ -62,6 +64,23 @@ public Status(int statusCode, DialogDisplayer dialogDisplayer, PendingIntent pen
     this.dialogDisplayer = dialogDisplayer;
   }
 
+  protected Status(Parcel in) {
+    statusCode = in.readInt();
+    statusMessage = in.readString();
+    pendingIntent = in.readParcelable(PendingIntent.class.getClassLoader());
+    dialogDisplayer = in.readParcelable(DialogDisplayer.class.getClassLoader());
+  }
+
+  public static final Creator<Status> CREATOR = new Creator<Status>() {
+    @Override public Status createFromParcel(Parcel in) {
+      return new Status(in);
+    }
+
+    @Override public Status[] newArray(int size) {
+      return new Status[size];
+    }
+  };
+
   /**
    * If the status code is {@link Status#RESOLUTION_REQUIRED}, then this method can be called to
    * start the resolution. For example, it will launch the Settings {@link Activity} so that the
@@ -141,4 +160,16 @@ public PendingIntent getResolution() {
   @Override public Status getStatus() {
     return this;
   }
+
+
+  @Override public int describeContents() {
+    return 0;
+  }
+
+  @Override public void writeToParcel(Parcel parcel, int i) {
+    parcel.writeInt(statusCode);
+    parcel.writeString(statusMessage);
+    parcel.writeParcelable(pendingIntent, i);
+    parcel.writeParcelable(dialogDisplayer, i);
+  }
 }
diff --git a/lost/src/main/java/com/mapzen/android/lost/internal/DialogDisplayer.java b/lost/src/main/java/com/mapzen/android/lost/internal/DialogDisplayer.java
@@ -2,12 +2,13 @@
 
 import android.app.Activity;
 import android.app.PendingIntent;
+import android.os.Parcelable;
 
 /**
  * Interface for displaying a dialog in an {@link android.app.Activity} for a given code and
  * {@link android.app.PendingIntent}.
  */
-public interface DialogDisplayer {
+public interface DialogDisplayer extends Parcelable {
   /**
    * Implementing class should display a dialog in the given {@link android.app.Activity} passing
    * the request and {@link android.app.PendingIntent}.

diff --git a/lost/src/main/java/com/mapzen/android/lost/internal/SettingsDialogDisplayer.java b/lost/src/main/java/com/mapzen/android/lost/internal/SettingsDialogDisplayer.java
@@ -4,15 +4,35 @@
 import android.app.PendingIntent;
 import android.content.DialogInterface;
 import android.content.IntentSender;
+import android.os.Parcel;
+import android.os.Parcelable;
 
 /**
  * Handles displaying a dialog to the user so that they can optionally update their device location
  * settings.
  */
-public class SettingsDialogDisplayer implements DialogDisplayer {
+public class SettingsDialogDisplayer implements DialogDisplayer, Parcelable {
 
   private static final String SETTINGS_DIALOG_TAG = "settings-dialog";
 
+  public SettingsDialogDisplayer() {
+
+  }
+
+  protected SettingsDialogDisplayer(Parcel in) {
+  }
+
+  public static final Creator<SettingsDialogDisplayer> CREATOR =
+      new Creator<SettingsDialogDisplayer>() {
+        @Override public SettingsDialogDisplayer createFromParcel(Parcel in) {
+          return new SettingsDialogDisplayer(in);
+        }
+
+        @Override public SettingsDialogDisplayer[] newArray(int size) {
+          return new SettingsDialogDisplayer[size];
+        }
+      };
+
   @Override public void displayDialog(final Activity activity, final int requestCode,
       final PendingIntent pendingIntent) {
     SettingsDialogFragment fragment = new SettingsDialogFragment();
@@ -28,4 +48,11 @@ public class SettingsDialogDisplayer implements DialogDisplayer {
     });
     fragment.show(activity.getFragmentManager(), SETTINGS_DIALOG_TAG);
   }
+
+  @Override public int describeContents() {
+    return 0;
+  }
+
+  @Override public void writeToParcel(Parcel parcel, int i) {
+  }
 }
diff --git a/lost/src/test/java/com/mapzen/android/lost/internal/TestSettingsDialogDisplayer.java b/lost/src/test/java/com/mapzen/android/lost/internal/TestSettingsDialogDisplayer.java
@@ -2,11 +2,29 @@
 
 import android.app.Activity;
 import android.app.PendingIntent;
+import android.os.Parcel;
 
 public class TestSettingsDialogDisplayer implements DialogDisplayer {
 
   boolean displayed = false;
 
+  public TestSettingsDialogDisplayer() {
+  }
+
+  protected TestSettingsDialogDisplayer(Parcel in) {
+  }
+
+  public static final Creator<TestSettingsDialogDisplayer> CREATOR =
+      new Creator<TestSettingsDialogDisplayer>() {
+        @Override public TestSettingsDialogDisplayer createFromParcel(Parcel in) {
+          return new TestSettingsDialogDisplayer(in);
+        }
+
+        @Override public TestSettingsDialogDisplayer[] newArray(int size) {
+          return new TestSettingsDialogDisplayer[size];
+        }
+      };
+
   @Override
   public void displayDialog(Activity activity, int requestCode, PendingIntent pendingIntent) {
     displayed = true;
@@ -15,4 +33,12 @@ public void displayDialog(Activity activity, int requestCode, PendingIntent pend
   public boolean isDisplayed() {
     return displayed;
   }
+
+  @Override public int describeContents() {
+    return 0;
+  }
+
+  @Override public void writeToParcel(Parcel parcel, int i) {
+
+  }
 }