Merge pull request #56 from OneSignal/2.0.9

2.0.9

Author: jkasten2

OneSignal.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "OneSignal"
-  s.version          = "2.0.8"
+  s.version          = "2.0.9"
   s.summary          = "OneSignal push notification library for mobile apps."
   s.homepage         = "https://onesignal.com"
   s.license          = { :type => 'MIT', :file => 'LICENSE' }

iOS_SDK/Framework/OneSignal.framework/Versions/A/Headers/OneSignal.h

@@ -25,6 +25,27 @@
  * THE SOFTWARE.
  */
 
+/***
+ 
+ ### Setting up the SDK ###
+ Follow the documentation from https://documentation.onesignal.com/docs/installing-the-onesignal-ios-sdk to setup OneSignal in your app.
+ 
+ ### API Reference ###
+ Follow the documentation from https://documentation.onesignal.com/docs/ios-sdk-api for a detailed explanation of the API.
+ 
+ ### FAQ & Troubleshoot ###
+ FAQ: https://documentation.onesignal.com/docs/frequently-asked-questions-1
+ Troubleshoot: https://documentation.onesignal.com/docs/common-problems-1
+ 
+ For help on how to upgrade your code from 1.* SDK to 2.*: https://documentation.onesignal.com/docs/upgrading-to-sdk-20
+ 
+ ### More ###
+ iOS Configuration: https://documentation.onesignal.com/docs/generating-an-ios-push-certificate
+ REST API: https://documentation.onesignal.com/docs/server-api-overview
+ Create Notification API: https://documentation.onesignal.com/docs/notifications-create-notification
+ 
+***/
+
 #import <Foundation/Foundation.h>
 
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
@@ -158,17 +179,11 @@ extern NSString * const kOSSettingsKeyInAppAlerts;
 extern NSString * const kOSSettingsKeyInAppLaunchURL;
 
 /**
- `OneSignal` provides a high level interface to interact with OneSignal's push service.
- 
- `OneSignal` exposes a defaultClient for applications which use a globally available client to share configuration settings.
- 
- Include `#import "OneSignal/OneSignal.h"` in your application files to access OneSignal's methods.
- 
- ### Setting up the SDK ###
- 
- Follow the documentation from http://documentation.gamethrive.com/v1.0/docs/installing-the-gamethrive-ios-sdk to setup with your game.
- 
- */
+    OneSignal provides a high level interface to interact with OneSignal's push service.
+    OneSignal is a singleton for applications which use a globally available client to share configuration settings.
+    You should avoid creating instances of this class at all costs. Instead, access its instance methods.
+    Include `#import <OneSignal/OneSignal.h>` in your application files to access OneSignal's methods.
+ **/
 @interface OneSignal : NSObject
 
 extern NSString* const ONESIGNAL_VERSION;

iOS_SDK/Framework/OneSignal.framework/Versions/A/OneSignal

@@ -25,6 +25,27 @@
  * THE SOFTWARE.
  */
 
+/***
+ 
+ ### Setting up the SDK ###
+ Follow the documentation from https://documentation.onesignal.com/docs/installing-the-onesignal-ios-sdk to setup OneSignal in your app.
+ 
+ ### API Reference ###
+ Follow the documentation from https://documentation.onesignal.com/docs/ios-sdk-api for a detailed explanation of the API.
+ 
+ ### FAQ & Troubleshoot ###
+ FAQ: https://documentation.onesignal.com/docs/frequently-asked-questions-1
+ Troubleshoot: https://documentation.onesignal.com/docs/common-problems-1
+ 
+ For help on how to upgrade your code from 1.* SDK to 2.*: https://documentation.onesignal.com/docs/upgrading-to-sdk-20
+ 
+ ### More ###
+ iOS Configuration: https://documentation.onesignal.com/docs/generating-an-ios-push-certificate
+ REST API: https://documentation.onesignal.com/docs/server-api-overview
+ Create Notification API: https://documentation.onesignal.com/docs/notifications-create-notification
+ 
+***/
+
 #import <Foundation/Foundation.h>
 
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
@@ -158,17 +179,11 @@ extern NSString * const kOSSettingsKeyInAppAlerts;
 extern NSString * const kOSSettingsKeyInAppLaunchURL;
 
 /**
- `OneSignal` provides a high level interface to interact with OneSignal's push service.
- 
- `OneSignal` exposes a defaultClient for applications which use a globally available client to share configuration settings.
- 
- Include `#import "OneSignal/OneSignal.h"` in your application files to access OneSignal's methods.
- 
- ### Setting up the SDK ###
- 
- Follow the documentation from http://documentation.gamethrive.com/v1.0/docs/installing-the-gamethrive-ios-sdk to setup with your game.
- 
- */
+    OneSignal provides a high level interface to interact with OneSignal's push service.
+    OneSignal is a singleton for applications which use a globally available client to share configuration settings.
+    You should avoid creating instances of this class at all costs. Instead, access its instance methods.
+    Include `#import <OneSignal/OneSignal.h>` in your application files to access OneSignal's methods.
+ **/
 @interface OneSignal : NSObject
 
 extern NSString* const ONESIGNAL_VERSION;

iOS_SDK/Framework/OneSignal.framework/Versions/B/Headers/OneSignal.h

@@ -25,6 +25,27 @@
  * THE SOFTWARE.
  */
 
+/***
+ 
+ ### Setting up the SDK ###
+ Follow the documentation from https://documentation.onesignal.com/docs/installing-the-onesignal-ios-sdk to setup OneSignal in your app.
+ 
+ ### API Reference ###
+ Follow the documentation from https://documentation.onesignal.com/docs/ios-sdk-api for a detailed explanation of the API.
+ 
+ ### FAQ & Troubleshoot ###
+ FAQ: https://documentation.onesignal.com/docs/frequently-asked-questions-1
+ Troubleshoot: https://documentation.onesignal.com/docs/common-problems-1
+ 
+ For help on how to upgrade your code from 1.* SDK to 2.*: https://documentation.onesignal.com/docs/upgrading-to-sdk-20
+ 
+ ### More ###
+ iOS Configuration: https://documentation.onesignal.com/docs/generating-an-ios-push-certificate
+ REST API: https://documentation.onesignal.com/docs/server-api-overview
+ Create Notification API: https://documentation.onesignal.com/docs/notifications-create-notification
+ 
+***/
+
 #import <Foundation/Foundation.h>
 
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
@@ -158,17 +179,11 @@ extern NSString * const kOSSettingsKeyInAppAlerts;
 extern NSString * const kOSSettingsKeyInAppLaunchURL;
 
 /**
- `OneSignal` provides a high level interface to interact with OneSignal's push service.
- 
- `OneSignal` exposes a defaultClient for applications which use a globally available client to share configuration settings.
- 
- Include `#import "OneSignal/OneSignal.h"` in your application files to access OneSignal's methods.
- 
- ### Setting up the SDK ###
- 
- Follow the documentation from http://documentation.gamethrive.com/v1.0/docs/installing-the-gamethrive-ios-sdk to setup with your game.
- 
- */
+    OneSignal provides a high level interface to interact with OneSignal's push service.
+    OneSignal is a singleton for applications which use a globally available client to share configuration settings.
+    You should avoid creating instances of this class at all costs. Instead, access its instance methods.
+    Include `#import <OneSignal/OneSignal.h>` in your application files to access OneSignal's methods.
+ **/
 @interface OneSignal : NSObject
 
 extern NSString* const ONESIGNAL_VERSION;

iOS_SDK/Framework/OneSignal.framework/Versions/B/OneSignal

@@ -45,6 +45,7 @@
 #import <sys/sysctl.h>
 #import <objc/runtime.h>
 
+#define NOTIFICATION_TYPE_NONE 0
 #define NOTIFICATION_TYPE_BADGE 1
 #define NOTIFICATION_TYPE_SOUND 2
 #define NOTIFICATION_TYPE_ALERT 4
@@ -81,7 +82,7 @@
 
 @implementation OneSignal
 
-NSString* const ONESIGNAL_VERSION = @"020008";
+NSString* const ONESIGNAL_VERSION = @"020009";
 
 static bool registeredWithApple = false; //Has attempted to register for push notifications with Apple.
 static OneSignalTrackIAP* trackIAPPurchase;
@@ -182,8 +183,8 @@ + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId
         if (autoPrompt || registeredWithApple)
             [self registerForPushNotifications];
 
-        
         // iOS 8 - Register for remote notifications to get a token now since registerUserNotificationSettings is what shows the prompt.
+        // If autoprompt disabled, get a token from APNS for silent notifications until user calls regsiterForPushNotifications to request push permissions from user.
         else if ([[UIApplication sharedApplication] respondsToSelector:@selector(registerForRemoteNotifications)])
             [[UIApplication sharedApplication] registerForRemoteNotifications];
 
@@ -287,11 +288,13 @@ + (void)registerForPushNotifications {
     }
 }
 
+//Block not assigned if userID nil and there is a device token
 + (void)IdsAvailable:(OSIdsAvailableBlock)idsAvailableBlock {
+    
     if (mUserId)
         idsAvailableBlock(mUserId, [self getUsableDeviceToken]);
 
-    if (mUserId == nil || [self getUsableDeviceToken] == nil)
+    if (!mUserId || ![self getUsableDeviceToken])
         idsAvailableBlockWhenReady = idsAvailableBlock;
 }
 
@@ -476,7 +479,7 @@ + (void)setSubscription:(BOOL)enable {
 
     mSubscriptionSet = enable;
 
-    [OneSignal sendNotificationTypesUpdateIsConfirmed:false];
+    [OneSignal sendNotificationTypesUpdate:false];
 }
 
 + (void) promptLocation {
@@ -492,17 +495,20 @@ + (void)registerDeviceToken:(id)inDeviceToken onSuccess:(OSResultSuccessBlock)su
 
 + (void)updateDeviceToken:(NSString*)deviceToken onSuccess:(OSResultSuccessBlock)successBlock onFailure:(OSFailureBlock)failureBlock {
 
+    // Do not block next registration as there's a new token in hand
+    nextRegistrationIsHighPriority = YES;
+    
     if (mUserId == nil) {
         mDeviceToken = deviceToken;
         tokenUpdateSuccessBlock = successBlock;
         tokenUpdateFailureBlock = failureBlock;
 
-        // iOS 8 - We get a token right away but give the user 20 sec to responsed to the system prompt.
+        // iOS 8 - We get a token right away but give the user 10 sec to responsed to the system prompt.
         // Also check mNotificationTypes so there is no waiting if user has already answered the system prompt.
         // The goal is to only have 1 server call.
         if ([OneSignalHelper isCapableOfGettingNotificationTypes] && mNotificationTypes == -1) {
             [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(registerUser) object:nil];
-            [self performSelector:@selector(registerUser) withObject:nil afterDelay:20.0f];
+            [self performSelector:@selector(registerUser) withObject:nil afterDelay:10.0f];
         }
         else
             [OneSignal registerUser];
@@ -534,17 +540,19 @@ + (void)updateDeviceToken:(NSString*)deviceToken onSuccess:(OSResultSuccessBlock
 
     if (idsAvailableBlockWhenReady) {
         mNotificationTypes = [self getNotificationTypes];
-        if ([self getUsableDeviceToken])
-        idsAvailableBlockWhenReady(mUserId, [self getUsableDeviceToken]);
-        idsAvailableBlockWhenReady = nil;
+        if ([self getUsableDeviceToken]) {
+            idsAvailableBlockWhenReady(mUserId, [self getUsableDeviceToken]);
+            idsAvailableBlockWhenReady = nil;
+        }
     }
+    
 }
 
-//Set to yes whenever a high priority registration fails ... need to make the next one a high priority to disregard the 1 hour timer delay
+//Set to yes whenever a high priority registration fails ... need to make the next one a high priority to disregard the timer delay
 bool nextRegistrationIsHighPriority = NO;
 
 + (BOOL)isHighPriorityCall {
-    return mUserId == nil || (mDeviceToken == nil && mNotificationTypes > 0) || nextRegistrationIsHighPriority;
+    return mUserId == nil || (mDeviceToken == nil && mNotificationTypes > NOTIFICATION_TYPE_NONE) || nextRegistrationIsHighPriority;
 }
 
 +(BOOL)shouldRegisterNow {
@@ -570,7 +578,6 @@ + (void)registerUser {
     if (waitingForOneSReg || ![self shouldRegisterNow])
         return;
 
-    
     waitingForOneSReg = true;
 
     NSMutableURLRequest* request;
@@ -677,8 +684,8 @@ + (void)registerUser {
 
             if (idsAvailableBlockWhenReady) {
                 idsAvailableBlockWhenReady(mUserId, [self getUsableDeviceToken]);
-                if ([self getUsableDeviceToken])
-                idsAvailableBlockWhenReady = nil;
+                if (mDeviceToken)
+                    idsAvailableBlockWhenReady = nil;
             }
         }
     } onFailure:^(NSError* error) {
@@ -689,16 +696,16 @@ + (void)registerUser {
         nextRegistrationIsHighPriority = YES;
     }];
 }
-    
+
 +(NSString*) getUsableDeviceToken {
-    if (mNotificationTypes > 0)
-        return mDeviceToken;
-    return nil;
+    return (mNotificationTypes > 0) ? mDeviceToken : NULL;
 }
+
+//Updates the server with the new user's notification Types
++ (void) sendNotificationTypesUpdate:(BOOL)isNewType {
 
-+ (void) sendNotificationTypesUpdateIsConfirmed:(BOOL)isConfirm {
     // User changed notification settings for the app.
-    if (mNotificationTypes != -1 && mUserId && (isConfirm || mNotificationTypes != [self getNotificationTypes])) {
+    if (mNotificationTypes != -1 && mUserId && (isNewType || mNotificationTypes != [self getNotificationTypes])) {
         mNotificationTypes = [self getNotificationTypes];
         NSMutableURLRequest* request = [httpClient requestWithMethod:@"PUT" path:[NSString stringWithFormat:@"players/%@", mUserId]];
 
@@ -910,20 +917,21 @@ + (int) getNotificationTypes {
 
 // iOS 8.0+ only
 + (void) updateNotificationTypes:(int)notificationTypes {
+    
     if (mNotificationTypes == -2)
-    return;
+        return;
 
     BOOL changed = (mNotificationTypes != notificationTypes);
 
     mNotificationTypes = notificationTypes;
 
-    if (mUserId == nil && mDeviceToken)
+    if (!mUserId && mDeviceToken)
         [OneSignal registerUser];
     else if (mDeviceToken)
-        [self sendNotificationTypesUpdateIsConfirmed:changed];
+        [self sendNotificationTypesUpdate:changed];
 
     if (idsAvailableBlockWhenReady && mUserId && [self getUsableDeviceToken])
-    idsAvailableBlockWhenReady(mUserId, [self getUsableDeviceToken]);
+        idsAvailableBlockWhenReady(mUserId, [self getUsableDeviceToken]);
 }
 
 + (void)didRegisterForRemoteNotifications:(UIApplication*)app deviceToken:(NSData*)inDeviceToken {