From 42c44c381a0e2e7ddad977df476e579c325a0d0e Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 16 Aug 2019 17:21:35 -0400 Subject: [PATCH] swift cleanup --- src/safari/app/desktop/safari/Info.plist | 4 ---- .../app/desktop/safari/SafariExtensionHandler.swift | 9 ++------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/safari/app/desktop/safari/Info.plist b/src/safari/app/desktop/safari/Info.plist index fe45202bb7..8158f1648c 100644 --- a/src/safari/app/desktop/safari/Info.plist +++ b/src/safari/app/desktop/safari/Info.plist @@ -37,10 +37,6 @@ SFSafariContentScript - - Script - script.js - Script app/content/autofill.js diff --git a/src/safari/app/desktop/safari/SafariExtensionHandler.swift b/src/safari/app/desktop/safari/SafariExtensionHandler.swift index 8655220ba2..ae2acd8b31 100644 --- a/src/safari/app/desktop/safari/SafariExtensionHandler.swift +++ b/src/safari/app/desktop/safari/SafariExtensionHandler.swift @@ -12,24 +12,19 @@ class SafariExtensionHandler: SFSafariExtensionHandler { override func messageReceived(withName messageName: String, from page: SFSafariPage, userInfo: [String : Any]?) { // This method will be called when a content script provided by your extension calls safari.extension.dispatchMessage("message"). - if(messageName == "bitwarden") { page.getPropertiesWithCompletionHandler { properties in - NSLog("The extension received a message (\(messageName)) from a script injected into (\(String(describing: properties?.url))) with userInfo (\(userInfo ?? [:]))") - + // NSLog("The extension received a message (\(messageName)) from a script injected into (\(String(describing: properties?.url))) with userInfo (\(userInfo ?? [:]))") DispatchQueue.main.async { SafariExtensionViewController.shared.replyMessageFromScript(msg: userInfo) } - } } - - // page.dispatchMessageToScript(withName: "getInfo", userInfo: ["hello": "world", "foo": "bar"]) } override func toolbarItemClicked(in window: SFSafariWindow) { // This method will be called when your toolbar item is clicked. - NSLog("The extension's toolbar item was clicked") + // NSLog("The extension's toolbar item was clicked") } override func validateToolbarItem(in window: SFSafariWindow, validationHandler: @escaping ((Bool, String) -> Void)) {