Attempt to re-save installation if Installation was deleted on the server

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

@@ -137,6 +137,28 @@ public Task<T> then(Task<Void> task) throws Exception {
     }
   }
 
+  @Override
+  /* package */ Task<Void> saveAsync(final String sessionToken, final Task<Void> toAwait) {
+    return super.saveAsync(sessionToken, toAwait).continueWithTask(new Continuation<Void, Task<Void>>() {
+      @Override
+      public Task<Void> then(Task<Void> task) throws Exception {
+        // Retry the fetch as a save operation because this Installation was deleted on the server.
+        // Do not attempt to resave an object if LDS is enabled, since changing objectId is not allowed.
+        if(!Parse.isLocalDatastoreEnabled()
+                && task.getError() != null
+                && task.getError() instanceof ParseException
+                && ((ParseException) task.getError()).getCode() == ParseException.OBJECT_NOT_FOUND) {
+          synchronized (mutex) {
+            setObjectId(null);
+            markAllFieldDirty();
+            return ParseInstallation.super.saveAsync(sessionToken, toAwait);
+          }
+        }
+        return task;
+      }
+    });
+  }
+
   @Override
   /* package */ Task<Void> handleSaveResultAsync(ParseObject.State result,
       ParseOperationSet operationsBeforeSave) {

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

@@ -2815,6 +2815,15 @@ private void rebuildEstimatedData() {
     }
   }
 
+  /* package */ void markAllFieldDirty() {
+    synchronized (mutex) {
+      estimatedData.clear();
+      for (String key : state.keySet()) {
+        performPut(key, state.get(key));
+      }
+    }
+  }
+
   /**
    * performOperation() is like {@link #put(String, Object)} but instead of just taking a new value,
    * it takes a ParseFieldOperation that modifies the value.

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

@@ -29,9 +29,11 @@
 import bolts.Task;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -108,6 +110,50 @@ public void testImmutableKeys() {
     }
   }
 
+  @Test
+  public void testSaveAsync() throws Exception {
+    String sessionToken = "sessionToken";
+    Task<Void> toAwait = Task.forResult(null);
+
+    ParseCurrentInstallationController controller =
+        mock(ParseCurrentInstallationController.class);
+    ParseInstallation currentInstallation = new ParseInstallation();
+    when(controller.getAsync())
+        .thenReturn(Task.forResult(currentInstallation));
+    ParseCorePlugins.getInstance()
+        .registerCurrentInstallationController(controller);
+    ParseObject.State state = new ParseObject.State.Builder("_Installation")
+        .put("deviceToken", "deviceToken")
+        .build();
+    ParseInstallation installation = ParseInstallation.getCurrentInstallation();
+    assertNotNull(installation);
+    installation.setState(state);
+
+    ParseObjectController objController = mock(ParseObjectController.class);
+    // mock return task when Installation was deleted on the server
+    Task<ParseObject.State> taskError = Task.forError(new ParseException(ParseException.OBJECT_NOT_FOUND, ""));
+    // mock return task when Installation was re-saved to the server
+    Task<ParseObject.State> task = Task.forResult(null);
+    when(objController.saveAsync(
+        any(ParseObject.State.class),
+        any(ParseOperationSet.class),
+        eq(sessionToken),
+        any(ParseDecoder.class)))
+        .thenReturn(taskError)
+        .thenReturn(task);
+    ParseCorePlugins.getInstance()
+        .registerObjectController(objController);
+
+    installation.saveAsync(sessionToken, toAwait);
+
+    verify(controller).getAsync();
+    verify(objController, times(2)).saveAsync(
+        any(ParseObject.State.class),
+        any(ParseOperationSet.class),
+        eq(sessionToken),
+        any(ParseDecoder.class));
+  }
+
   @Test
   public void testHandleSaveResultAsync() throws Exception {
     // Mock currentInstallationController to make setAsync work