TF-3275 Fix FCM iOS foreground desync (#3314)

2024-12-06 13:05:07 +07:00
parent 338262b4b5
commit 2fcb5f03d0
6 changed files with 74 additions and 1 deletions
@@ -16,6 +16,14 @@ class NotificationService: UNNotificationServiceExtension {
        handler = contentHandler
        modifiedContent = (request.content.mutableCopy() as? UNMutableNotificationContent)
        
+        let appGroupId = (Bundle.main.object(forInfoDictionaryKey: "AppGroupId") as? String) ?? "group.\(Bundle.main.bundleIdentifier!)"
+        let userDefaults = UserDefaults(suiteName: appGroupId)
+        let isAppActive = userDefaults?.value(forKey: CoreUtils.APPLICATION_STATE) as? Bool
+        if isAppActive == true {
+            self.modifiedContent?.userInfo = request.content.userInfo.merging(["data": request.content.userInfo], uniquingKeysWith: {(_, new) in new})
+            contentHandler(self.modifiedContent ?? request.content)
+        }
+        
        guard let payloadData = request.content.userInfo as? [String: Any],
              !keychainController.retrieveSharingSessions().isEmpty else {
            self.showDefaultNotification(message: NSLocalizedString(self.newNotificationDefaultMessageKey, comment: "Localizable"))