Fixed SDK VebView hiding when opening a 2nd notification with a URL

* Also uses openURL for app scheme URL instead of trying to show a web view.
* This commit fixes issue #123.

Author: jkasten2

iOS_SDK/OneSignal/OneSignal.m

@@ -983,12 +983,11 @@ + (void) handleNotificationOpened:(NSDictionary*)messageDict isActive:(BOOL)isAc
 
 + (void)launchWebURL:(NSString*)openUrl {
 
-    if (openUrl) {
-        if ([OneSignalHelper verifyURL:openUrl]) {
-            //Create a dleay to allow alertview to dismiss before showing anything or going to safari
-            NSURL *url = [NSURL URLWithString:openUrl];
-            [OneSignalHelper performSelector:@selector(displayWebView:) withObject:url afterDelay:0.5];
-        }
+    if (openUrl && [OneSignalHelper verifyURL:openUrl]) {
+        NSURL *url = [NSURL URLWithString:openUrl];
+        // Give the app resume animation time to finish when tapping on a notificaion from the notificaiton center.
+        // Isn't a requiremnt but improves visual flow.
+        [OneSignalHelper performSelector:@selector(displayWebView:) withObject:url afterDelay:0.5];
     }
 
 }

iOS_SDK/OneSignal/OneSignalHelper.m

@@ -824,22 +824,29 @@ + (void)handleJSONNSURLResponse:(NSURLResponse*) response data:(NSData*) data er
 
 + (void) displayWebView:(NSURL*)url {
 
-    //Check if in-app or safari
+    // Check if in-app or safari
     BOOL inAppLaunch = YES;
-    if(![[NSUserDefaults standardUserDefaults] objectForKey:@"ONESIGNAL_INAPP_LAUNCH_URL"]) {
+    if( ![[NSUserDefaults standardUserDefaults] objectForKey:@"ONESIGNAL_INAPP_LAUNCH_URL"]) {
         [[NSUserDefaults standardUserDefaults] setObject:@YES forKey:@"ONESIGNAL_INAPP_LAUNCH_URL"];
         [[NSUserDefaults standardUserDefaults] synchronize];
     }
 
     inAppLaunch = [[[NSUserDefaults standardUserDefaults] objectForKey:@"ONESIGNAL_INAPP_LAUNCH_URL"] boolValue];
+    NSString* urlScheme = [url.scheme lowercaseString];
+    BOOL isWWWScheme = [urlScheme isEqualToString:@"http"] || [urlScheme isEqualToString:@"https"];
 
-    if(inAppLaunch) {
-        if(!webVC)
+    if (inAppLaunch && isWWWScheme) {
+        if (!webVC)
             webVC = [[OneSignalWebView alloc] init];
         webVC.url = url;
         [webVC showInApp];
     }
-    else [[UIApplication sharedApplication] openURL:url];
+    else {
+        // Keep dispatch_async. Without this the url can take an extra 2 to 10 secounds to open.
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [[UIApplication sharedApplication] openURL:url];
+        });
+    }
 
 }
 

iOS_SDK/OneSignalTracker.m

@@ -60,13 +60,15 @@ + (void) endBackgroundFocusTask {
 }
 
 + (void)onFocus:(BOOL)toBackground {
-    bool wasBadgeSet = false;
 
     //Prevent the onFocus to be called twice when app being terminated
     // (Both WillResignActive and willTerminate
-    if(lastOnFocusWasToBackground == toBackground) return;
+    if (lastOnFocusWasToBackground == toBackground)
+        return;
     lastOnFocusWasToBackground = toBackground;
 
+    bool wasBadgeSet = false;
+    
     NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
     NSTimeInterval timeToPingWith = 0.0;
 
@@ -75,11 +77,6 @@ + (void)onFocus:(BOOL)toBackground {
         lastOpenedTime = now;
         [OneSignal sendNotificationTypesUpdate];
         wasBadgeSet = [OneSignal clearBadgeCount:false];
-        
-        //Make sure webview dismissed if came back from deep link
-        OneSignalWebView *webVC = [OneSignalHelper webVC];
-        if(webVC)
-            [webVC dismiss:self];
     }
     else {
 

iOS_SDK/OneSignalWebView.m

@@ -39,7 +39,6 @@ @implementation OneSignalWebView
 UIViewController *viewControllerForPresentation;
 
 -(void)viewDidLoad {
-    
     _webView = [[UIWebView alloc] initWithFrame:self.view.frame];
     _webView.delegate = self;
     [self.view addSubview:_webView];
@@ -54,6 +53,7 @@ -(void)viewDidLoad {
     self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:_uiBusy];
 }
 
+
 -(void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     if (_url)
@@ -65,7 +65,7 @@ -(void)dismiss:(id)sender {
     [self.navigationController dismissViewControllerAnimated:true completion:^{
         //clear web view
         [_webView loadHTMLString:@"" baseURL:nil];
-        if(viewControllerForPresentation)
+        if (viewControllerForPresentation)
            [viewControllerForPresentation.view removeFromSuperview];
     }];
 }
@@ -86,31 +86,32 @@ -(void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
 
 
 -(void)showInApp {
-    
-    //if already presented, no need to present again
-    if(!navController) {
+    // if already presented, no need to present again
+    if (!navController) {
         navController = [[UINavigationController alloc] initWithRootViewController:self];
         navController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
     }
-    if(!viewControllerForPresentation) {
+    if (!viewControllerForPresentation) {
         viewControllerForPresentation = [[UIViewController alloc] init];
         [[viewControllerForPresentation view] setBackgroundColor:[UIColor clearColor]];
         [[viewControllerForPresentation view] setOpaque:FALSE];
     }
-
-    UIWindow* mainWindow = [[UIApplication sharedApplication] keyWindow];
 
     if (navController.isViewLoaded && navController.view.window) {
         // navController is visible only refresh webview
-        if(_url)
+        if (_url)
             [_webView loadRequest:[NSURLRequest requestWithURL:_url]];
         return;
     }
 
-    if(!viewControllerForPresentation.view.superview)
+    UIWindow* mainWindow = [[UIApplication sharedApplication] keyWindow];
+    
+    if (!viewControllerForPresentation.view.superview)
         [mainWindow addSubview:[viewControllerForPresentation view]];
 
-    @try { [viewControllerForPresentation presentViewController:navController animated:YES completion:NULL]; }
+    @try {
+       [viewControllerForPresentation presentViewController:navController animated:NO completion:nil];
+    }
     @catch(NSException* exception) { }
 }