Merge pull request #718 from OneSignal/fix/second_webview_not_cleared

Fixing webviews not being cleared properly
OneSignal · Aug 7, 2020 · 380f40f · 380f40f
2 parents 2e4a36c + ccd0251
commit 380f40f
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalWebView.m b/iOS_SDK/OneSignalSDK/Source/OneSignalWebView.m
@@ -105,8 +105,9 @@ - (void)showInApp {
     if (!navController) {
         navController = [[UINavigationController alloc] initWithRootViewController:self];
         navController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
-        navController.presentationController.delegate = self;
     }
+    navController.presentationController.delegate = self;
+
     if (!viewControllerForPresentation) {
         viewControllerForPresentation = [[UIViewController alloc] init];
         [[viewControllerForPresentation view] setBackgroundColor:[UIColor clearColor]];
@@ -122,8 +123,9 @@ - (void)showInApp {
 
     UIWindow* mainWindow = [[UIApplication sharedApplication] keyWindow];
 
-    if (!viewControllerForPresentation.view.superview)
+    if (!viewControllerForPresentation.view.superview) {
         [mainWindow addSubview:[viewControllerForPresentation view]];
+    }
 
     @try {
         [viewControllerForPresentation presentViewController:navController animated:YES completion:nil];
@@ -133,11 +135,15 @@ - (void)showInApp {
 
 - (void)clearWebView {
     [_webView loadHTMLString:@"" baseURL:nil];
-    if (viewControllerForPresentation)
+    if (viewControllerForPresentation) {
+        [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"clearing web view"];
         [viewControllerForPresentation.view removeFromSuperview];
+    }
+
 }
 
 - (void)presentationControllerDidDismiss:(UIPresentationController *)presentationController {
+    [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"presentation controller did dismiss webview"];
     [self clearWebView];
 }