Update clocks if new device added

netreconlab · Apr 25, 2023 · 793c8f8 · 793c8f8
1 parent f124e1a
commit 793c8f8
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Sources/ParseCareKit/Models/RemoteSynchronizing.swift b/Sources/ParseCareKit/Models/RemoteSynchronizing.swift
@@ -55,16 +55,21 @@ actor RemoteSynchronizing {
     }
 
     func hasNewerClock(_ vector: OCKRevisionRecord.KnowledgeVector, for uuid: UUID) -> Bool {
-        guard let currentClock = knowledgeVector?.clock(for: uuid) else {
+        guard let currentVector = knowledgeVector else {
             return true
         }
-        return vector.clock(for: uuid) > currentClock
+        var testVector = currentVector
+        testVector.merge(with: vector)
+        let currentClock = currentVector.clock(for: uuid)
+        return vector.clock(for: uuid) > currentClock || testVector.uuids.count > currentVector.uuids.count
     }
 
     func hasNewerVector(_ vector: OCKRevisionRecord.KnowledgeVector) -> Bool {
         guard let currentVector = knowledgeVector else {
             return true
         }
-        return vector > currentVector
+        var testVector = currentVector
+        testVector.merge(with: vector)
+        return vector > currentVector || testVector.uuids.count > currentVector.uuids.count
     }
 }