Only check server clock on LiveQuery

netreconlab · Apr 21, 2023 · 4eba1e3 · 4eba1e3
1 parent 8434c6f
commit 4eba1e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/Sources/ParseCareKit/Models/RemoteSynchronizing.swift b/Sources/ParseCareKit/Models/RemoteSynchronizing.swift
@@ -25,13 +25,13 @@ actor RemoteSynchronizing {
         knowledgeVector = vector
     }
 
-    func hasNewerRevision(_ vector: OCKRevisionRecord.KnowledgeVector) -> Bool {
+    func hasNewerRevision(_ vector: OCKRevisionRecord.KnowledgeVector, for uuid: UUID) -> Bool {
         guard !isSynchronizing else {
             return false
         }
-        guard let knowledgeVector = knowledgeVector else {
+        guard let currentClock = knowledgeVector?.clock(for: uuid) else {
             return true
         }
-        return vector >= knowledgeVector
+        return vector.clock(for: uuid) > currentClock
     }
 }
diff --git a/Sources/ParseCareKit/ParseRemote.swift b/Sources/ParseCareKit/ParseRemote.swift
@@ -201,7 +201,7 @@ public class ParseRemote: OCKRemoteSynchronizable {
                         do {
                             let updatedVector = try PCKClock.decodeVector(updatedClock)
                             Task {
-                                guard await self.remoteStatus.hasNewerRevision(updatedVector) else {
+                                guard await self.remoteStatus.hasNewerRevision(updatedVector, for: self.uuid) else {
                                     return
                                 }
                                 self.parseDelegate?.didRequestSynchronization(self)
@@ -349,7 +349,7 @@ public class ParseRemote: OCKRemoteSynchronizable {
                     return
                 }
 
-                guard await !self.remoteStatus.hasNewerRevision(parseVector) else {
+                guard await !self.remoteStatus.hasNewerRevision(parseVector, for: self.uuid) else {
                     let errorString = "New knowledge on server. Pull first then try again"
                     Logger.pushRevisions.error("\(errorString)")
                     await self.remoteStatus.notSynchronzing()
@@ -412,8 +412,7 @@ public class ParseRemote: OCKRemoteSynchronizable {
                 updatedParseVector = incrementVectorClock(updatedParseVector)
             }
             updatedParseVector.merge(with: localClock)
-            guard (shouldIncrementClock || (!shouldIncrementClock && updatedParseVector.uuids.count > parseVector.uuids.count)),
-                let updatedClock = PCKClock.encodeVector(updatedParseVector, for: parseClock) else {
+            guard let updatedClock = PCKClock.encodeVector(updatedParseVector, for: parseClock) else {
                 await self.remoteStatus.updateKnowledgeVector(parseVector) // revert
                 await self.remoteStatus.notSynchronzing()
                 completion(ParseCareKitError.couldntUnwrapClock)