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

Merge pull request #1238 from bitwarden/swift-nil-unwrap-exception

Browse Source 
Potential fix for swift nil unwrap exception
This commit is contained in:
Chad Scharf 2020-05-20 10:45:45 -04:00 committed by GitHub
commit 47c9047fa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
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
processWindowsForTabs(wins: [win!], options: options, complete: { tabs in if win != nil {
m!.responseData = jsonSerialize(obj: tabs) processWindowsForTabs(wins: [win!], options: options, complete: { tabs in
self.replyMessage(message: m!) m!.responseData = jsonSerialize(obj: tabs)
}) 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,10 +154,12 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe
dismissPopover() dismissPopover()
replyMessage(message: m!) replyMessage(message: m!)
} else if command == "showPopover" { } else if command == "showPopover" {
SFSafariApplication.getActiveWindow { win in if popoverOpenCount <= 0 {
win?.getToolbarItem(completionHandler: { item in SFSafariApplication.getActiveWindow { win in
item?.showPopover() win?.getToolbarItem(completionHandler: { item in
}) item?.showPopover()
})
}
} }
} else if command == "isPopoverOpen" { } else if command == "isPopoverOpen" {
m!.responseData = popoverOpenCount > 0 ? "true" : "false" m!.responseData = popoverOpenCount > 0 ? "true" : "false"