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

Potential fix for swift nil unwrap exception

Browse Source
This commit is contained in:
Chad Scharf 2020-05-20 10:01:58 -04:00
parent 9f024828f2
commit e12cce711c
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/safari/safari/SafariExtensionViewController.swift
View File

@ -101,10 +101,19 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe
let options: TabQueryOptions? = jsonDeserialize(json: m!.data) let options: TabQueryOptions? = jsonDeserialize(json: m!.data)
if options?.currentWindow ?? false { if options?.currentWindow ?? false {
SFSafariApplication.getActiveWindow { win in SFSafariApplication.getActiveWindow { win in
if win != nil {
processWindowsForTabs(wins: [win!], options: options, complete: { tabs in processWindowsForTabs(wins: [win!], options: options, complete: { tabs in
m!.responseData = jsonSerialize(obj: tabs) m!.responseData = jsonSerialize(obj: tabs)
self.replyMessage(message: m!) self.replyMessage(message: m!)
}) })
} else {
SFSafariApplication.getAllWindows { wins in
processWindowsForTabs(wins: wins, options: options, complete: { tabs in
m!.responseData = jsonSerialize(obj: tabs)
self.replyMessage(message: m!)
})
}
}
} }
} else { } else {
SFSafariApplication.getAllWindows { wins in SFSafariApplication.getAllWindows { wins in
@ -145,11 +154,13 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe
dismissPopover() dismissPopover()
replyMessage(message: m!) replyMessage(message: m!)
} else if command == "showPopover" { } else if command == "showPopover" {
if popoverOpenCount <= 0 {
SFSafariApplication.getActiveWindow { win in SFSafariApplication.getActiveWindow { win in
win?.getToolbarItem(completionHandler: { item in win?.getToolbarItem(completionHandler: { item in
item?.showPopover() item?.showPopover()
}) })
} }
}
} else if command == "isPopoverOpen" { } else if command == "isPopoverOpen" {
m!.responseData = popoverOpenCount > 0 ? "true" : "false" m!.responseData = popoverOpenCount > 0 ? "true" : "false"
replyMessage(message: m!) replyMessage(message: m!)