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

response error and clipboard messages

Browse Source
This commit is contained in:
Kyle Spearrin 2019-08-19 11:53:14 -04:00
parent 90a565fbcb
commit bf43a198c7
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,8 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe
winIndex = winIndex + 1 winIndex = winIndex + 1
} }
if theWin == nil { if theWin == nil {
// TODO: error m!.responseError = true
self.replyMessage(message: m!)
} else { } else {
var theTab: SFSafariTab? var theTab: SFSafariTab?
theWin!.getAllTabs { tabs in theWin!.getAllTabs { tabs in
@ -128,11 +129,16 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe
tabIndex = tabIndex + 1 tabIndex = tabIndex + 1
} }
if theTab == nil { if theTab == nil {
// TODO: error m!.responseError = true
self.replyMessage(message: m!)
} else { } 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!)
} }
} }
} }
@ -141,6 +147,16 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe
} }
} else if command == "hideWindow" { } else if command == "hideWindow" {
dismissPopover() dismissPopover()
replyMessage(message: m!)
} else if command == "copyToClipboard" {
let pasteboard = NSPasteboard.general
pasteboard.declareTypes([NSPasteboard.PasteboardType.string], owner: nil)
pasteboard.setString(m!.data ?? "", forType: NSPasteboard.PasteboardType.string)
replyMessage(message: m!)
} else if command == "readFromClipboard" {
let pasteboard = NSPasteboard.general
m?.responseData = pasteboard.pasteboardItems?.first?.string(forType: .string)
replyMessage(message: m!)
} }
} }
} }
@ -265,12 +281,14 @@ class AppMessage: Decodable, Encodable {
command = "" command = ""
data = nil data = nil
responseData = nil responseData = nil
responseError = nil
} }
var id: String var id: String
var command: String var command: String
var data: String? var data: String?
var responseData: String? var responseData: String?
var responseError: Bool?
} }
class StorageData: Decodable, Encodable { class StorageData: Decodable, Encodable {