Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-25 19:36:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1478: Add GUI settings for keychain selection.

Browse Source
This commit is contained in:
Jakub
2022-01-10 14:57:13 +01:00
parent df601ecbbd
commit 437b7a4cfe
9 changed files with 211 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/frontend/qt/frontend_settings.go
View File

@ -159,10 +159,12 @@ func (f *FrontendQt) setKeychain() {
availableKeychain = append(availableKeychain, chain)
}
f.qml.SetAvailableKeychain(availableKeychain)
f.qml.SetSelectedKeychain(f.bridge.GetKeychainApp())
f.qml.SetCurrentKeychain(f.bridge.GetKeychainApp())
}
func (f *FrontendQt) selectKeychain(wantKeychain string) {
func (f *FrontendQt) changeKeychain(wantKeychain string) {
defer f.qml.ChangeKeychainFinished()
if f.bridge.GetKeychainApp() == wantKeychain {
return
}

9
internal/frontend/qt/qml_backend.go
View File

@ -138,8 +138,9 @@ type QMLBackend struct {
_ func() `signal:"bugReportSendError"`
_ []string `property:"availableKeychain"`
_ string `property:"selectedKeychain"`
_ func(keychain string) `slot:"selectKeychain"`
_ string `property:"currentKeychain"`
_ func(keychain string) `slot:"changeKeychain"`
_ func() `signal:"changeKeychainFinished"`
_ func() `signal:"notifyHasNoKeychain"`
_ func(email string) `signal:noActiveKeyForRecipient`
@ -287,10 +288,10 @@ func (q *QMLBackend) setup(f *FrontendQt) {
})
f.setKeychain()
q.ConnectSelectKeychain(func(k string) {
q.ConnectChangeKeychain(func(k string) {
go func() {
defer f.panicHandler.HandlePanic()
f.selectKeychain(k)
f.changeKeychain(k)
}()
})
}