From bfd848ba26fa5169d219700ab48140761402eb48 Mon Sep 17 00:00:00 2001 From: Chad Scharf <3904944+cscharf@users.noreply.github.com> Date: Mon, 3 Aug 2020 11:15:26 -0400 Subject: [PATCH] Added logging and completion handler for JS --- .../safari/SafariExtensionViewController.swift | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/safari/safari/SafariExtensionViewController.swift b/src/safari/safari/SafariExtensionViewController.swift index c33716b53a..0f2ac13eaa 100644 --- a/src/safari/safari/SafariExtensionViewController.swift +++ b/src/safari/safari/SafariExtensionViewController.swift @@ -96,7 +96,12 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe let messagesUrl = bundleUrl.appendingPathComponent("app/_locales/\(language)/messages.json") do { let json = try String(contentsOf: messagesUrl, encoding: .utf8) - webView.evaluateJavaScript("window.bitwardenLocaleStrings = \(json);", completionHandler: nil) + webView.evaluateJavaScript("window.bitwardenLocaleStrings = \(json);", completionHandler: {(result, error) in + guard let err = error else { + return; + } + NSLog("evaluateJavaScript error : %@", err.localizedDescription); + }) } catch { NSLog("ERROR on getLocaleStrings, \(error)") } @@ -236,7 +241,12 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe return } let json = (jsonSerialize(obj: message) ?? "null") - webView.evaluateJavaScript("window.bitwardenSafariAppMessageReceiver(\(json));", completionHandler: nil) + webView.evaluateJavaScript("window.bitwardenSafariAppMessageReceiver(\(json));", completionHandler: {(result, error) in + guard let err = error else { + return; + } + NSLog("evaluateJavaScript error : %@", err.localizedDescription); + }) } }