fix(events): duplicated delivered events fix on foreground mode

PpgCoreSDK.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
     #
 
     spec.name         = "PpgCoreSDK"
-    spec.version      = "0.0.10"
+    spec.version      = "0.0.11"
     spec.summary      = "PushPushGo Core SDK"
 
     # This description is used to generate tags and improve search results.

PpgCoreSDK/Models/DataNotification.swift

@@ -64,9 +64,10 @@ struct DataNotification: Notification {
         return actions
     }
 
-    func toUNNotificationMutableContent() -> UNMutableNotificationContent {
+    func toUNNotificationMutableContent(markAsWrapped: Bool = false) -> UNMutableNotificationContent {
         let content = UNMutableNotificationContent()
-
+
+        content.userInfo["_wrappedByNSE"] = markAsWrapped ? "1" : nil
         content.userInfo["externalData"] = self.externalData
         content.userInfo["messageId"] = self.messageId.uuidString
         content.userInfo["contextId"] = self.contextId.uuidString

PpgCoreSDK/PpgCoreClient.swift

@@ -218,6 +218,12 @@ public class PpgCoreClient: NSObject {
         case .data:
             PpgCoreLogger.info("Got data message from local notifications");
             let dataNotification = NotificationFactory.createData(content: notification.request.content)
+
+            if (notification.request.content.userInfo["_wrappedByNSE"] != nil) {
+               PpgCoreLogger.info("Omit, registering delivered event, wrapped by notification wrapped in NSE")
+               break;
+            }
+
             onExternalData(dataNotification.externalData)
             eventService.send(delivered: dataNotification.createDeliveredEvent())
             break;

PpgCoreSDK/PpgCoreNotificationServiceExtension.swift

@@ -22,7 +22,7 @@ open class PpgCoreNotificationServiceExtension: UNNotificationServiceExtension {
         case .data:
             PpgCoreLogger.info("Got data message from remote notifications")
             let dataNotification = NotificationFactory.createData(content: request.content)
-            let newContent = dataNotification.toUNNotificationMutableContent()
+            let newContent = dataNotification.toUNNotificationMutableContent(markAsWrapped: true)
             eventService.send(delivered: dataNotification.createDeliveredEvent())
             onExternalData(data: dataNotification.externalData)
             contentHandler(newContent);

README.md

@@ -71,7 +71,7 @@ Add to your target our library:
 ```sh
 target 'your_project_name' do
   use_frameworks!
-  pod 'PpgCoreSDK', '~> 0.0.10'
+  pod 'PpgCoreSDK', '~> 0.0.11'
 end
 ```
 
@@ -99,7 +99,7 @@ target to `Podfile`:
 ```sh
 target 'NSE' do
   use_frameworks!
-  pod 'PpgCoreSDK', '~> 0.0.10'
+  pod 'PpgCoreSDK', '~> 0.0.11'
 end
 ```
 5. Install pods

examples/sdkdemo/Podfile

@@ -2,10 +2,10 @@ platform :ios, '14.0'
 
 target 'sdkdemo' do
   use_frameworks!
-  pod 'PpgCoreSDK', '~> 0.0.10'
+  pod 'PpgCoreSDK', '~> 0.0.11'
 end
 
 target 'NSE' do
   use_frameworks!
-  pod 'PpgCoreSDK', '~> 0.0.10'
+  pod 'PpgCoreSDK', '~> 0.0.11'
 end

examples/sdkdemo/Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - PpgCoreSDK (0.0.10)
+  - PpgCoreSDK (0.0.11)
 
 DEPENDENCIES:
-  - PpgCoreSDK (~> 0.0.10)
+  - PpgCoreSDK (from `/Users/worotyns/code/ppg/ppg-core-ios-sdk`)
 
-SPEC REPOS:
-  trunk:
-    - PpgCoreSDK
+EXTERNAL SOURCES:
+  PpgCoreSDK:
+    :path: "/Users/worotyns/code/ppg/ppg-core-ios-sdk"
 
 SPEC CHECKSUMS:
   PpgCoreSDK: 76c44cf7ddd3afbce74183ed44e9232557011c24
 
-PODFILE CHECKSUM: 7101b6854314b7c7125d0466372b3e2f0161c7b4
+PODFILE CHECKSUM: 3745efa55adb0c105591c0ea1c08e0ed3bfcb744
 
 COCOAPODS: 1.12.1