[SDK-637] : iOS push notification callback changes implemented (#90)

* iOS push notification callback improve logs and checks added to handle the push sent from Countly only. * Implemented requested changes of PR * Update CountlyNative.m Logs positions changes in onNotification function. * Deleting unneeded logs Co-authored-by: ArtursKadikis <[email protected]>
Countly · Jan 20, 2022 · f6416fb · f6416fb
1 parent 90d8c07
commit f6416fb
Showing 1 changed file with 29 additions and 13 deletions.
diff --git a/src/ios/CountlyNative.m b/src/ios/CountlyNative.m
@@ -224,20 +224,36 @@ @implementation CountlyNative
     Boolean isDebug = false;
 
 + (void)onNotification: (NSDictionary *) notificationMessage{
-    COUNTLY_CORDOVA_LOG(@"Notification received");
-    COUNTLY_CORDOVA_LOG(@"The notification %@", notificationMessage);
-    if(notificationMessage && notificationListener != nil){
-        notificationListener([NSString stringWithFormat:@"%@",notificationMessage]);
-    }else{
-        lastStoredNotification = notificationMessage;
+    if(!notificationMessage) {
+        COUNTLY_CORDOVA_LOG(@"onNotification, Notification received. No valid message");
+        return;
     }
-    if(notificationMessage){
-        if(notificationIDs == nil){
-            notificationIDs = [[NSMutableArray alloc] init];
+    COUNTLY_CORDOVA_LOG(@"onNotification, Notification received. The notification %@", notificationMessage);
+
+    NSDictionary* countlyPayload = notificationMessage[@"c"];
+    if(!countlyPayload) {
+        COUNTLY_CORDOVA_LOG(@"onNotification, Notification received. Countly payload not found in notification dictionary!");
+        return;
+    }
+    NSString *notificationID = countlyPayload[@"i"];
+    if(!notificationID) {
+        COUNTLY_CORDOVA_LOG(@"onNotification, Notification received. Countly payload does not contains a valid notification ID!");
+        return;
+    }
+
+    if(notificationIDs == nil){
+        notificationIDs = [[NSMutableArray alloc] init];
+    }
+    [notificationIDs insertObject:notificationID atIndex:[notificationIDs count]];
+    if(isInitialized){
+        if(notificationListener != nil){
+            notificationListener([NSString stringWithFormat:@"%@",notificationMessage]);
         }
-        NSDictionary* countlyPayload = notificationMessage[@"c"];
-        NSString *notificationID = countlyPayload[@"i"];
-        [notificationIDs insertObject:notificationID atIndex:[notificationIDs count]];
+        [self recordPushAction];
+    }
+    else{
+        // Notification is cached if SDK is not initialized and send in callback when 'registerForNotification' is call.
+        lastStoredNotification = notificationMessage;
     }
 }
 - (void)recordPushAction
@@ -251,7 +267,7 @@ - (void)recordPushAction
         };
         [Countly.sharedInstance recordEvent:@"[CLY]_push_action" segmentation: segmentation];
     }
-    notificationIDs = nil;
+    [notificationIDs removeAllObjects];
 }
 
 - (void) onCall:(NSString *)method commandString:(NSArray *)command callback:(Result) result{