Don't save clock to server when no revision updates

netreconlab · Apr 22, 2023 · 4f1c762 · 4f1c762
1 parent 1ff1cf6
commit 4f1c762
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/Sources/ParseCareKit/ParseRemote.swift b/Sources/ParseCareKit/ParseRemote.swift
@@ -389,21 +389,24 @@ public class ParseRemote: OCKRemoteSynchronizable {
                                localClock: OCKRevisionRecord.KnowledgeVector,
                                completion: @escaping (Error?) -> Void) {
         Task {
-            var updatedParseVector = parseVector
-            if shouldIncrementClock {
-                // Increment and merge Knowledge Vector
-                updatedParseVector = incrementVectorClock(updatedParseVector)
-                updatedParseVector.merge(with: localClock)
-            } else {
-                updatedParseVector.merge(with: localClock)
-                if updatedParseVector.uuids.count > parseVector.uuids.count {
-                    // Increment and merge Knowledge Vector
-                    updatedParseVector = incrementVectorClock(updatedParseVector)
+            guard shouldIncrementClock else {
+                await self.remoteStatus.updateClock(parseClock)
+                await self.remoteStatus.notSynchronzing()
+                Logger.pushRevisions.debug("Finished pushing revisions")
+                DispatchQueue.main.async {
+                    self.parseRemoteDelegate?.successfullyPushedDataToCloud()
                 }
+                completion(nil)
+                return
             }
+            var updatedParseVector = parseVector
+            // Increment and merge Knowledge Vector
+            updatedParseVector = incrementVectorClock(updatedParseVector)
+            updatedParseVector.merge(with: localClock)
             guard let updatedClock = PCKClock.encodeVector(updatedParseVector, for: parseClock) else {
                 await self.remoteStatus.updateClock(parseClock) // revert
                 await self.remoteStatus.notSynchronzing()
+                Logger.pushRevisions.error("Could not encode clock")
                 completion(ParseCareKitError.couldntUnwrapClock)
                 return
             }