From 36367deff4134e142c3522a7409fdc48675dea33 Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Fri, 11 Feb 2022 14:42:04 -0500
Subject: [PATCH] changes to legacy webview function

---
 MVMCoreUI/Atomic/Atoms/Views/WebView.swift       | 8 +-------
 MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.h | 3 +++
 MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.m | 8 ++++++++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/Views/WebView.swift b/MVMCoreUI/Atomic/Atoms/Views/WebView.swift
index 1ee08fd7..b4ec9b21 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/WebView.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/WebView.swift
@@ -175,13 +175,7 @@ extension WebView : WKNavigationDelegate {
            let url = navigationAction.request.url,
            let urlString = url.absoluteString.removingPercentEncoding,
            !urlString.contains("#") {
-            MVMCoreDispatchUtility.performBlock(onMainThread: {
-                // Presents standard webview.
-                let safariViewController = SFSafariViewController(url: url)
-                safariViewController.preferredBarTintColor = .white
-                safariViewController.preferredControlTintColor = .black
-                MVMCoreNavigationHandler.shared()?.present(safariViewController, animated: true)
-            })
+            MVMCoreUIActionHandler.shared()?.openURL(inWebView: url)
             decisionHandler(.cancel)
         } else {
             decisionHandler(.allow)
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.h b/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.h
index c1dee62a..7d3d10c7 100644
--- a/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.h
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.h
@@ -27,6 +27,9 @@ NS_ASSUME_NONNULL_BEGIN
 // Shows a topnotification new molecular
 - (void)topNotificationAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegateObject:(nullable DelegateObject *)delegateObject;
 
+/// Legacy in app safari webview load
+- (void)openURLInWebView:(nonnull NSURL *)url;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.m b/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.m
index 3673d99e..def5ddf5 100644
--- a/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.m
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.m
@@ -15,6 +15,7 @@
 @import MVMCore.NSDictionary_MFConvenience;
 @import MVMCore.MVMCoreJSONConstants;
 @import MVMCore.MVMCoreCache;
+@import SafariServices;
 
 @implementation MVMCoreUIActionHandler
 
@@ -122,4 +123,11 @@
     }
 }
 
+- (void)openURLInWebView:(nonnull NSURL *)url {
+    SFSafariViewController *safariViewController = [[SFSafariViewController alloc] initWithURL:url];
+    safariViewController.preferredBarTintColor = [UIColor whiteColor];
+    safariViewController.preferredControlTintColor = [UIColor blackColor];
+    [[MVMCoreNavigationHandler sharedNavigationHandler] presentViewController:safariViewController animated:YES];
+}
+
 @end