Updated library (2.1.3)

Catapush · Aug 21, 2020 · b27ae7d · b27ae7d
1 parent c1037b5
commit b27ae7d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/Service/NotificationService.swift b/Service/NotificationService.swift
@@ -10,42 +10,44 @@ import UserNotifications
 
 class NotificationService: CatapushNotificationServiceExtension {
 
-    private var contentHandler: ((UNNotificationContent) -> Void)?
-    private var bestAttemptContent: UNMutableNotificationContent?
-
     override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
-        self.contentHandler = contentHandler;
-        self.bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent)
         super.didReceive(request, withContentHandler: contentHandler)
     }
-    
-    override func handleMessage(_ message: MessageIP!) {
+
+    override func handleMessage(_ message: MessageIP?, withContentHandler contentHandler: ((UNNotificationContent?) -> Void)?, withBestAttempt bestAttemptContent: UNMutableNotificationContent?) {
         if let contentHandler = contentHandler, let bestAttemptContent = bestAttemptContent {
             if (message != nil) {
-                bestAttemptContent.body = message.body;
+                bestAttemptContent.body = message!.body;
             }else{
                 bestAttemptContent.body = "No new message";
             }
             contentHandler(bestAttemptContent);
         }
     }
-
-    override func handleError(_ error: Error!) {
-        if let contentHandler = contentHandler, let bestAttemptContent = bestAttemptContent {
-           if (error._code == CatapushCredentialsError) {
-               bestAttemptContent.body = "User not logged in";
-           }
-           if (error._code == CatapushNetworkError) {
-               bestAttemptContent.body = "Network error";
-           }
-           if (error._code == CatapushNoMessagesError) {
-               bestAttemptContent.body = "No new message";
-           }
-            if (error._code == CatapushFileProtectionError) {
+
+    override func handleError(_ error: Error, withContentHandler contentHandler: ((UNNotificationContent?) -> Void)?, withBestAttempt bestAttemptContent: UNMutableNotificationContent?) {
+        if let contentHandler = contentHandler, let bestAttemptContent = bestAttemptContent{
+            let errorCode = (error as NSError).code
+            if (errorCode == CatapushCredentialsError) {
+                bestAttemptContent.body = "User not logged in";
+            }
+            if (errorCode == CatapushNetworkError) {
+                bestAttemptContent.body = "Network error";
+            }
+            if (errorCode == CatapushNoMessagesError) {
+                bestAttemptContent.body = "No new message";
+            }
+            if (errorCode == CatapushFileProtectionError) {
                 bestAttemptContent.body = "Unlock the device at least once to receive the message";
             }
-           contentHandler(bestAttemptContent);
+            if (errorCode == CatapushConflictErrorCode) {
+                bestAttemptContent.body = "Connected from another resource";
+            }
+            if (errorCode == CatapushAppIsActive) {
+                bestAttemptContent.body = "Please open the app to read the message";
+            }
+            contentHandler(bestAttemptContent);
         }
     }
-
+    
 }
diff --git a/catapush-ios-swift-sdk-example.xcodeproj/project.pbxproj b/catapush-ios-swift-sdk-example.xcodeproj/project.pbxproj
@@ -302,7 +302,7 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-catapush-ios-swift-sdk-example/Pods-catapush-ios-swift-sdk-example-resources.sh",
-				"${PODS_ROOT}/../../catapush-ios-sdk-pod/CatapushKit/CatapushLibBundle.bundle",
+				"${PODS_ROOT}/catapush-ios-sdk-pod/CatapushKit/CatapushLibBundle.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
@@ -360,7 +360,7 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Service/Pods-Service-resources.sh",
-				"${PODS_ROOT}/../../catapush-ios-sdk-pod/CatapushKit/CatapushLibBundle.bundle",
+				"${PODS_ROOT}/catapush-ios-sdk-pod/CatapushKit/CatapushLibBundle.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (