saveNotificationPersistence 保存扩展中的修改 同步至主项目

Author: wjwjwj2223

Sources/NotificationSession.swift

@@ -49,6 +49,8 @@ public class NotificationSession {
     public var lastEventId: UUID?
 
     private let operationLoop: RequestGeneratingOperationLoop
+    
+    private var saveNotificationPersistence: ContextDidSaveNotificationPersistence
 
     /// Initializes a new `SessionDirectory` to be used in an extension environment
     /// - parameter databaseDirectory: The `NSURL` of the shared group container
@@ -132,6 +134,7 @@ public class NotificationSession {
             transportSession: transportSession,
             operationLoop: operationLoop,
             sharedContainerURL: sharedContainerURL,
+            accountContainer: accountContainer,
             accountIdentifier: accountIdentifier,
             isHuge: isHuge
         )
@@ -142,15 +145,22 @@ public class NotificationSession {
                   transportSession: ZMTransportSession,
                   operationLoop: RequestGeneratingOperationLoop,
                   sharedContainerURL: URL,
+                  accountContainer: URL,
                   accountIdentifier: UUID,
                   isHuge: Bool = false
     ) throws {
         self.syncMoc = moc
         self.transportSession = transportSession
         self.operationLoop = operationLoop
+        self.saveNotificationPersistence = ContextDidSaveNotificationPersistence(accountContainer: accountContainer)
         moc.performAndWait { [unowned self] in
             self.lastEventId = isHuge ? moc.zm_lastHugeNotificationID : moc.zm_lastNotificationID
         }
+        NotificationCenter.default.addObserver(
+        self,
+        selector: #selector(SaveNotificationSession.contextDidSave(_:)),
+        name:.NSManagedObjectContextDidSave,
+        object: moc)
     }
 
     deinit {
@@ -159,3 +169,9 @@ public class NotificationSession {
         transportSession.tearDown()
     }
 }
+
+extension NotificationSession {
+    @objc func contextDidSave(_ note: Notification){
+        self.saveNotificationPersistence.add(note)
+    }
+}

Sources/Synchronization/Strategies/PushNotificationStrategy.swift

@@ -146,9 +146,6 @@ extension PushNotificationStrategy {
                 conversation = ZMConversation.init(noRowCacheWithRemoteID: conversationID, createIfNeeded: false, in: moc)
                 exLog.info("convertToLocalNotifications conversationID: \(conversationID) after fetch conversation from coredata")
             }
-            //可能是系统通知 sendid 为00000000-0000-0000-0000-000000000002
-            
-//            guard event.senderUUID() != self.accountIdentifier else {return nil}
             return ZMLocalNotification(noticationEvent: event, conversation: conversation, managedObjectContext: moc)
         }
     }