Move sync defaults into vault settings
This commit is contained in:
@@ -151,8 +151,6 @@ type uiPreferences struct {
|
|||||||
GroupControlsHidden bool `json:"groupControlsHidden"`
|
GroupControlsHidden bool `json:"groupControlsHidden"`
|
||||||
LifecycleAdvancedHidden bool `json:"lifecycleAdvancedHidden"`
|
LifecycleAdvancedHidden bool `json:"lifecycleAdvancedHidden"`
|
||||||
HistoryHidden bool `json:"historyHidden"`
|
HistoryHidden bool `json:"historyHidden"`
|
||||||
SyncSourceDefault string `json:"syncSourceDefault,omitempty"`
|
|
||||||
SyncDirectionDefault string `json:"syncDirectionDefault,omitempty"`
|
|
||||||
DenseLayout bool `json:"denseLayout"`
|
DenseLayout bool `json:"denseLayout"`
|
||||||
StatusBannerMillis int `json:"statusBannerMillis,omitempty"`
|
StatusBannerMillis int `json:"statusBannerMillis,omitempty"`
|
||||||
AutofillNoticeMode string `json:"autofillNoticeMode,omitempty"`
|
AutofillNoticeMode string `json:"autofillNoticeMode,omitempty"`
|
||||||
|
|||||||
+1
-1
@@ -3595,7 +3595,7 @@ func TestUILoadSettingsFallsBackToLegacySyncDefaultsInUIPreferences(t *testing.T
|
|||||||
|
|
||||||
dir := t.TempDir()
|
dir := t.TempDir()
|
||||||
legacyPath := filepath.Join(dir, "ui-prefs.json")
|
legacyPath := filepath.Join(dir, "ui-prefs.json")
|
||||||
content, err := json.MarshalIndent(uiPreferences{
|
content, err := json.MarshalIndent(legacySyncPreferences{
|
||||||
SyncSourceDefault: string(syncSourceRemote),
|
SyncSourceDefault: string(syncSourceRemote),
|
||||||
SyncDirectionDefault: string(syncDirectionPush),
|
SyncDirectionDefault: string(syncDirectionPush),
|
||||||
}, "", " ")
|
}, "", " ")
|
||||||
|
|||||||
+6
-1
@@ -52,6 +52,11 @@ type settingsDraft struct {
|
|||||||
Sync syncSettingsDraft
|
Sync syncSettingsDraft
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type legacySyncPreferences struct {
|
||||||
|
SyncSourceDefault string `json:"syncSourceDefault,omitempty"`
|
||||||
|
SyncDirectionDefault string `json:"syncDirectionDefault,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
type choiceSpec struct {
|
type choiceSpec struct {
|
||||||
Click *widget.Clickable
|
Click *widget.Clickable
|
||||||
Label string
|
Label string
|
||||||
@@ -161,7 +166,7 @@ func (u *ui) loadLegacySyncDefaultsFromUIPreferences() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
var prefs uiPreferences
|
var prefs legacySyncPreferences
|
||||||
if err := json.Unmarshal(content, &prefs); err != nil {
|
if err := json.Unmarshal(content, &prefs); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user