Simplify recent vault open flow and Android local sync

main.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"image"
 	"image/color"
+	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -26,6 +27,7 @@ import (
 	"gioui.org/unit"
 	"gioui.org/widget"
 	"gioui.org/widget/material"
+	"gioui.org/x/explorer"
 	"git.julianfamily.org/keepassgo/api"
 	"git.julianfamily.org/keepassgo/apiapproval"
 	"git.julianfamily.org/keepassgo/apiaudit"
@@ -200,6 +202,7 @@ const (
 type ui struct {
 	mode                           string
 	theme                          *material.Theme
+	fileExplorer                   *explorer.Explorer
 	logoHorizontal                 paint.ImageOp
 	splashSquare                   paint.ImageOp
 	search                         widget.Editor
@@ -409,6 +412,8 @@ type ui struct {
 	lifecycleMode                  string
 	syncSourceMode                 syncSourceMode
 	syncDirection                  syncDirection
+	syncLocalImportName            string
+	syncLocalImportContent         []byte
 	syncLocalPath                  widget.Editor
 	syncRemoteBaseURL              widget.Editor
 	syncRemotePath                 widget.Editor
@@ -1216,6 +1221,19 @@ func (u *ui) openAdvancedSyncDialog() {
 	}
 }
 
+func (u *ui) clearSyncLocalImport() {
+	u.syncLocalImportName = ""
+	u.syncLocalImportContent = nil
+}
+
+func (u *ui) selectedSyncLocalImport() (string, []byte, bool) {
+	name := strings.TrimSpace(u.syncLocalImportName)
+	if name == "" || name != strings.TrimSpace(u.syncLocalPath.Text()) || len(u.syncLocalImportContent) == 0 {
+		return "", nil, false
+	}
+	return name, append([]byte(nil), u.syncLocalImportContent...), true
+}
+
 func sanitizeSyncSourceMode(mode syncSourceMode) syncSourceMode {
 	switch mode {
 	case syncSourceRemote:
@@ -1255,6 +1273,12 @@ func (u *ui) advancedSyncFromAction() error {
 			return err
 		}
 	default:
+		if name, content, ok := u.selectedSyncLocalImport(); ok {
+			if err := u.state.SynchronizeFromLocalBytes(name, content); err != nil {
+				return err
+			}
+			break
+		}
 		path := strings.TrimSpace(u.syncLocalPath.Text())
 		if path == "" {
 			return errors.New(errVaultPathRequired)
@@ -1269,6 +1293,37 @@ func (u *ui) advancedSyncFromAction() error {
 	return nil
 }
 
+func (u *ui) startChooseSyncLocalSourceAction() {
+	if runtime.GOOS != "android" || u.fileExplorer == nil {
+		u.runAction("choose sync path", func() error {
+			u.clearSyncLocalImport()
+			return u.chooseExistingFileAction(&u.syncLocalPath)
+		})
+		return
+	}
+	u.runBackgroundAction("choose sync file", func() (func() error, error) {
+		file, err := u.fileExplorer.ChooseFile(".kdbx")
+		if err != nil {
+			if errors.Is(err, explorer.ErrUserDecline) {
+				return func() error { return nil }, nil
+			}
+			return nil, err
+		}
+		defer file.Close()
+		content, err := io.ReadAll(file)
+		if err != nil {
+			return nil, err
+		}
+		label := "Selected Android vault"
+		return func() error {
+			u.syncLocalImportName = label
+			u.syncLocalImportContent = append([]byte(nil), content...)
+			u.syncLocalPath.SetText(label)
+			return nil
+		}, nil
+	})
+}
+
 func (u *ui) advancedSyncToAction() error {
 	switch u.syncSourceMode {
 	case syncSourceRemote:
@@ -1713,6 +1768,14 @@ func (u *ui) latestRecentVault() (string, time.Time) {
 	return "", time.Time{}
 }
 
+func (u *ui) hasSelectedVaultPath() bool {
+	return strings.TrimSpace(u.vaultPath.Text()) != ""
+}
+
+func (u *ui) showLocalVaultChooser() bool {
+	return u.lifecycleMode != "local" || !u.hasSelectedVaultPath()
+}
+
 func (u *ui) latestRecentRemote() (recentRemoteRecord, bool, time.Time) {
 	for _, record := range u.recentRemotes {
 		if strings.TrimSpace(record.BaseURL) == "" || strings.TrimSpace(record.Path) == "" {
@@ -3060,7 +3123,7 @@ func (u *ui) layout(gtx layout.Context) layout.Dimensions {
 		u.runAction("choose key file", func() error { return u.chooseExistingFileAction(&u.keyFilePath) })
 	}
 	for u.pickSyncLocalPath.Clicked(gtx) {
-		u.runAction("choose sync path", func() error { return u.chooseExistingFileAction(&u.syncLocalPath) })
+		u.startChooseSyncLocalSourceAction()
 	}
 	for i := range u.recentVaultClicks {
 		for u.recentVaultClicks[i].Clicked(gtx) {
@@ -5863,6 +5926,7 @@ func run(w *app.Window, mode string, paths statePaths, grpcAddr string) error {
 	var ops op.Ops
 	manager := &session.Manager{}
 	ui := newUIWithSession(mode, manager, paths)
+	ui.fileExplorer = explorer.NewExplorer(w)
 	ui.invalidate = w.Invalidate
 	ui.clipboardWriter = newPlatformClipboardWriter(runtime.GOOS, w.Invalidate)
 	host, err := api.StartHost(grpcAddr, manager, passwords.DefaultProfiles(), ui.clipboardWriter, func() bool { return ui.state.Dirty })
@@ -5877,6 +5941,7 @@ func run(w *app.Window, mode string, paths statePaths, grpcAddr string) error {
 	}
 	for {
 		e := w.Event()
+		ui.fileExplorer.ListenEvents(e)
 		switch e := e.(type) {
 		case app.DestroyEvent:
 			return e.Err