yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

fix: properly decide whether it is first gui start

Browse Source
This commit is contained in:
James Houlahan
2020-08-06 09:29:30 +02:00
parent 34ef9063cb
commit ce4a75caf5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/frontend/qt/frontend.go
View File

@ -316,7 +316,8 @@ func (s *FrontendQt) qtExecute(Procedure func(*FrontendQt) error) error {
s.View.RootContext().SetContextProperty("go", s.Qml) s.View.RootContext().SetContextProperty("go", s.Qml)
// Set first start flag. // Set first start flag.
s.Qml.SetIsFirstStart(s.preferences.GetBool(preferences.FirstStartKey)) s.Qml.SetIsFirstStart(s.preferences.GetBool(preferences.FirstStartGUIKey))
s.preferences.SetBool(preferences.FirstStartGUIKey, false)
// Check if it is first start after update (fresh version). // Check if it is first start after update (fresh version).
lastVersion := s.preferences.Get(preferences.LastVersionKey) lastVersion := s.preferences.Get(preferences.LastVersionKey)

6
internal/preferences/preferences.go
View File

@ -29,6 +29,7 @@ import (
// Keys of preferences in JSON file. // Keys of preferences in JSON file.
const ( const (
FirstStartKey = "first_time_start" FirstStartKey = "first_time_start"
FirstStartGUIKey = "first_time_start_gui"
NextHeartbeatKey = "next_heartbeat" NextHeartbeatKey = "next_heartbeat"
APIPortKey = "user_port_api" APIPortKey = "user_port_api"
IMAPPortKey = "user_port_imap" IMAPPortKey = "user_port_imap"
@ -47,9 +48,7 @@ type configProvider interface {
GetDefaultSMTPPort() int GetDefaultSMTPPort() int
} }
var ( var log = logrus.WithField("pkg", "store") //nolint[gochecknoglobals]
log = logrus.WithField("pkg", "store") //nolint[gochecknoglobals]
)
// New returns loaded preferences with Bridge defaults when values are not set yet. // New returns loaded preferences with Bridge defaults when values are not set yet.
func New(cfg configProvider) (pref *config.Preferences) { func New(cfg configProvider) (pref *config.Preferences) {
@ -64,6 +63,7 @@ func New(cfg configProvider) (pref *config.Preferences) {
func setDefaults(preferences *config.Preferences, cfg configProvider) { func setDefaults(preferences *config.Preferences, cfg configProvider) {
preferences.SetDefault(FirstStartKey, "true") preferences.SetDefault(FirstStartKey, "true")
preferences.SetDefault(FirstStartGUIKey, "true")
preferences.SetDefault(NextHeartbeatKey, strconv.FormatInt(time.Now().Unix(), 10)) preferences.SetDefault(NextHeartbeatKey, strconv.FormatInt(time.Now().Unix(), 10))
preferences.SetDefault(APIPortKey, strconv.Itoa(cfg.GetDefaultAPIPort())) preferences.SetDefault(APIPortKey, strconv.Itoa(cfg.GetDefaultAPIPort()))
preferences.SetDefault(IMAPPortKey, strconv.Itoa(cfg.GetDefaultIMAPPort())) preferences.SetDefault(IMAPPortKey, strconv.Itoa(cfg.GetDefaultIMAPPort()))