forked from Silverfish/proton-bridge
GODT-937: Add keychain switcher to frontend
GODT-1008: Fix transparent dialog under certain conditions
This commit is contained in:
committed by
James Houlahan
parent
8b436186a4
commit
0fe69d9de1
@ -45,6 +45,7 @@ import (
|
||||
"github.com/ProtonMail/proton-bridge/internal/frontend/types"
|
||||
"github.com/ProtonMail/proton-bridge/internal/locations"
|
||||
"github.com/ProtonMail/proton-bridge/internal/updater"
|
||||
"github.com/ProtonMail/proton-bridge/pkg/keychain"
|
||||
"github.com/ProtonMail/proton-bridge/pkg/listener"
|
||||
"github.com/ProtonMail/proton-bridge/pkg/pmapi"
|
||||
"github.com/ProtonMail/proton-bridge/pkg/ports"
|
||||
@ -372,6 +373,14 @@ func (s *FrontendQt) qtExecute(Procedure func(*FrontendQt) error) error {
|
||||
s.Qml.SetIsEarlyAccess(false)
|
||||
}
|
||||
|
||||
availableKeychain := []string{}
|
||||
for chain := range keychain.Helpers {
|
||||
availableKeychain = append(availableKeychain, chain)
|
||||
}
|
||||
s.Qml.SetAvailableKeychain(availableKeychain)
|
||||
|
||||
s.Qml.SetSelectedKeychain(s.settings.Get(settings.PreferredKeychainKey))
|
||||
|
||||
// Set reporting of outgoing email without encryption.
|
||||
s.Qml.SetIsReportingOutgoingNoEnc(s.settings.GetBool(settings.ReportOutgoingNoEncKey))
|
||||
|
||||
@ -711,3 +720,16 @@ func (s *FrontendQt) setGUIIsReady() {
|
||||
s.initializing.Done()
|
||||
})
|
||||
}
|
||||
|
||||
func (s *FrontendQt) getKeychain() string {
|
||||
return s.bridge.GetKeychainApp()
|
||||
}
|
||||
|
||||
func (s *FrontendQt) setKeychain(keychain string) {
|
||||
if keychain != s.bridge.GetKeychainApp() {
|
||||
s.bridge.SetKeychainApp(keychain)
|
||||
|
||||
s.restarter.SetToRestart()
|
||||
s.App.Quit()
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user