be able to distinguish tapped messages in iOS (added tapped (boolean)…

… property to additionalData)
risetechnologies · May 23, 2019 · 82bbb1f · 82bbb1f
1 parent 7f19752
commit 82bbb1f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/ios/AppDelegate+notification.m b/src/ios/AppDelegate+notification.m
@@ -121,6 +121,7 @@ - (void)application:(UIApplication *)application didReceiveRemoteNotification:(N
 
             pushHandler.notificationMessage = userInfo;
             pushHandler.isInline = NO;
+            pushHandler.tapped = false;
             [pushHandler notificationReceived];
         } else {
             NSLog(@"just put it in the shade");
@@ -176,6 +177,7 @@ - (void)pushPluginOnApplicationDidBecomeActive:(NSNotification *)notification {
 
     if (self.launchNotification) {
         pushHandler.isInline = NO;
+        pushHandler.tapped = true;
         pushHandler.coldstart = [self.coldstart boolValue];
         pushHandler.notificationMessage = self.launchNotification;
         self.launchNotification = nil;
@@ -195,6 +197,7 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center
     PushPlugin *pushHandler = [self getCommandInstance:@"PushNotification"];
     pushHandler.notificationMessage = notification.request.content.userInfo;
     pushHandler.isInline = YES;
+    pushHandler.tapped = false;
     [pushHandler notificationReceived];
 
     completionHandler(UNNotificationPresentationOptionNone);

diff --git a/src/ios/PushPlugin.h b/src/ios/PushPlugin.h
@@ -35,6 +35,7 @@
 {
     NSDictionary *notificationMessage;
     BOOL    isInline;
+    BOOL    tapped;
     NSString *notificationCallbackId;
     NSString *callback;
     BOOL    clearBadge;
@@ -51,6 +52,7 @@
 
 @property (nonatomic, strong) NSDictionary *notificationMessage;
 @property BOOL isInline;
+@property BOOL tapped;
 @property BOOL coldstart;
 @property BOOL clearBadge;
 @property (nonatomic, strong) NSMutableDictionary *handlerObj;

diff --git a/src/ios/PushPlugin.m b/src/ios/PushPlugin.m
@@ -36,6 +36,7 @@ @implementation PushPlugin : CDVPlugin
 
 @synthesize notificationMessage;
 @synthesize isInline;
+@synthesize tapped;
 @synthesize coldstart;
 
 @synthesize callbackId;
@@ -454,6 +455,12 @@ - (void)notificationReceived {
             [additionalData setObject:[NSNumber numberWithBool:NO] forKey:@"coldstart"];
         }
 
+        if (tapped) {
+            [additionalData setObject:[NSNumber numberWithBool:YES] forKey:@"tapped"];
+        } else {
+            [additionalData setObject:[NSNumber numberWithBool:NO] forKey:@"tapped"];
+        }
+
         [message setObject:additionalData forKey:@"additionalData"];
 
         // send notification message
@@ -463,6 +470,7 @@ - (void)notificationReceived {
 
         self.coldstart = NO;
         self.notificationMessage = nil;
+        self.tapped = false;
     }
 }