iOS update - Title support and bug fixes

* Fixed issue where the iOS notification permission prompt would show on the 2nd cold start of the app when autoRegister is set to false.
* Added support for notification title on iOS 8.2+ devices.
* Fixed bug where notifications would clear when opening / resuming the app.
  - Notifications will still be cleared in this way when a badge is set.
    - This is due to an iOS limitation where clearing the badge count has a side effect of clearing all notifications from the app.
  - iOS 6 & 7 - When a notification is opened all other notifications from the app will still be cleared.
    - This logic remains otherwise notifications can be tapped on multiple times.
* Fixed bug where if content-available was set the notification would be marked opened when received and again when it was opened.

Author: jkasten2

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.7",
+  "version": "1.8.0",
   "name": "onesignal-cordova-plugin",
   "cordova_name": "OneSignal Push Notifications",
   "description": "OneSignal is a high volume Push Notification service for mobile apps. In addition to basic notification delivery, OneSignal also provides tools to localize, target, schedule, and automate notifications that you send.",

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="com.onesignal.plugins.onesignal"
-    version="1.7.7">
+    version="1.8.0">
 
   <name>OneSignal Push Notifications</name>
   <author>Josh Kasten</author>

src/ios/OneSignal.m

@@ -35,7 +35,7 @@
 
 #define DEFAULT_PUSH_HOST @"https://onesignal.com/api/v1/"
 
-NSString* const VERSION = @"010900";
+NSString* const VERSION = @"011000";
 
 #define NOTIFICATION_TYPE_BADGE 1
 #define NOTIFICATION_TYPE_SOUND 2
@@ -160,7 +160,10 @@ - (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId
 
         mUserId = [defaults stringForKey:@"GT_PLAYER_ID"];
         mDeviceToken = [defaults stringForKey:@"GT_DEVICE_TOKEN"];
-        registeredWithApple = mDeviceToken != nil || [defaults boolForKey:@"GT_REGISTERED_WITH_APPLE"];
+        if (([[UIApplication sharedApplication] respondsToSelector:@selector(currentUserNotificationSettings)]))
+            registeredWithApple = [[UIApplication sharedApplication] currentUserNotificationSettings].types != (NSUInteger)nil;
+        else
+            registeredWithApple = mDeviceToken != nil || [defaults boolForKey:@"GT_REGISTERED_WITH_APPLE"];
         mSubscriptionSet = [defaults objectForKey:@"ONESIGNAL_SUBSCRIPTION"] == nil;
         mNotificationTypes = getNotificationTypes();
 
@@ -184,7 +187,7 @@ - (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId
         [self notificationOpened:userInfo isActive:false];
     }
 
-    clearBadgeCount();
+    clearBadgeCount(false);
 
     if ([OneSignalTrackIAP canTrack])
         trackIAPPurchase = [[OneSignalTrackIAP alloc] init];
@@ -303,6 +306,7 @@ - (void)updateDeviceToken:(NSString*)deviceToken onSuccess:(OneSignalResultSucce
                              deviceToken, @"identifier",
                              nil];
 
+    Log(ONE_S_LL_VERBOSE, @"Calling OneSignal PUT updated pushToken!");
     NSData* postData = [NSJSONSerialization dataWithJSONObject:dataDic options:0 error:nil];
     [request setHTTPBody:postData];
 
@@ -398,6 +402,7 @@ - (void)registerUser {
     if (releaseMode == UIApplicationReleaseDev || releaseMode == UIApplicationReleaseAdHoc)
         dataDic[@"test_type"] = [NSNumber numberWithInt:releaseMode];
 
+    Log(ONE_S_LL_VERBOSE, @"Calling OneSignal create/on_session");
     NSData* postData = [NSJSONSerialization dataWithJSONObject:dataDic options:0 error:nil];
     [request setHTTPBody:postData];
 
@@ -606,7 +611,7 @@ - (void)onFocus:(NSString*)state {
         lastTrackedTime = [NSNumber numberWithLongLong:[[NSDate date] timeIntervalSince1970]];
 
         [self sendNotificationTypesUpdateIsConfirmed:false];
-        wasBadgeSet = clearBadgeCount();
+        wasBadgeSet = clearBadgeCount(false);
     }
     else {
         NSNumber* timeElapsed = @(([[NSDate date] timeIntervalSince1970] - [lastTrackedTime longLongValue]) + 0.5);
@@ -770,7 +775,7 @@ - (void) handleNotificationOpened:(NSDictionary*)messageDict isActive:(BOOL)isAc
 
     self.lastMessageReceived = messageDict;
 
-    clearBadgeCount();
+    clearBadgeCount(true);
     [[UIApplication sharedApplication] cancelAllLocalNotifications];
 
 
@@ -779,18 +784,19 @@ - (void) handleNotificationOpened:(NSDictionary*)messageDict isActive:(BOOL)isAc
         handleNotification([self getMessageString], [self getAdditionalData], isActive);
 }
 
-bool clearBadgeCount() {
+bool clearBadgeCount(bool fromNotifOpened) {
     if (mNotificationTypes == -1 || (mNotificationTypes & NOTIFICATION_TYPE_BADGE) == 0)
         return false;
 
-    bool wasBadgeSet = false;
-    
-    if ([UIApplication sharedApplication].applicationIconBadgeNumber > 0)
-        wasBadgeSet = true;
+    bool wasBadgeSet = [UIApplication sharedApplication].applicationIconBadgeNumber > 0;
 
-    // Clear bages and nofiications from this app. Setting to 1 then 0 was needed to clear the notifications.
-    [[UIApplication sharedApplication] setApplicationIconBadgeNumber:1];
-    [[UIApplication sharedApplication] setApplicationIconBadgeNumber:0];
+    if ((!(NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_7_1) && fromNotifOpened) || wasBadgeSet) {
+        // Clear bages and nofiications from this app.
+        // Setting to 1 then 0 was needed to clear the notifications on iOS 6 & 7. (Otherwise you can click the notification multiple times.)
+        // iOS 8+ auto dismisses the notificaiton you tap on so only clear the badge (and notifications [side-effect]) if it was set.
+        [[UIApplication sharedApplication] setApplicationIconBadgeNumber:1];
+        [[UIApplication sharedApplication] setApplicationIconBadgeNumber:0];
+    }
 
     return wasBadgeSet;
 }
@@ -842,12 +848,20 @@ - (NSDictionary*)getAdditionalData {
         additionalData[@"sound"] = self.lastMessageReceived[@"aps"][@"sound"];
     if (self.lastMessageReceived[@"custom"][@"u"] != nil)
         additionalData[@"launchURL"] = self.lastMessageReceived[@"custom"][@"u"];
+    if ([self.lastMessageReceived[@"aps"][@"alert"] isKindOfClass:[NSDictionary class]])
+         additionalData[@"title"] = self.lastMessageReceived[@"aps"][@"alert"][@"title"];
 
     return additionalData;
 }
 
 - (NSString*)getMessageString {
-    return self.lastMessageReceived[@"aps"][@"alert"];
+    id alertObj = self.lastMessageReceived[@"aps"][@"alert"];
+    if ([alertObj isKindOfClass:[NSString class]])
+        return alertObj;
+    else if ([alertObj isKindOfClass:[NSDictionary class]])
+        return alertObj[@"body"];
+    
+    return @"";
 }
 
 - (void)postNotification:(NSDictionary*)jsonData {
@@ -982,7 +996,6 @@ - (void)setSubscription:(BOOL)enable {
     [self sendNotificationTypesUpdateIsConfirmed:false];
 }
 
-
 - (void)didRegisterForRemoteNotifications:(UIApplication*)app deviceToken:(NSData*)inDeviceToken {
     NSString* trimmedDeviceToken = [[inDeviceToken description] stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"<>"]];
     NSString* parsedDeviceToken = [[trimmedDeviceToken componentsSeparatedByString:@" "] componentsJoinedByString:@""];
@@ -995,6 +1008,7 @@ - (void)didRegisterForRemoteNotifications:(UIApplication*)app deviceToken:(NSDat
 }
 
 - (void) remoteSilentNotification:(UIApplication*)application UserInfo:(NSDictionary*)userInfo {
+    // If 'm' present then the notification has action buttons attached to it.
     if (userInfo[@"m"]) {
         NSDictionary* data = userInfo;
 
@@ -1026,7 +1040,13 @@ - (void) remoteSilentNotification:(UIApplication*)application UserInfo:(NSDictio
 
         UILocalNotification* notification = [[UILocalNotification alloc] init];
         notification.category = [category identifier];
-        notification.alertBody = data[@"m"];
+        if ([data[@"m"] isKindOfClass:[NSDictionary class]]) {
+            if ([notification respondsToSelector:NSSelectorFromString(@"alertTitle")])
+                notification.alertTitle = data[@"m"][@"title"];
+            notification.alertBody = data[@"m"][@"body"];
+        }
+        else
+            notification.alertBody = data[@"m"];
         notification.userInfo = userInfo;
         notification.soundName = data[@"s"];
         if (notification.soundName == nil)
@@ -1036,7 +1056,7 @@ - (void) remoteSilentNotification:(UIApplication*)application UserInfo:(NSDictio
 
         [[UIApplication sharedApplication] scheduleLocalNotification:notification];
     }
-    else
+    else if (application.applicationState != UIApplicationStateBackground)
         [self notificationOpened:userInfo isActive:[application applicationState] == UIApplicationStateActive];
 }
 
@@ -1232,11 +1252,15 @@ + (void)load {
 static Class delegateClass = nil;
 
 - (void) setOneSignalDelegate:(id<UIApplicationDelegate>)delegate {
-	if(delegateClass != nil)
-		return;
+    if (delegateClass != nil) {
+        [self setOneSignalDelegate:delegate];
+        return;
+    }
+    
 
 	delegateClass = getClassWithProtocolInHierarchy([delegate class], @protocol(UIApplicationDelegate));
 
+    
     injectSelector(self.class, @selector(oneSignalRemoteSilentNotification:UserInfo:fetchCompletionHandler:),
                     delegateClass, @selector(application:didReceiveRemoteNotification:fetchCompletionHandler:));