- Fixed an issue where receiving two notifications with launchURLs would launch multiple webviews without dismissing currently open ones.

- Updated device registration login. OneSignal will now wait a few seconds to try to get a device token before registering with OneSignal. This prevents some cases where devices could be duplicated on the OneSignal dashboard when previous device data was imported.

Author: Joseph Kalash

OneSignal.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "OneSignal"
-  s.version          = "2.1.1"
+  s.version          = "2.1.2"
   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/OneSignal

@@ -71,7 +71,7 @@
 
 @implementation OneSignal
 
-NSString* const ONESIGNAL_VERSION = @"020101";
+NSString* const ONESIGNAL_VERSION = @"020102";
 static NSString* mSDKType = @"native";
 static BOOL coldStartFromTapOnNotification = NO;
 static BOOL registeredWithApple = NO; //Has attempted to register for push notifications with Apple.
@@ -186,6 +186,11 @@ + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId
         else if ([[UIApplication sharedApplication] respondsToSelector:@selector(registerForRemoteNotifications)])
             [[UIApplication sharedApplication] registerForRemoteNotifications];
 
+        if (mUserId != nil)
+            [self registerUser];
+        else // Fall back incase Apple does not responsed in time.
+            [self performSelector:@selector(registerUser) withObject:nil afterDelay:30.0f];
+        
         [OneSignalTracker onFocus:NO];
     }
 
@@ -506,12 +511,12 @@ + (void)updateDeviceToken:(NSString*)deviceToken onSuccess:(OSResultSuccessBlock
         tokenUpdateSuccessBlock = successBlock;
         tokenUpdateFailureBlock = failureBlock;
 
-        // iOS 8 - We get a token right away but give the user 10 sec to responsed to the system prompt.
+        // iOS 8 - We get a token right away but give the user 30 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:10.0f];
+            [self performSelector:@selector(registerUser) withObject:nil afterDelay:30.0f];
         }
         else
             [OneSignal registerUser];

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

@@ -74,7 +74,6 @@ + (void)onFocus:(BOOL)toBackground {
         lastOpenedTime = now;
         [OneSignal sendNotificationTypesUpdate:false];
         wasBadgeSet = [OneSignal clearBadgeCount:false];
-        [OneSignal registerUser];
 
         //Make sure webview dismissed if came back from deep link
         OneSignalWebView *webVC = [OneSignalHelper webVC];

iOS_SDK/OneSignal/OneSignal.m

@@ -98,15 +98,19 @@ -(void)showInApp {
     }
 
     UIWindow* mainWindow = [[UIApplication sharedApplication] keyWindow];
+    
+    if (navController.isViewLoaded && navController.view.window) {
+        // navController is visible only refresh webview
+        if(_url)
+            [_webView loadRequest:[NSURLRequest requestWithURL:_url]];
+        return;
+    }
+    
     if(!viewControllerForPresentation.view.superview)
         [mainWindow addSubview:[viewControllerForPresentation view]];
 
-        @try {
-    [viewControllerForPresentation presentViewController:navController animated:YES completion:NULL];
-        }
-    @catch(NSException* exception) {
-        NSLog(@"%@", exception);
-    }
+    @try { [viewControllerForPresentation presentViewController:navController animated:YES completion:NULL]; }
+    @catch(NSException* exception) { }
 }