joejulian/keepassgo
1
1
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases 12 Wiki Activity

Resolve remote lifecycle landing conflicts

Browse Source
This commit is contained in:
Joe Julian
2026-03-29 13:35:07 -07:00
parent d05830335f
commit 17ff374be7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.go
+5 -2
View File
@@ -465,9 +465,12 @@ func (u *ui) describeActionError(label string, err error) string {
return "" return ""
} }
if errors.Is(err, webdav.ErrConflict) || strings.Contains(err.Error(), webdav.ErrConflict.Error()) { if errors.Is(err, webdav.ErrConflict) || strings.Contains(err.Error(), webdav.ErrConflict.Error()) {
return fmt.Sprintf("%s failed: remote vault changed on the server; reopen the remote vault and retry", label) return "Save conflict: the remote vault changed. Reopen it and retry the save."
} }
return fmt.Sprintf("%s failed: %v", label, err) if label == "open remote vault" {
return fmt.Sprintf("%s failed: %v", label, err)
}
return err.Error()
} }
func (u *ui) bannerSurface() uiBanner { func (u *ui) bannerSurface() uiBanner {
main_test.go
+2 -2
View File
@@ -557,8 +557,8 @@ func TestUIRemoteSaveConflictShowsVisibleErrorAndKeepsDirtyState(t *testing.T) {
u.runAction("save vault", u.saveAction) u.runAction("save vault", u.saveAction)
if got := u.errorMessage; !strings.Contains(got, "remote vault changed on the server") { if got := u.errorMessage; got != "Save conflict: the remote vault changed. Reopen it and retry the save." {
t.Fatalf("errorMessage = %q, want visible remote conflict guidance", got) t.Fatalf("errorMessage = %q, want normalized save conflict guidance", got)
} }
if got := u.statusMessage; got != "" { if got := u.statusMessage; got != "" {
t.Fatalf("statusMessage = %q, want empty after remote save conflict", got) t.Fatalf("statusMessage = %q, want empty after remote save conflict", got)