add tapped (bool) property on additionData on iOS;

risetechnologies · Nov 12, 2016 · 5b54836 · 5b54836
1 parent 9e9df7c
commit 5b54836
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 31 deletions.
diff --git a/src/ios/AppDelegate+notification.m b/src/ios/AppDelegate+notification.m
@@ -101,6 +101,7 @@ - (void) application:(UIApplication *)application didReceiveRemoteNotification:(
     PushPlugin *pushHandler = [self getCommandInstance:@"PushNotification"];
     pushHandler.notificationMessage = userInfo;
     pushHandler.isInline = NO;
+    pushHandler.tapped = true;
     [pushHandler notificationReceived];
 }
 
@@ -113,6 +114,7 @@ - (void)application:(UIApplication *)application didReceiveRemoteNotification:(N
         PushPlugin *pushHandler = [self getCommandInstance:@"PushNotification"];
         pushHandler.notificationMessage = userInfo;
         pushHandler.isInline = YES;
+        pushHandler.tapped = false;
         [pushHandler notificationReceived];
 
         completionHandler(UIBackgroundFetchResultNewData);
@@ -131,39 +133,32 @@ - (void)application:(UIApplication *)application didReceiveRemoteNotification:(N
             silent = [contentAvailable integerValue];
         }
 
-        if (silent == 1) {
-            NSLog(@"this should be a silent push");
-            void (^safeHandler)(UIBackgroundFetchResult) = ^(UIBackgroundFetchResult result){
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    completionHandler(result);
-                });
-            };
-
-            PushPlugin *pushHandler = [self getCommandInstance:@"PushNotification"];
-
-            if (pushHandler.handlerObj == nil) {
-                pushHandler.handlerObj = [NSMutableDictionary dictionaryWithCapacity:2];
-            }
-
-            id notId = [userInfo objectForKey:@"notId"];
-            if (notId != nil) {
-                NSLog(@"Push Plugin notId %@", notId);
-                [pushHandler.handlerObj setObject:safeHandler forKey:notId];
-            } else {
-                NSLog(@"Push Plugin notId handler");
-                [pushHandler.handlerObj setObject:safeHandler forKey:@"handler"];
-            }
-
-            pushHandler.notificationMessage = userInfo;
-            pushHandler.isInline = NO;
-            [pushHandler notificationReceived];
-        } else {
-            NSLog(@"just put it in the shade");
-            //save it for later
-            self.launchNotification = userInfo;
+        void (^safeHandler)(UIBackgroundFetchResult) = ^(UIBackgroundFetchResult result){
+            dispatch_async(dispatch_get_main_queue(), ^{
+                completionHandler(result);
+            });
+        };
+
+        PushPlugin *pushHandler = [self getCommandInstance:@"PushNotification"];
 
-            completionHandler(UIBackgroundFetchResultNewData);
+        if (pushHandler.handlerObj == nil) {
+            pushHandler.handlerObj = [NSMutableDictionary dictionaryWithCapacity:2];
+        }
+
+        id notId = [userInfo objectForKey:@"notId"];
+        if (notId != nil) {
+            NSLog(@"Push Plugin notId %@", notId);
+            [pushHandler.handlerObj setObject:safeHandler forKey:notId];
+        } else {
+            NSLog(@"Push Plugin notId handler");
+            [pushHandler.handlerObj setObject:safeHandler forKey:@"handler"];
         }
+
+        pushHandler.notificationMessage = userInfo;
+        pushHandler.isInline = NO;
+        pushHandler.tapped = true;
+        [pushHandler notificationReceived];
+        completionHandler(UIBackgroundFetchResultNewData);
     }
 }
 

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

diff --git a/src/ios/PushPlugin.m b/src/ios/PushPlugin.m
@@ -34,6 +34,7 @@ @implementation PushPlugin : CDVPlugin
 @synthesize notificationMessage;
 @synthesize isInline;
 @synthesize coldstart;
+@synthesize tapped;
 
 @synthesize callbackId;
 @synthesize notificationCallbackId;
@@ -554,6 +555,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
@@ -563,6 +570,7 @@ - (void)notificationReceived {
 
         self.coldstart = NO;
         self.notificationMessage = nil;
+        self.tapped = false;
     }
 }