Merge pull request #121 from OneSignal/misc_fixes

Fixed AppDelegate compatibility, isAppInFocus, and stability fix

Author: jkasten2

iOS_SDK/OneSignal/OneSignal.h

@@ -148,6 +148,9 @@ typedef OSNotificationDisplayType OSInFocusDisplayOption;
  Set to false when app is in focus and in-app alerts are disabled, or the remote notification is silent. */
 @property(readonly, getter=wasShown)BOOL shown;
 
+/* Set to true if the app was in focus when the notification  */
+@property(readonly, getter=wasAppInFocus)BOOL isAppInFocus;
+
 /* Set to true when the received notification is silent
  Silent means there is no alert, sound, or badge payload in the aps dictionary
  requires remote-notification within UIBackgroundModes array of the Info.plist */

iOS_SDK/OneSignal/OneSignal.m

@@ -1206,22 +1206,21 @@ - (void)oneSignalReceivedRemoteNotification:(UIApplication*)application userInfo
 // User Tap on Notification while app was in background - OR - Notification received (silent or not, foreground or background) on iOS 7+
 - (void) oneSignalRemoteSilentNotification:(UIApplication*)application UserInfo:(NSDictionary*)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult)) completionHandler {
 
-    if([OneSignal app_id]) {
-        
-        //Call notificationAction if app is active -> not a silent notification but rather user tap on notification
-        //Unless iOS 10+ then call remoteSilentNotification instead.
-        if([UIApplication sharedApplication].applicationState == UIApplicationStateActive && userInfo[@"aps"][@"alert"])
+    if ([OneSignal app_id]) {
+        // Call notificationAction if app is active -> not a silent notification but rather user tap on notification
+        // Unless iOS 10+ then call remoteSilentNotification instead.
+        if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive && userInfo[@"aps"][@"alert"])
             [OneSignal notificationOpened:userInfo isActive:YES];
-        else [OneSignal remoteSilentNotification:application UserInfo:userInfo];
-        
+        else
+            [OneSignal remoteSilentNotification:application UserInfo:userInfo];
     }
 
     if ([self respondsToSelector:@selector(oneSignalRemoteSilentNotification:UserInfo:fetchCompletionHandler:)]) {
         [self oneSignalRemoteSilentNotification:application UserInfo:userInfo fetchCompletionHandler:completionHandler];
         return;
     }
 
-    //Make sure not a cold start from tap on notification (OS doesn't call didReceiveRemoteNotification)
+    // Make sure not a cold start from tap on notification (OS doesn't call didReceiveRemoteNotification)
     if ([self respondsToSelector:@selector(oneSignalReceivedRemoteNotification:userInfo:)] && ![[OneSignal valueForKey:@"coldStartFromTapOnNotification"] boolValue])
         [self oneSignalReceivedRemoteNotification:application userInfo:userInfo];
 

iOS_SDK/OneSignal/OneSignalHelper.m

@@ -144,7 +144,7 @@ - (id)initWithRawMessage:(NSDictionary*)message {
 @end
 
 @implementation OSNotification
-@synthesize payload = _payload, shown = _shown, silentNotification = _silentNotification, displayType = _displayType;
+@synthesize payload = _payload, shown = _shown, isAppInFocus = _isAppInFocus, silentNotification = _silentNotification, displayType = _displayType;
 
 #if XC8_AVAILABLE
 @synthesize mutableContent = _mutableContent;
@@ -165,11 +165,12 @@ - (id)initWithPayload:(OSNotificationPayload *)payload displayType:(OSNotificati
 
         _shown = true;
 
-        BOOL isActive = [[UIApplication sharedApplication] applicationState] == UIApplicationStateActive;
+        _isAppInFocus = [[UIApplication sharedApplication] applicationState] == UIApplicationStateActive;
 
         //If remote silent -> shown = false
         //If app is active and in-app alerts are not enabled -> shown = false
-        if(_silentNotification || (isActive && [[NSUserDefaults standardUserDefaults] boolForKey:@"ONESIGNAL_ALERT_OPTION"] == OSNotificationDisplayTypeNone))
+        if (_silentNotification ||
+            (_isAppInFocus && [[NSUserDefaults standardUserDefaults] boolForKey:@"ONESIGNAL_ALERT_OPTION"] == OSNotificationDisplayTypeNone))
             _shown = false;
 
     }
@@ -216,10 +217,11 @@ - (NSString*)stringify {
     if(self.displayType)
         [obj setObject:@(self.displayType) forKeyedSubscript: @"displayType"];
 
-    if(self.shown)
-        [obj setObject:@(self.shown) forKeyedSubscript: @"shown"];
 
-    if(self.silentNotification)
+    [obj setObject:@(self.shown) forKeyedSubscript: @"shown"];
+    [obj setObject:@(self.isAppInFocus) forKeyedSubscript: @"isAppInFocus"];
+    
+    if (self.silentNotification)
         [obj setObject:@(self.silentNotification) forKeyedSubscript: @"silentNotification"];
 
 
@@ -494,7 +496,7 @@ + (id)prepareUNNotificationRequest:(NSDictionary *)data :(NSDictionary *)userInf
     if(!NSClassFromString(@"UNNotificationAction") || !NSClassFromString(@"UNNotificationRequest")) return NULL;
 
     NSMutableArray * actionArray = [[NSMutableArray alloc] init];
-    for( NSDictionary* button in data[@"o"]) {
+    for(NSDictionary* button in data[@"o"]) {
         NSString* title = button[@"n"] != NULL ? button[@"n"] : @"";
         NSString* buttonID = button[@"i"] != NULL ? button[@"i"] : title;
         id action = [NSClassFromString(@"UNNotificationAction") actionWithIdentifier:buttonID title:title options:UNNotificationActionOptionForeground];
@@ -667,7 +669,6 @@ + (void)enqueueRequest:(NSURLRequest*)request onSuccess:(OSResultSuccessBlock)su
 }
 
 + (void)enqueueRequest:(NSURLRequest*)request onSuccess:(OSResultSuccessBlock)successBlock onFailure:(OSFailureBlock)failureBlock isSynchronous:(BOOL)isSynchronous {
-    
     [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message: [NSString stringWithFormat:@"request.body: %@", [[NSString alloc]initWithData:request.HTTPBody encoding:NSUTF8StringEncoding]]];
 
     if (isSynchronous) {

iOS_SDK/OneSignal/UNUserNotificationCenter+OneSignal.m

@@ -45,6 +45,13 @@ @interface OneSignal (UN_extra)
 + (void)notificationOpened:(NSDictionary*)messageDict isActive:(BOOL)isActive;
 @end
 
+// This class hooks into the following iSO 10 UNUserNotificationCenterDelegate selectors:
+// - userNotificationCenter:willPresentNotification:withCompletionHandler:
+//   - Reads kOSSettingsKeyInFocusDisplayOption to respect it's setting.
+// - userNotificationCenter:didReceiveNotificationResponse:withCompletionHandler:
+//   - Used to process opening a notifications.
+//   - The presents of this selector tells iOS to no longer fire `application:didReceiveRemoteNotification:fetchCompletionHandler:`.
+//       We call this to maintain existing behavior.
 
 @implementation sizzleUNUserNotif
 
@@ -119,7 +126,7 @@ - (void)onesignalUserNotificationCenter:(id)center didReceiveNotificationRespons
 
     NSDictionary* usrInfo = [[[[response performSelector:@selector(notification)] valueForKey:@"request"] valueForKey:@"content"] valueForKey:@"userInfo"];
     if (!usrInfo || [usrInfo count] == 0) {
-        [sizzleUNUserNotif tunnelToDelegate:center :response :completionHandler];
+        [sizzleUNUserNotif tunnelToDelegate:center response:response handler:completionHandler];
         return;
     }
 
@@ -150,7 +157,7 @@ - (void)onesignalUserNotificationCenter:(id)center didReceiveNotificationRespons
         BOOL isActive = [UIApplication sharedApplication].applicationState == UIApplicationStateActive &&
         [[[NSUserDefaults standardUserDefaults] objectForKey:@"ONESIGNAL_ALERT_OPTION"] intValue] != OSNotificationDisplayTypeNotification;
         [OneSignal notificationOpened:usrInfo isActive:isActive];
-        [sizzleUNUserNotif tunnelToDelegate:center :response :completionHandler];
+        [sizzleUNUserNotif tunnelToDelegate:center response:response handler:completionHandler];
         return;
     }
 
@@ -179,18 +186,31 @@ - (void)onesignalUserNotificationCenter:(id)center didReceiveNotificationRespons
             userInfo[@"aps"] = @{ @"alert" : userInfo[@"m"] };
     }
 
-    BOOL isActive = [UIApplication sharedApplication].applicationState == UIApplicationStateActive &&
-    [[[NSUserDefaults standardUserDefaults] objectForKey:@"ONESIGNAL_ALERT_OPTION"] intValue] != OSNotificationDisplayTypeNotification;
+    UIApplication *sharedApp = [UIApplication sharedApplication];
 
+    BOOL isActive = sharedApp.applicationState == UIApplicationStateActive &&
+    [[[NSUserDefaults standardUserDefaults] objectForKey:@"ONESIGNAL_ALERT_OPTION"] intValue] != OSNotificationDisplayTypeNotification;
 
-    [OneSignal notificationOpened:userInfo isActive:isActive];
-    [sizzleUNUserNotif tunnelToDelegate:center :response :completionHandler];
+    if ([OneSignal app_id])
+       [OneSignal notificationOpened:userInfo isActive:isActive];
+    [sizzleUNUserNotif tunnelToDelegate:center response:response handler:completionHandler];
 
+    // Call orginal selector if one was set.
     if ([self respondsToSelector:@selector(onesignalUserNotificationCenter:didReceiveNotificationResponse:withCompletionHandler:)])
         [self onesignalUserNotificationCenter:center didReceiveNotificationResponse:response withCompletionHandler:completionHandler];
+    else if ([sharedApp.delegate respondsToSelector:@selector(application:didReceiveRemoteNotification:fetchCompletionHandler:)]) {
+        // Call depercated pre-iOS 10 selector if one as set on the AppDelegate.
+        //   NOTE: Should always be true as our AppDelegate swizzling should be there unless something else unsizzled it.
+        [sharedApp.delegate application:sharedApp didReceiveRemoteNotification:usrInfo fetchCompletionHandler:^(UIBackgroundFetchResult result) {
+            // Call iOS 10's compleationHandler from iOS 9's completion handler.
+            completionHandler();
+        }];
+    }
 }
 
-+ (void)tunnelToDelegate:(id)center :(id)response :(void (^)())handler {
+// Depercated - [OneSignal notificationCenterDelegate] - Now handled by swizzling.
+//   Just need to keep the `handler();` call
++ (void)tunnelToDelegate:(id)center response:(id)response handler:(void (^)())handler {
 
     if ([[OneSignal notificationCenterDelegate] respondsToSelector:@selector(userNotificationCenter:didReceiveNotificationResponse:withCompletionHandler:)])
         [[OneSignal notificationCenterDelegate] userNotificationCenter:center didReceiveNotificationResponse:response withCompletionHandler:handler];