@@ -322,13 +322,8 @@ public class ParseRemote: OCKRemoteSynchronizable {
322
322
Task {
323
323
do {
324
324
// Fetch Clock from Cloud
325
- var parseClock = await self . remoteStatus. clock
326
- if parseClock == nil {
327
- parseClock = try await PCKClock . new ( uuid: self . uuid)
328
- await self . remoteStatus. updateClock ( parseClock)
329
- }
330
- guard let currentClock = parseClock,
331
- let parseVector = currentClock. knowledgeVector else {
325
+ let parseClock = try await PCKClock . new ( uuid: self . uuid)
326
+ guard let parseVector = parseClock. knowledgeVector else {
332
327
await self . remoteStatus. notSynchronzing ( )
333
328
// There was a different issue that we don't know how to handle
334
329
Logger . pushRevisions. error ( " Error in pushRevisions. Couldn't unwrap clock " )
@@ -346,7 +341,7 @@ public class ParseRemote: OCKRemoteSynchronizable {
346
341
347
342
guard deviceRevisions. count > 0 else {
348
343
self . completePushRevisions ( shouldIncrementClock: false ,
349
- parseClock: currentClock ,
344
+ parseClock: parseClock ,
350
345
parseVector: parseVector,
351
346
localClock: deviceKnowledge,
352
347
completion: completion)
@@ -361,13 +356,13 @@ public class ParseRemote: OCKRemoteSynchronizable {
361
356
do {
362
357
let remoteRevision = try PCKRevisionRecord ( record: deviceRevision,
363
358
remoteClockUUID: self . uuid,
364
- remoteClock: currentClock ,
359
+ remoteClock: parseClock ,
365
360
remoteClockValue: logicalClock)
366
361
try await remoteRevision. save ( )
367
362
self . notifyRevisionProgress ( index + 1 ,
368
363
total: deviceRevisions. count)
369
364
if index == ( deviceRevisions. count - 1 ) {
370
- self . completePushRevisions ( parseClock: currentClock ,
365
+ self . completePushRevisions ( parseClock: parseClock ,
371
366
parseVector: parseVector,
372
367
localClock: deviceKnowledge,
373
368
completion: completion)
0 commit comments