Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-09 09:51:02 +01:00
Code Issues Projects Releases Wiki Activity

no response for tab messages

Browse Source
This commit is contained in:
Kyle Spearrin 2019-08-19 12:28:18 -04:00
parent efbed1a9a3
commit 94805468bc
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/safari/app/desktop/safari/SafariExtensionViewController.swift
View File

@ -114,10 +114,7 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe
} }
winIndex = winIndex + 1 winIndex = winIndex + 1
} }
if theWin == nil { if theWin != nil {
m!.responseError = true
self.replyMessage(message: m!)
} else {
var theTab: SFSafariTab? var theTab: SFSafariTab?
theWin!.getAllTabs { tabs in theWin!.getAllTabs { tabs in
var tabIndex = 0 var tabIndex = 0
@ -128,17 +125,10 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe
} }
tabIndex = tabIndex + 1 tabIndex = tabIndex + 1
} }
if theTab == nil { if theTab != nil {
m!.responseError = true
self.replyMessage(message: m!)
} else {
theTab!.getActivePage { activePage in theTab!.getActivePage { activePage in
if activePage != nil { if activePage != nil {
activePage?.dispatchMessageToScript(withName: "bitwarden", userInfo: ["msg": tabMsg!.obj]) activePage?.dispatchMessageToScript(withName: "bitwarden", userInfo: ["msg": tabMsg!.obj])
self.replyMessage(message: m!)
} else {
m!.responseError = true
self.replyMessage(message: m!)
} }
} }
} }