From 339bc03092db3eb509c4c40d801e8ce1af7bd4eb Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 13 Apr 2023 21:24:36 -0400 Subject: [PATCH 1/2] Add custom font access to WebViewController WBIOS-2972 https://appsci.atlassian.net/browse/WBIOS-2972 --- Sources/PandaSDK/Views/WebViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/PandaSDK/Views/WebViewController.swift b/Sources/PandaSDK/Views/WebViewController.swift index ca30b82..4b00f85 100644 --- a/Sources/PandaSDK/Views/WebViewController.swift +++ b/Sources/PandaSDK/Views/WebViewController.swift @@ -85,7 +85,7 @@ final class WebViewController: UIViewController, WKScriptMessageHandler { if let html = html { - load(html: html, baseURL: url?.url) + load(html: html, baseURL: (url?.url == nil ? URL(fileURLWithPath: Bundle.main.bundlePath) : url?.url)) return } guard let url = url?.url else { return } From 428b41c2b754417975a87c75e20d447042f804c1 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 14 Apr 2023 10:51:38 -0400 Subject: [PATCH 2/2] Remove unused url logic code. --- .../PandaSDK/Views/WebViewController.swift | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/Sources/PandaSDK/Views/WebViewController.swift b/Sources/PandaSDK/Views/WebViewController.swift index 4b00f85..17294a7 100644 --- a/Sources/PandaSDK/Views/WebViewController.swift +++ b/Sources/PandaSDK/Views/WebViewController.swift @@ -28,8 +28,6 @@ final class WebViewController: UIViewController, WKScriptMessageHandler { var onPurchaseCmpld: (() -> Void)? var isAutoDismissable: Bool = true - var url: URLComponents? - private lazy var wv: WKWebView = { let config = getWKWebViewConfiguration() let wv = WKWebView(frame: view.bounds, configuration: config) @@ -83,17 +81,8 @@ final class WebViewController: UIViewController, WKScriptMessageHandler { _ = view // trigger viewdidload wv.alpha = 0 - if let html = html { - load(html: html, baseURL: (url?.url == nil ? URL(fileURLWithPath: Bundle.main.bundlePath) : url?.url)) - return - } - guard let url = url?.url else { return } - - if url.isFileURL { - load(local: url) - } else { - load(url: url) + load(html: html, baseURL: URL(fileURLWithPath: Bundle.main.bundlePath)) } } @@ -104,21 +93,12 @@ final class WebViewController: UIViewController, WKScriptMessageHandler { } } - private func load(url: URL) { - wv.load(URLRequest(url: url)) - } - private func load(html: String, baseURL: URL?) { let html = replaceProductInfo(html: html) wv.loadHTMLString(html, baseURL: baseURL) } - private func load(local url: URL) { - wv.configuration.preferences.setValue(true, forKey: "allowFileAccessFromFileURLs") - wv.loadFileURL(url, allowingReadAccessTo: url) - } - deinit { onFinishLoad() NSObject.cancelPreviousPerformRequests(withTarget: self, selector: #selector(failedByTimeOut), object: nil)