From c6be0b31c16935f709969bac4e2214aed0c44843 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 20 Aug 2019 23:38:51 -0400 Subject: [PATCH] fix appversion query string --- .../app/desktop/safari/SafariExtensionViewController.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/safari/app/desktop/safari/SafariExtensionViewController.swift b/src/safari/app/desktop/safari/SafariExtensionViewController.swift index 87be65be43..41b3964551 100644 --- a/src/safari/app/desktop/safari/SafariExtensionViewController.swift +++ b/src/safari/app/desktop/safari/SafariExtensionViewController.swift @@ -30,14 +30,15 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe let parentWidth = SafariExtensionViewController.shared.preferredContentSize.width let webViewConfig = WKWebViewConfiguration() let bundleURL = Bundle.main.resourceURL!.absoluteURL - let html = bundleURL.appendingPathComponent("app/popup/index.html?appVersion=\(version!)") + let html = bundleURL.appendingPathComponent("app/popup/index.html") + let url = URL(string: "\(html.absoluteString)?appVersion=\(version!)") webViewConfig.preferences.setValue(true, forKey: "allowFileAccessFromFileURLs") webViewConfig.preferences.setValue(true, forKey: "developerExtrasEnabled") webViewConfig.userContentController.add(self, name: "bitwardenApp") webView = WKWebView(frame: CGRect(x: 0, y: 0, width: parentWidth, height: parentHeight), configuration: webViewConfig) webView.navigationDelegate = self webView.allowsLinkPreview = false - webView.loadFileURL(html, allowingReadAccessTo: bundleURL) + webView.loadFileURL(url!, allowingReadAccessTo: bundleURL) webView.alphaValue = 0.0 view.addSubview(webView) }