Allowing to re-save installation if LDS is enabled

Author: hermanliang

Parse/Internal/LocalDataStore/OfflineStore/PFOfflineStore.m

@@ -1000,7 +1000,13 @@ - (void)updateObjectIdForObject:(PFObject *)object
                     oldObjectId:(NSString *)oldObjectId
                     newObjectId:(NSString *)newObjectId {
     if (oldObjectId != nil) {
-        PFConsistencyAssert([oldObjectId isEqualToString:newObjectId], @"objectIds cannot be changed in offline mode.");
+        if ([object isKindOfClass:[PFInstallation class]]
+            && newObjectId == nil) {
+            NSString *key = [self _generateKeyForClassName:object.parseClassName objectId:oldObjectId];
+            [self.classNameAndObjectIdToObjectMap removeObjectForKey:key];
+        } else {
+            PFConsistencyAssert([oldObjectId isEqualToString:newObjectId], @"objectIds cannot be changed in offline mode.");
+        }
         return;
     }
 

Parse/PFInstallation.m

@@ -28,6 +28,7 @@
 #import "PFQueryPrivate.h"
 #import "Parse_Private.h"
 #import "PFErrorUtilities.h"
+#import "PFObjectState_Private.h"
 
 @implementation PFInstallation (Private)
 
@@ -83,6 +84,14 @@ - (NSString *)displayClassName {
     return NSStringFromClass([PFInstallation class]);
 }
 
+///--------------------------------------
+#pragma mark - Properties
+///--------------------------------------
+
+- (void) setObjectId:(NSString *)objectId {
+    PFParameterAssertionFailure(@"Installation's objectIds cannot be changed");
+}
+
 ///--------------------------------------
 #pragma mark - Command Handlers
 ///--------------------------------------
@@ -223,16 +232,13 @@ - (void)setChannels:(NSArray<NSString *> *)channels {
 
 - (BFTask *)saveAsync:(BFTask *)toAwait {
     return [[super saveAsync:toAwait] continueWithBlock:^id(BFTask *task) {
-        // Do not attempt to resave an object if LDS is enabled, since changing objectId is not allowed.
-        if ([Parse _currentManager].offlineStoreLoaded) {
-            return task;
-        }
-
         if (task.error.code == kPFErrorObjectNotFound) {
             @synchronized (self.lock) {
                 // Retry the fetch as a save operation because this Installation was deleted on the server.
                 // We always want [currentInstallation save] to succeed.
-                self.objectId = nil;
+                PFObjectState *state = [PFObjectState stateWithState:self._state];
+                state.objectId = nil;
+                self._state = state;
                 [self _markAllFieldsDirty];
                 return [super saveAsync:nil];
             }