Fixes an issue with the in-app webview during device rotation (#317)

* When a user received a push notification with launchUrl specified, and the app displayed the webview, this webview was being manually added as a subview but had no layout constraints. This meant that when the device orientation changed the webview didn't change its frame to match.

* App-store launch URL's from push notifications will no longer open an (empty) in-app web view. Instead the app will directly open the App Store link without a blank web view.

Author: Nightsd01

iOS_SDK/OneSignalSDK/Source/OneSignalHelper.m

@@ -838,6 +838,12 @@ + (void) displayWebView:(NSURL*)url {
 
     inAppLaunch = [[[NSUserDefaults standardUserDefaults] objectForKey:@"ONESIGNAL_INAPP_LAUNCH_URL"] boolValue];
 
+    // If the URL contains itunes.apple.com, it's an app store link
+    // that should be opened using sharedApplication openURL
+    if ([[url absoluteString] containsString:@"itunes.apple.com"]) {
+        inAppLaunch = NO;
+    }
+    
     if (inAppLaunch && [self isWWWScheme:url]) {
         if (!webVC)
             webVC = [[OneSignalWebView alloc] init];

iOS_SDK/OneSignalSDK/Source/OneSignalWebView.m

@@ -28,6 +28,7 @@
 #import <UIKit/UIKit.h>
 #import "OneSignalWebView.h"
 #import "OneSignal.h"
+#import "OneSignalHelper.h"
 
 @interface OneSignal ()
 + (void) onesignal_Log:(ONE_S_LOG_LEVEL)logLevel message:(NSString*) message;
@@ -40,12 +41,12 @@ @implementation OneSignalWebView
 
 -(void)viewDidLoad {
     [super viewDidLoad];
-
-    _webView = [[UIWebView alloc] initWithFrame:self.view.frame];
+    
+    _webView = [UIWebView new];
     _webView.delegate = self;
     [self.view addSubview:_webView];
 
-    [self.view setBackgroundColor:[UIColor blackColor]];
+    [self pinSubviewToMarginsWithSubview:_webView withSuperview:self.view];
 
     self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(dismiss:)];
 
@@ -68,7 +69,7 @@ -(void)dismiss:(id)sender {
         //clear web view
         [_webView loadHTMLString:@"" baseURL:nil];
         if (viewControllerForPresentation)
-           [viewControllerForPresentation.view removeFromSuperview];
+            [viewControllerForPresentation.view removeFromSuperview];
     }];
 }
 
@@ -86,6 +87,19 @@ -(void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
     [OneSignal onesignal_Log:ONE_S_LL_ERROR message:error.localizedDescription];
 }
 
+-(void)pinSubviewToMarginsWithSubview:(UIView *)subview withSuperview:(UIView *)superview {
+    subview.translatesAutoresizingMaskIntoConstraints = false;
+    
+    let attributes = @[@(NSLayoutAttributeTop), @(NSLayoutAttributeBottom), @(NSLayoutAttributeLeading), @(NSLayoutAttributeTrailing)];
+    
+    for (NSNumber *layoutAttribute in attributes) {
+        let attribute = (NSLayoutAttribute)[layoutAttribute longValue];
+        [self.view addConstraint:[NSLayoutConstraint constraintWithItem:subview attribute:attribute relatedBy:NSLayoutRelationEqual toItem:superview attribute:attribute multiplier:1.0 constant:0.0]];
+    }
+    
+    [superview layoutIfNeeded];
+}
+
 
 -(void)showInApp {
     // if already presented, no need to present again
@@ -110,13 +124,15 @@ -(void)showInApp {
 
     if (!viewControllerForPresentation.view.superview)
         [mainWindow addSubview:[viewControllerForPresentation view]];
-
+    
     @try {
-       [viewControllerForPresentation presentViewController:navController animated:YES completion:nil];
+        [viewControllerForPresentation presentViewController:navController animated:YES completion:nil];
     }
     @catch(NSException* exception) { }
 }
 
 
 
 @end
+
+