[TIMOB-17705] Adding remotenotificationaction event for handling when…

… interactive push notifications are clicked
tidev · Sep 18, 2014 · 4af12ef · 4af12ef
1 parent fd02ba4
commit 4af12ef
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 10 deletions.
diff --git a/apidoc/Titanium/App/iOS/iOS.yml b/apidoc/Titanium/App/iOS/iOS.yml
@@ -288,7 +288,7 @@ events:
         type: Dictionary
 
   - name: localnotificationaction
-    summary: Fired when a user selects an action for an interactive notification.
+    summary: Fired when a user selects an action for an interactive local notification.
     properties:
       - name: alertAction
         summary: |
@@ -331,6 +331,18 @@ events:
         summary: Custom data object.
         type: Dictionary
 
+  - name: remotenotificationaction
+    summary: Fired when a user selects an action for an interactive remote notification.
+    extends: PushNotificationData
+    properties: 
+      - name: category
+        summary: Identifier of the category of the interactive notification.
+        type: String
+
+      - name: identifier
+        summary: Identifier of the action that was selected of the interactive notification.
+        type: String
+
   - name: backgroundfetch
     summary: Fired when the application is woken up for a fetch operation. Available only on iOS 7 and later.
     description: |

diff --git a/iphone/Classes/TiApp.m b/iphone/Classes/TiApp.m
@@ -448,6 +448,19 @@ - (void) application:(UIApplication *)application handleActionWithIdentifier:(NS
 	completionHandler();
 }
 
+- (void) application:(UIApplication *)application handleActionWithIdentifier:(NSString *)identifier forRemoteNotification:(NSDictionary *)userInfo completionHandler:(void (^)())completionHandler {
+    RELEASE_TO_NIL(remoteNotification);
+    [self generateNotification:userInfo];
+    if (identifier != nil) {
+        NSMutableDictionary *mutableRemoteNotification = [[NSMutableDictionary alloc] initWithDictionary:remoteNotification];
+        mutableRemoteNotification[@"identifier"] = identifier;
+        RELEASE_TO_NIL(remoteNotification);
+        remoteNotification = mutableRemoteNotification;
+    }
+    [[NSNotificationCenter defaultCenter] postNotificationName:kTiRemoteNotificationAction object:remoteNotification userInfo:nil];
+    completionHandler();
+}
+
 #pragma mark -
 
 #pragma mark Helper Methods

diff --git a/iphone/Classes/TiAppiOSProxy.m b/iphone/Classes/TiAppiOSProxy.m
@@ -35,9 +35,12 @@ -(void)_listenerAdded:(NSString*)type count:(int)count
 	if (count == 1 && [type isEqual:@"notification"]) {
 		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didReceiveLocalNotification:) name:kTiLocalNotification object:nil];
 	}
-	if (count == 1 && [type isEqual:@"localnotificationaction"]) {
-		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didReceiveBackgroundLocalNotification:) name:kTiLocalNotificationAction object:nil];
-	}
+    if (count == 1 && [type isEqual:@"localnotificationaction"]) {
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didReceiveLocalNotificationAction:) name:kTiLocalNotificationAction object:nil];
+    }
+    if (count == 1 && [type isEqual:@"remotenotificationaction"]) {
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didReceiveRemoteNotificationAction:) name:kTiRemoteNotificationAction object:nil];
+    }
 
     if ((count == 1) && [type isEqual:@"backgroundfetch"]) {
         NSArray* backgroundModes = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UIBackgroundModes"];
@@ -87,9 +90,12 @@ -(void)_listenerRemoved:(NSString*)type count:(int)count
 	if (count == 0 && [type isEqual:@"notification"]) {
 		[[NSNotificationCenter defaultCenter] removeObserver:self name:kTiLocalNotification object:nil];
 	}
-	if (count == 0 && [type isEqual:@"localnotificationaction"]) {
-		[[NSNotificationCenter defaultCenter] removeObserver:self name:kTiLocalNotificationAction object:nil];
-	}
+    if (count == 0 && [type isEqual:@"localnotificationaction"]) {
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:kTiLocalNotificationAction object:nil];
+    }
+    if (count == 0 && [type isEqual:@"remotenotificationaction"]) {
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:kTiRemoteNotificationAction object:nil];
+    }
 
     if ((count == 1) && [type isEqual:@"backgroundfetch"]) {
         [[NSNotificationCenter defaultCenter] removeObserver:self name:kTiBackgroundFetchNotification object:nil];
@@ -463,10 +469,16 @@ -(void)didReceiveLocalNotification:(NSNotification*)note
 	[self fireEvent:@"notification" withObject:notification];
 }
 
--(void)didReceiveBackgroundLocalNotification:(NSNotification*)note
+-(void)didReceiveLocalNotificationAction:(NSNotification*)note
 {
-	NSDictionary *notification = [note object];
-	[self fireEvent:@"localnotificationaction" withObject:notification];
+    NSDictionary *notification = [note object];
+    [self fireEvent:@"localnotificationaction" withObject:notification];
+}
+
+-(void)didReceiveRemoteNotificationAction:(NSNotification*)note
+{
+    NSDictionary *notification = [note object];
+    [self fireEvent:@"remotenotificationaction" withObject:notification];
 }
 
 -(void)didReceiveBackgroundFetchNotification:(NSNotification*)note

diff --git a/iphone/Classes/TiBase.h b/iphone/Classes/TiBase.h
@@ -573,6 +573,7 @@ extern NSString * const kTiBackgroundTransfer;
 extern NSString * const kTiFrameAdjustNotification;
 extern NSString * const kTiLocalNotification;
 extern NSString * const kTiLocalNotificationAction;
+extern NSString * const kTiRemoteNotificationAction;
 extern NSString * const kTiUserNotificationSettingsNotification;
 extern NSString * const kTiBackgroundTransfer;
 extern NSString * const kTiURLDownloadFinished;

diff --git a/iphone/Classes/TiBase.m b/iphone/Classes/TiBase.m
@@ -154,6 +154,7 @@ void TiLogMessage(NSString* str, ...) {
 NSString * const kTiFrameAdjustNotification = @"TiFrameAdjust";
 NSString * const kTiLocalNotification = @"TiLocalNotification";
 NSString * const kTiLocalNotificationAction = @"TiLocalNotificationAction";
+NSString * const kTiRemoteNotificationAction = @"TiRemoteNotificationAction";
 NSString * const kTiUserNotificationSettingsNotification = @"TiUserNotificationSettingsNotification";
 
 NSString* const kTiBehaviorSize = @"SIZE";