Move sync defaults into vault settings

This commit is contained in:
Joe Julian
2026-04-01 17:38:39 -07:00
parent 6cfb5ea567
commit c0afe96f56
3 changed files with 7 additions and 4 deletions
-2
View File
@@ -151,8 +151,6 @@ type uiPreferences struct {
GroupControlsHidden bool `json:"groupControlsHidden"`
LifecycleAdvancedHidden bool `json:"lifecycleAdvancedHidden"`
HistoryHidden bool `json:"historyHidden"`
SyncSourceDefault string `json:"syncSourceDefault,omitempty"`
SyncDirectionDefault string `json:"syncDirectionDefault,omitempty"`
DenseLayout bool `json:"denseLayout"`
StatusBannerMillis int `json:"statusBannerMillis,omitempty"`
AutofillNoticeMode string `json:"autofillNoticeMode,omitempty"`
+1 -1
View File
@@ -3595,7 +3595,7 @@ func TestUILoadSettingsFallsBackToLegacySyncDefaultsInUIPreferences(t *testing.T
dir := t.TempDir()
legacyPath := filepath.Join(dir, "ui-prefs.json")
content, err := json.MarshalIndent(uiPreferences{
content, err := json.MarshalIndent(legacySyncPreferences{
SyncSourceDefault: string(syncSourceRemote),
SyncDirectionDefault: string(syncDirectionPush),
}, "", " ")
+6 -1
View File
@@ -52,6 +52,11 @@ type settingsDraft struct {
Sync syncSettingsDraft
}
type legacySyncPreferences struct {
SyncSourceDefault string `json:"syncSourceDefault,omitempty"`
SyncDirectionDefault string `json:"syncDirectionDefault,omitempty"`
}
type choiceSpec struct {
Click *widget.Clickable
Label string
@@ -161,7 +166,7 @@ func (u *ui) loadLegacySyncDefaultsFromUIPreferences() {
if err != nil {
return
}
var prefs uiPreferences
var prefs legacySyncPreferences
if err := json.Unmarshal(content, &prefs); err != nil {
return
}