Switching to WKWebView (#318)

* Switching to WKWebView

* Fixing build failing

Author: milos1290

Leanplum-SDK/Classes/LPMessageTemplates.h

@@ -29,9 +29,10 @@
 // That's it!
 
 #import <Foundation/Foundation.h>
+#import <WebKit/WebKit.h>
 #import "Leanplum.h"
 
-@interface LPMessageTemplatesClass : NSObject <UIAlertViewDelegate, UIWebViewDelegate>
+@interface LPMessageTemplatesClass : NSObject <UIAlertViewDelegate, WKNavigationDelegate>
 
 + (LPMessageTemplatesClass *)sharedTemplates;
 

Leanplum-SDK/Classes/LPMessageTemplates.m

@@ -617,7 +617,11 @@ - (void)showPopup
     BOOL isPushAskToAsk = [context.actionName isEqualToString:LPMT_PUSH_ASK_TO_ASK];
 
     if (isWeb) {
-        _popupView = [[UIWebView alloc] init];
+        WKWebViewConfiguration* configuration = [WKWebViewConfiguration new];
+        configuration.allowsInlineMediaPlayback = YES;
+        configuration.mediaTypesRequiringUserActionForPlayback = WKAudiovisualMediaTypeNone;
+
+        _popupView = [[WKWebView alloc] initWithFrame:CGRectZero configuration:configuration];
     } else {
         _popupView = [[UIView alloc] init];
     }
@@ -627,8 +631,8 @@ - (void)showPopup
     if ([context.actionName isEqualToString:LPMT_HTML_NAME]) {
         _popupView.backgroundColor = [UIColor clearColor];
         [_popupView setOpaque:NO];
-        ((UIWebView *)_popupView).scrollView.scrollEnabled = NO;
-        ((UIWebView *)_popupView).scrollView.bounces = NO;
+        ((WKWebView *)_popupView).scrollView.scrollEnabled = NO;
+        ((WKWebView *)_popupView).scrollView.bounces = NO;
     }
 
     if (!isWeb) {
@@ -758,7 +762,7 @@ - (void)closePopupWithAnimation:(BOOL)animated
     }
 
     // UI can't be modified in background.
-    if (![NSThread isMainThread]) {
+    if (![NSThread isMainThread]) { 
         dispatch_sync(dispatch_get_main_queue(), ^{
             [self closePopupWithAnimation:animated actionNamed:actionName track:track];
         });
@@ -770,8 +774,8 @@ - (void)closePopupWithAnimation:(BOOL)animated
 
     if ([[context actionName] isEqualToString:LPMT_WEB_INTERSTITIAL_NAME] ||
         [[context actionName] isEqualToString:LPMT_HTML_NAME] ) {
-        ((UIWebView *)_popupView).delegate = nil;
-        [(UIWebView *)_popupView stopLoading];
+        ((WKWebView *)_popupView).navigationDelegate = nil;
+        [(WKWebView *)_popupView stopLoading];
     }
 
     void (^finishCallback)(void) = ^() {
@@ -1205,18 +1209,16 @@ - (void)refreshPopupContent
                    [actionName isEqualToString:LPMT_HTML_NAME]) {
             if (_popupGroup) {
                 [_popupGroup setHidden:YES];  // Keep hidden until load is done
-                UIWebView *webView = (UIWebView *)_popupView;
+                WKWebView *webView = (WKWebView *)_popupView;
                 _webViewNeedsFade = YES;
-                webView.delegate = self;
+                webView.navigationDelegate = self;
                 if (@available(iOS 11.0, *)) {
                     webView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
                 }
                 if ([actionName isEqualToString:LPMT_WEB_INTERSTITIAL_NAME]) {
                     [webView loadRequest:[NSURLRequest requestWithURL:
                                         [NSURL URLWithString:[context stringNamed:LPMT_ARG_URL]]]];
                 } else {
-                    webView.allowsInlineMediaPlayback = YES;
-                    webView.mediaPlaybackRequiresUserAction = NO;
                     NSString *html = [context htmlWithTemplateNamed:LPMT_ARG_HTML_TEMPLATE];
                     [webView loadHTMLString:html baseURL:nil];
                 }
@@ -1315,9 +1317,9 @@ - (void)setAlternateIconWithFilename:(NSString *)filename
     }
 }
 
-#pragma mark - UIWebViewDelegate methods
+#pragma mark - WKWebViewDelegate methods
 
-- (void)showWebview:(UIWebView *)webview {
+- (void)showWebview:(WKWebView *)webview {
     [_popupGroup setHidden:NO];
     if (_webViewNeedsFade) {
         _webViewNeedsFade = NO;
@@ -1345,7 +1347,7 @@ - (NSDictionary *)queryComponentsFromUrl:(NSString *)url {
     return components;
 }
 
-- (void)webViewDidFinishLoad:(UIWebView *)webView
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
 {
     if (webView.isLoading) {
         return;
@@ -1358,29 +1360,32 @@ - (void)webViewDidFinishLoad:(UIWebView *)webView
     }
 }
 
-- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request
- navigationType:(UIWebViewNavigationType)navigationType
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
 {
     LPActionContext *context = _contexts.lastObject;
     @try {
-        NSString *url = request.URL.absoluteString;
+
+        NSString *url = [navigationAction request].URL.absoluteString;
         NSDictionary *queryComponents = [self queryComponentsFromUrl:url];
         if ([url rangeOfString:[context stringNamed:LPMT_ARG_URL_CLOSE]].location != NSNotFound) {
             [self dismiss];
             if (queryComponents[@"result"]) {
                 [Leanplum track:queryComponents[@"result"]];
             }
-            return NO;
+            decisionHandler(WKNavigationActionPolicyCancel);
+            return;
         }
 
         // Only continue for HTML Template. Web Insterstitial will be deprecated.
         if ([[context actionName] isEqualToString:LPMT_WEB_INTERSTITIAL_NAME]) {
-            return YES;
+            decisionHandler(WKNavigationActionPolicyAllow);
+            return;
         }
 
         if ([url rangeOfString:[context stringNamed:LPMT_ARG_URL_OPEN]].location != NSNotFound) {
             [self showWebview:webView];
-            return NO;
+            decisionHandler(WKNavigationActionPolicyCancel);
+            return;
         }
 
         if ([url rangeOfString:[context stringNamed:LPMT_ARG_URL_TRACK]].location != NSNotFound) {
@@ -1399,28 +1404,31 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)
                     [Leanplum track:event withValue:value andInfo:info andParameters:parameters];
                 }
             }
-            return NO;
+            decisionHandler(WKNavigationActionPolicyCancel);
+            return;
         }
 
         if ([url rangeOfString:[context stringNamed:LPMT_ARG_URL_ACTION]].location != NSNotFound) {
             if (queryComponents[@"action"]) {
                 [self closePopupWithAnimation:YES actionNamed:queryComponents[@"action"] track:NO];
             }
-            return NO;
+            decisionHandler(WKNavigationActionPolicyCancel);
+            return;
         }
 
         if ([url rangeOfString:
              [context stringNamed:LPMT_ARG_URL_TRACK_ACTION]].location != NSNotFound) {
             if (queryComponents[@"action"]) {
                 [self closePopupWithAnimation:YES actionNamed:queryComponents[@"action"] track:YES];
             }
-            return NO;
+            decisionHandler(WKNavigationActionPolicyCancel);
+            return;
         }
     }
     @catch (NSException *exception) {
         LOG_LP_MESSAGE_EXCEPTION;
     }
-    return YES;
+    decisionHandler(WKNavigationActionPolicyAllow);
 }
 
 /**