Swallow consistency error when decoding

Author: flovilmart

Parse/Parse/Internal/LocalDataStore/OfflineStore/PFOfflineStore.m

@@ -264,7 +264,10 @@ - (instancetype)initWithFileManager:(PFFileManager *)fileManager options:(PFOffl
         NSArray *objectValues = offlineObjects.allValues;
         return [[BFTask taskForCompletionOfAllTasks:objectValues] continueWithSuccessBlock:^id(BFTask *task) {
             PFDecoder *decoder = [PFOfflineDecoder decoderWithOfflineObjects:offlineObjects];
-            [object mergeFromRESTDictionary:parsedJson withDecoder:decoder];
+            NSError *error;
+            if (![object mergeFromRESTDictionary:parsedJson withDecoder:decoder error:&error] && error) {
+                return [BFTask taskWithError:error];
+            }
             return nil;
         }];
     }] continueWithBlock:^id(BFTask *task) {

Parse/Parse/Internal/Object/PFObjectPrivate.h

@@ -253,8 +253,9 @@
                           deletingEventuallyCount:(NSUInteger)deletingEventuallyCount
                                             error:(NSError **)error;
 
-- (void)mergeFromRESTDictionary:(NSDictionary *)object
-                    withDecoder:(PFDecoder *)decoder;
+- (BOOL)mergeFromRESTDictionary:(NSDictionary *)object
+                    withDecoder:(PFDecoder *)decoder
+                          error:(NSError **)error;
 
 ///--------------------------------------
 #pragma mark - Data helpers

Parse/Parse/PFObject.m

@@ -927,7 +927,7 @@ - (NSDictionary *)RESTDictionaryWithObjectEncoder:(PFEncoder *)objectEncoder
     return result;
 }
 
-- (void)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *)decoder {
+- (BOOL)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *)decoder error:(NSError **)error {
     @synchronized (lock) {
         BOOL mergeServerData = NO;
 
@@ -942,6 +942,8 @@ - (void)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *)
         } else if (!state.updatedAt) {
             mergeServerData = YES;
         }
+        __block BOOL hasFailed = NO;
+        __block NSError* remoteOpSetError = nil;
         [object enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
             if ([key isEqualToString:PFObjectOperationsRESTKey]) {
                 PFOperationSet *remoteOperationSet = nil;
@@ -985,7 +987,13 @@ - (void)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *)
                     [localOperationSet.updatedAt compare:remoteOperationSet.updatedAt] != NSOrderedAscending) {
                     [localOperationSet mergeOperationSet:remoteOperationSet];
                 } else {
-                    PFConsistencyAssert(remoteOperationSet, @"'remoteOperationSet' should not be nil.");
+                    if (!remoteOperationSet) {
+                        NSString *message = [NSString stringWithFormat:@"'remoteOperationSet' should not be nil in object of class %@", self.parseClassName];
+                        remoteOpSetError = [PFErrorUtilities errorWithCode:-1 message:message];
+                        hasFailed = YES;
+                        *stop  = YES;
+                        return;
+                    }
                     NSUInteger index = [operationSetQueue indexOfObject:localOperationSet];
                     [remoteOperationSet mergeOperationSet:localOperationSet];
                     operationSetQueue[index] = remoteOperationSet;
@@ -1037,6 +1045,10 @@ - (void)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *)
             id decodedObject = [decoder decodeObject:obj];
             [state setServerDataObject:decodedObject forKey:key];
         }];
+        if (hasFailed && error) {
+            *error = remoteOpSetError;
+            return NO;
+        }
         if (state.updatedAt == nil && state.createdAt != nil) {
             state.updatedAt = state.createdAt;
         }
@@ -1053,6 +1065,7 @@ - (void)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *)
             }
         }
         [self rebuildEstimatedData];
+        return YES;
     }
 }
 

Parse/Parse/PFUser.m

@@ -631,7 +631,7 @@ - (PFRESTCommand *)_constructSaveCommandForChanges:(PFOperationSet *)changes
 #pragma mark - REST operations
 ///--------------------------------------
 
-- (void)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *)decoder {
+- (BOOL)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *)decoder error:(NSError **)error {
     @synchronized([self lock]) {
         NSMutableDictionary *restDictionary = [object mutableCopy];
 
@@ -656,7 +656,7 @@ - (void)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *)
 
         self._state = state;
 
-        [super mergeFromRESTDictionary:restDictionary withDecoder:decoder];
+        return [super mergeFromRESTDictionary:restDictionary withDecoder:decoder error:error];
     }
 }