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

Improve local vault open usability

Browse Source
This commit is contained in:
Joe Julian
2026-04-01 17:16:01 -07:00
parent 315988134b
commit cb1447e554
3 changed files with 388 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.go
+170 -6
View File
@@ -17,6 +17,7 @@ import (
"gioui.org/app"
"gioui.org/gesture"
"gioui.org/io/key"
"gioui.org/io/pointer"
"gioui.org/layout"
"gioui.org/op"
@@ -277,6 +278,8 @@ type ui struct {
allowApproval widget.Clickable
denyApproval widget.Clickable
cancelApproval widget.Clickable
cancelLifecycleProgress widget.Clickable
retryLifecycleOpen widget.Clickable
approvalPermanent widget.Bool
rememberRemoteAuth widget.Bool
apiPolicyAllow widget.Bool
@@ -323,6 +326,7 @@ type ui struct {
settingsIcon *widget.Icon
clipboardWriter clipboard.Writer
loadingMessage string
loadingActionLabel string
lifecycleMode string
syncSourceMode syncSourceMode
syncDirection syncDirection
@@ -360,6 +364,10 @@ type ui struct {
auditLog *apiaudit.Log
grpcAddress string
backgroundResults chan backgroundActionResult
backgroundActionSerial int
activeBackgroundAction int
lastLifecycleAction string
requestMasterPassFocus bool
invalidate func()
}
@@ -367,6 +375,7 @@ type backgroundActionResult struct {
label string
apply func() error
err error
id int
}
var (
@@ -416,13 +425,13 @@ func newUIWithState(mode string, sess appstate.CurrentSession, paths statePaths)
remoteBaseURL: widget.Editor{SingleLine: true, Submit: false},
remotePath: widget.Editor{SingleLine: true, Submit: false},
remoteUsername: widget.Editor{SingleLine: true, Submit: false},
remotePassword: widget.Editor{SingleLine: true, Submit: false, Mask: '•'},
remotePassword: widget.Editor{SingleLine: true, Submit: false, Mask: '•', InputHint: key.HintPassword},
syncLocalPath: widget.Editor{SingleLine: true, Submit: false},
syncRemoteBaseURL: widget.Editor{SingleLine: true, Submit: false},
syncRemotePath: widget.Editor{SingleLine: true, Submit: false},
syncRemoteUsername: widget.Editor{SingleLine: true, Submit: false},
syncRemotePassword: widget.Editor{SingleLine: true, Submit: false, Mask: '•'},
masterPassword: widget.Editor{SingleLine: true, Submit: false},
syncRemotePassword: widget.Editor{SingleLine: true, Submit: false, Mask: '•', InputHint: key.HintPassword},
masterPassword: widget.Editor{SingleLine: true, Submit: false, InputHint: key.HintPassword},
keyFilePath: widget.Editor{SingleLine: true, Submit: false},
apiTokenName: widget.Editor{SingleLine: true, Submit: false},
apiTokenClientName: widget.Editor{SingleLine: true, Submit: false},
@@ -481,6 +490,7 @@ func newUIWithState(mode string, sess appstate.CurrentSession, paths statePaths)
syncDirection: syncDirectionPull,
apiPolicyGroupScope: true,
backgroundResults: make(chan backgroundActionResult, 8),
requestMasterPassFocus: true,
}
u.apiPolicyAllow.Value = true
u.apiPolicyGroupScopeW.Value = true
@@ -791,13 +801,16 @@ func (u *ui) startOpenVaultAction() {
u.clearMasterPassword()
if err != nil {
u.state.ErrorMessage = u.describeActionError("open vault", err)
u.requestMasterPassFocus = true
return
}
path := strings.TrimSpace(u.vaultPath.Text())
if path == "" {
u.state.ErrorMessage = u.describeActionError("open vault", errors.New(errVaultPathRequired))
u.requestMasterPassFocus = true
return
}
u.lastLifecycleAction = "open vault"
u.runBackgroundAction("open vault", func() (func() error, error) {
prepared, err := session.PrepareLocalOpen(path, key)
if err != nil {
@@ -875,6 +888,7 @@ func (u *ui) startOpenRemoteAction() {
u.clearMasterPassword()
if err != nil {
u.state.ErrorMessage = u.describeActionError("open remote vault", err)
u.requestMasterPassFocus = true
return
}
client := webdav.Client{
@@ -883,6 +897,7 @@ func (u *ui) startOpenRemoteAction() {
Password: u.remotePassword.Text(),
}
remotePath := strings.TrimSpace(u.remotePath.Text())
u.lastLifecycleAction = "open remote vault"
u.runBackgroundAction("open remote vault", func() (func() error, error) {
prepared, err := session.PrepareRemoteOpen(client, remotePath, key)
if err != nil {
@@ -912,6 +927,7 @@ func (u *ui) lockAction() error {
if err := u.state.Lock(); err != nil {
return err
}
u.requestMasterPassFocus = true
u.currentPath = append([]string(nil), u.state.CurrentPath...)
u.resetPasswordPeek()
u.editingEntry = false
@@ -946,6 +962,7 @@ func (u *ui) startUnlockAction() {
u.clearMasterPassword()
if err != nil {
u.state.ErrorMessage = u.describeActionError("unlock vault", err)
u.requestMasterPassFocus = true
return
}
encoded := append([]byte(nil), manager.EncodedBytes()...)
@@ -1667,14 +1684,17 @@ func (u *ui) runAction(label string, action func() error) {
return
}
u.loadingMessage = actionLoadingLabel(label)
u.loadingActionLabel = strings.TrimSpace(label)
if err := action(); err != nil {
u.loadingMessage = ""
u.loadingActionLabel = ""
u.state.ErrorMessage = u.describeActionError(label, err)
u.state.StatusMessage = ""
u.statusExpiresAt = time.Time{}
return
}
u.loadingMessage = ""
u.loadingActionLabel = ""
u.syncAutofillCache()
u.state.ErrorMessage = ""
if suppressStatusMessage(label) {
@@ -1690,13 +1710,17 @@ func (u *ui) runBackgroundAction(label string, prepare func() (func() error, err
if strings.TrimSpace(u.loadingMessage) != "" {
return
}
u.backgroundActionSerial++
actionID := u.backgroundActionSerial
u.activeBackgroundAction = actionID
u.loadingMessage = actionLoadingLabel(label)
u.loadingActionLabel = strings.TrimSpace(label)
u.state.ErrorMessage = ""
u.state.StatusMessage = ""
u.statusExpiresAt = time.Time{}
go func() {
apply, err := prepare()
u.backgroundResults <- backgroundActionResult{label: label, apply: apply, err: err}
u.backgroundResults <- backgroundActionResult{label: label, apply: apply, err: err, id: actionID}
if u.invalidate != nil {
u.invalidate()
}
@@ -1704,9 +1728,17 @@ func (u *ui) runBackgroundAction(label string, prepare func() (func() error, err
}
func (u *ui) applyBackgroundResult(result backgroundActionResult) {
if result.id != 0 && result.id != u.activeBackgroundAction {
return
}
u.activeBackgroundAction = 0
u.loadingMessage = ""
u.loadingActionLabel = ""
if result.err != nil {
u.state.ErrorMessage = u.describeActionError(result.label, result.err)
if strings.HasPrefix(result.label, "open ") {
u.requestMasterPassFocus = true
}
u.state.StatusMessage = ""
u.statusExpiresAt = time.Time{}
return
@@ -1714,6 +1746,9 @@ func (u *ui) applyBackgroundResult(result backgroundActionResult) {
if result.apply != nil {
if err := result.apply(); err != nil {
u.state.ErrorMessage = u.describeActionError(result.label, err)
if strings.HasPrefix(result.label, "open ") {
u.requestMasterPassFocus = true
}
u.state.StatusMessage = ""
u.statusExpiresAt = time.Time{}
return
@@ -1730,6 +1765,40 @@ func (u *ui) applyBackgroundResult(result backgroundActionResult) {
u.statusExpiresAt = u.now().Add(statusBannerDuration)
}
func (u *ui) cancelLifecycleBusyState() {
if !u.lifecycleBusy() {
return
}
u.activeBackgroundAction = 0
u.loadingMessage = ""
u.loadingActionLabel = ""
u.state.ErrorMessage = ""
u.state.StatusMessage = ""
u.statusExpiresAt = time.Time{}
u.requestMasterPassFocus = true
}
func (u *ui) retryLastLifecycleOpen() {
switch strings.TrimSpace(u.lastLifecycleAction) {
case "open vault":
u.startOpenVaultAction()
case "open remote vault":
u.startOpenRemoteAction()
}
}
func (u *ui) canRetryLifecycleOpen() bool {
if !u.shouldShowLifecycleSetup() || u.lifecycleBusy() || strings.TrimSpace(u.state.ErrorMessage) == "" {
return false
}
switch strings.TrimSpace(u.lastLifecycleAction) {
case "open vault", "open remote vault":
return true
default:
return false
}
}
func (u *ui) processBackgroundActions() {
for {
select {
@@ -1980,6 +2049,29 @@ func isAutofillOperation(operation apitokens.Operation) bool {
}
}
func (u *ui) bannerActionLabels(banner uiBanner) (primary, secondary string) {
if !u.shouldShowLifecycleSetup() {
if banner.Dismissable {
return "", "Dismiss"
}
return "", ""
}
switch banner.Kind {
case bannerLoading:
if strings.HasPrefix(u.loadingActionLabel, "open ") {
return "Cancel", ""
}
case bannerError:
if u.canRetryLifecycleOpen() {
return "Retry", "Dismiss"
}
if banner.Dismissable {
return "", "Dismiss"
}
}
return "", ""
}
func (u *ui) loadingDetailMessage() string {
if !u.shouldShowLifecycleSetup() {
return ""
@@ -2048,6 +2140,41 @@ func (u *ui) vaultResumeContext(path []string) string {
return "Resume in: " + strings.Join(displayPath, " / ")
}
func compactPathDirectorySummary(path string) string {
cleaned := filepath.Clean(strings.TrimSpace(path))
if cleaned == "." || cleaned == "" {
return ""
}
dir := filepath.Dir(cleaned)
if dir == "." || dir == cleaned {
return ""
}
if dir == string(filepath.Separator) {
return dir
}
parts := strings.Split(filepath.ToSlash(dir), "/")
filtered := parts[:0]
for _, part := range parts {
if strings.TrimSpace(part) != "" {
filtered = append(filtered, part)
}
}
parts = filtered
if len(parts) <= 2 {
return filepath.ToSlash(dir)
}
return parts[0] + "/.../" + parts[len(parts)-1]
}
func (u *ui) requestMasterPasswordFocusIfNeeded(gtx layout.Context) {
if !u.requestMasterPassFocus {
return
}
gtx.Execute(key.FocusCmd{Tag: &u.masterPassword})
gtx.Execute(op.InvalidateCmd{})
u.requestMasterPassFocus = false
}
func (u *ui) sessionSurface() uiSurface {
if u.state.Session == nil {
return uiSurface{}
@@ -2326,6 +2453,13 @@ func (u *ui) layout(gtx layout.Context) layout.Dimensions {
for u.unlockVault.Clicked(gtx) {
u.startUnlockAction()
}
for u.cancelLifecycleProgress.Clicked(gtx) {
u.cancelLifecycleBusyState()
}
for u.retryLifecycleOpen.Clicked(gtx) {
u.state.ErrorMessage = ""
u.retryLastLifecycleOpen()
}
for u.showEntries.Clicked(gtx) {
u.clearDeleteGroupConfirmation()
u.showEntriesSection()
@@ -2351,12 +2485,14 @@ func (u *ui) layout(gtx layout.Context) layout.Dimensions {
continue
}
u.lifecycleMode = "local"
u.requestMasterPassFocus = true
}
for u.showRemoteLifecycle.Clicked(gtx) {
if u.lifecycleBusy() {
continue
}
u.lifecycleMode = "remote"
u.requestMasterPassFocus = true
}
for u.toggleLifecycleAdvanced.Clicked(gtx) {
if u.lifecycleBusy() {
@@ -2479,6 +2615,7 @@ func (u *ui) layout(gtx layout.Context) layout.Dimensions {
if i < len(u.recentVaults) {
u.lifecycleMode = "local"
u.vaultPath.SetText(u.recentVaults[i])
u.requestMasterPassFocus = true
}
}
}
@@ -2490,6 +2627,7 @@ func (u *ui) layout(gtx layout.Context) layout.Dimensions {
if i < len(u.recentRemotes) {
u.lifecycleMode = "remote"
u.applyRecentRemoteRecord(u.recentRemotes[i])
u.requestMasterPassFocus = true
}
}
}
@@ -2500,6 +2638,7 @@ func (u *ui) layout(gtx layout.Context) layout.Dimensions {
u.vaultPath.SetText("")
u.state.ErrorMessage = ""
u.state.StatusMessage = ""
u.requestMasterPassFocus = true
}
for u.clearRemoteSelection.Clicked(gtx) {
if u.lifecycleBusy() {
@@ -2512,6 +2651,7 @@ func (u *ui) layout(gtx layout.Context) layout.Dimensions {
u.rememberRemoteAuth.Value = false
u.state.ErrorMessage = ""
u.state.StatusMessage = ""
u.requestMasterPassFocus = true
}
for u.dismissBanner.Clicked(gtx) {
u.state.ErrorMessage = ""
@@ -3908,6 +4048,7 @@ func (u *ui) banner(gtx layout.Context) layout.Dimensions {
bg = color.NRGBA{R: 248, G: 228, B: 225, A: 255}
fg = color.NRGBA{R: 130, G: 36, B: 25, A: 255}
}
primaryAction, secondaryAction := u.bannerActionLabels(banner)
return layout.Background{}.Layout(gtx, fill(bg), func(gtx layout.Context) layout.Dimensions {
return layout.UniformInset(unit.Dp(12)).Layout(gtx, func(gtx layout.Context) layout.Dimensions {
@@ -3932,11 +4073,34 @@ func (u *ui) banner(gtx layout.Context) layout.Dimensions {
)
}),
layout.Rigid(func(gtx layout.Context) layout.Dimensions {
if !banner.Dismissable {
if primaryAction == "" && secondaryAction == "" {
return layout.Dimensions{}
}
return layout.Inset{Left: unit.Dp(10)}.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
return tonedButton(gtx, u.theme, &u.dismissBanner, "Dismiss")
return layout.Flex{Spacing: layout.SpaceStart}.Layout(gtx,
layout.Rigid(func(gtx layout.Context) layout.Dimensions {
if primaryAction == "" {
return layout.Dimensions{}
}
click := &u.cancelLifecycleProgress
if primaryAction == "Retry" {
click = &u.retryLifecycleOpen
}
return tonedButton(gtx, u.theme, click, primaryAction)
}),
layout.Rigid(func(gtx layout.Context) layout.Dimensions {
if primaryAction == "" || secondaryAction == "" {
return layout.Dimensions{}
}
return layout.Spacer{Width: unit.Dp(6)}.Layout(gtx)
}),
layout.Rigid(func(gtx layout.Context) layout.Dimensions {
if secondaryAction == "" {
return layout.Dimensions{}
}
return tonedButton(gtx, u.theme, &u.dismissBanner, secondaryAction)
}),
)
})
}),
)