Fixed PFInstallation not updating automatic fields when using PFObjec…

…t.saveAll().
parse-community · Sep 16, 2015 · 6522ff3 · 6522ff3
1 parent 2882c8e
commit 6522ff3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/Parse/Internal/Object/PFObjectPrivate.h b/Parse/Internal/Object/PFObjectPrivate.h
@@ -38,6 +38,8 @@
 
 @protocol PFObjectPrivateSubclass <NSObject>
 
+@required
+
 ///--------------------------------------
 /// @name State
 ///--------------------------------------
@@ -58,6 +60,18 @@
  */
 - (BFTask *)_validateSaveEventuallyAsync;
 
+@optional
+
+///--------------------------------------
+/// @name Before Save
+///--------------------------------------
+
+/*!
+ Called before an object is going to be saved. Called in a context of object lock.
+ Subclasses can override this method to do any custom updates before an object gets saved.
+ */
+- (void)_objectWillSave;
+
 @end
 
 ///--------------------------------------

diff --git a/Parse/PFInstallation.m b/Parse/PFInstallation.m
@@ -214,21 +214,6 @@ - (void)setChannels:(NSArray *)channels {
 #pragma mark - PFObject
 ///--------------------------------------
 
-- (BFTask *)saveInBackground {
-    [self _updateAutomaticInfo];
-    return [super saveInBackground];
-}
-
-- (BFTask *)_enqueueSaveEventuallyWithChildren:(BOOL)saveChildren {
-    [self _updateAutomaticInfo];
-    return [super _enqueueSaveEventuallyWithChildren:saveChildren];
-}
-
-- (BFTask *)saveEventually {
-    [self _updateAutomaticInfo];
-    return [super saveEventually];
-}
-
 - (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.
@@ -257,7 +242,7 @@ - (BOOL)needsDefaultACL {
 #pragma mark - Automatic Info
 ///--------------------------------------
 
-- (void)_updateAutomaticInfo {
+- (void)_objectWillSave {
     if ([self _isCurrentInstallation]) {
         @synchronized(self.lock) {
             [self _updateTimeZoneFromDevice];

diff --git a/Parse/PFObject.m b/Parse/PFObject.m
@@ -476,6 +476,7 @@ + (BFTask *)_deepSaveAsync:(id)object withCurrentUser:(PFUser *)currentUser sess
                         for (PFObject *object in objectBatch) {
                             PFRESTCommand *command = nil;
                             @synchronized ([object lock]) {
+                                [object _objectWillSave];
                                 [object _checkSaveParametersWithCurrentUser:currentUser];
                                 command = [object _constructSaveCommandForChanges:[object unsavedChanges]
                                                                      sessionToken:sessionToken
@@ -1148,6 +1149,7 @@ - (BFTask *)_enqueueSaveEventuallyWithChildren:(BOOL)saveChildren {
             return [self _validateSaveEventuallyAsync];
         }] continueWithSuccessBlock:^id(BFTask *task) {
             @synchronized (lock) {
+                [self _objectWillSave];
                 if (![self isDirty:NO]) {
                     return [BFTask taskWithResult:@YES];
                 }
@@ -1484,6 +1486,8 @@ - (BFTask *)saveAsync:(BFTask *)toAwait {
                     return [BFTask taskWithResult:@YES];
                 }
 
+                [self _objectWillSave];
+
                 // Snapshot the current set of changes, and push a new changeset into the queue.
                 PFOperationSet *changes = [self unsavedChanges];
 
@@ -1799,6 +1803,12 @@ - (BFTask *)_validateSaveEventuallyAsync {
     return [BFTask taskWithResult:nil];
 }
 
+#pragma mark Object Will Save
+
+- (void)_objectWillSave {
+    // Do nothing.
+}
+
 ///--------------------------------------
 #pragma mark - Properties
 ///--------------------------------------