Use Gio clipboard commands on Android

.codex/skills/keepassgo-apk-test/SKILL.md

@@ -1,116 +0,0 @@
----
-name: keepassgo-apk-test
-description: Build and run the KeePassGO Android APK for emulator testing. Use when work requires `make apk`, APK install/launch, emulator validation, or checking known KeePassGO Android regressions such as black screens, clipboard, open flow, or local sync behavior.
----
-
-# KeePassGO APK Test
-
-Use this skill together with the installed `android-emulator-debug` skill. That skill covers generic emulator and `adb` mechanics. This skill adds the KeePassGO-specific build, install, and validation requirements that have already been established in this repo.
-
-## Use This Skill When
-
-- Building `build/keepassgo.apk`.
-- Installing or launching KeePassGO in the Android emulator.
-- Verifying Android regressions such as black screen, clipboard, open flow, file picker, or Advanced Sync behavior.
-- Checking whether a Gio or Android toolchain change broke runtime behavior.
-
-## Known Working Environment
-
-- Preferred emulator AVD: `KeepassGoAPI35`
-- Package: `org.julianfamily.keepassgo`
-- Activity: `org.gioui.GioActivity`
-- Local APK build defaults:
-  `ANDROID_SDK_ROOT=/opt/android-sdk`
-  `ANDROID_NDK_ROOT=/opt/android-ndk`
-  `JAVA_HOME=/usr/lib/jvm/java-25-openjdk`
-- CI APK build uses:
-  `ANDROID_SDK_ROOT=/opt/android-sdk`
-  `ANDROID_NDK_ROOT=/opt/android-sdk/ndk`
-  `JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64`
-
-## Known Regression
-
-- `gioui.org v0.9.0` caused a black screen in the `KeepassGoAPI35` emulator.
-- `gioui.org v0.8.0` rendered correctly in the same environment.
-- If Android rendering regresses after a Gio change, treat Gio as a primary suspect and verify against this known-bad versus known-good history before guessing about app logic.
-
-## Safety Rules
-
-- Do not clobber the user’s real KeePassGO state while testing.
-- For host-side validation, use isolated state such as:
-  `KEEPASSGO_STATE_DIR="$(mktemp -d)" go test ./...`
-- Prefer sanitized demo or test vaults when seeding emulator tests.
-- If a real vault is absolutely required to reproduce a problem, do not modify it and do not overwrite the user’s existing recent-vault state.
-
-## Build Workflow
-
-1. Verify the JDK/SDK paths match the known working environment.
-2. Build with `make apk`.
-3. If `make apk` fails, inspect the effective `JAVA_HOME`, `ANDROID_SDK_ROOT`, and `ANDROID_NDK_ROOT` before changing code.
-4. If the problem is Android-only, avoid desktop-only conclusions from `go test ./...`.
-
-Typical local build:
-
-```sh
-JAVA_HOME=/usr/lib/jvm/java-25-openjdk make apk
-```
-
-## Emulator Workflow
-
-1. Reuse an existing emulator session if one is already running.
-2. Prefer the `KeepassGoAPI35` AVD.
-3. Install with `adb install -r build/keepassgo.apk`.
-4. Launch with:
-
-```sh
-adb shell monkey -p org.julianfamily.keepassgo -c android.intent.category.LAUNCHER 1
-```
-
-5. Confirm focus before drawing conclusions:
-
-```sh
-adb shell dumpsys window | rg 'mCurrentFocus|mFocusedApp'
-```
-
-6. Capture evidence before editing code:
-  screenshot
-  focused window
-  relevant `logcat`
-
-## Validation Checklist
-
-- APK builds successfully with `make apk`.
-- App launches to `org.julianfamily.keepassgo/org.gioui.GioActivity`.
-- Screenshot shows the expected screen, not just a black frame.
-- `logcat` shows no app crash or Android runtime fatal error.
-- If the change is about user interaction, perform the tap-through in the emulator instead of stopping at install success.
-
-## Issue-Specific Checks
-
-### Black Screen
-
-- Confirm the app is focused.
-- Capture a screenshot and `logcat` before changing anything.
-- Compare the current Gio version against the known `v0.9.0` regression history.
-- If needed, test whether a minimal Gio example renders in the same emulator before blaming KeePassGO layout code.
-
-### Clipboard
-
-- Verify behavior in the emulator, not just unit tests.
-- Android clipboard writes must use the Gio-native command path, not desktop clipboard backends.
-
-### File Picker Or Local Sync
-
-- Verify the picker flow on Android itself.
-- Prefer document-stream or content-URI based behavior over raw filesystem paths when Android permissions are involved.
-
-## Report Back
-
-When closing out work, state:
-
-- the exact build command used
-- whether the emulator session was reused or newly started
-- whether install succeeded
-- whether the app actually rendered
-- what was verified manually in the emulator
-- what remains unverified

AGENTS.md

@@ -14,8 +14,6 @@ These instructions apply to all future work in this repository.
 ## Skills
 
 - Use the installed Go skills whenever they materially apply to the current slice of work.
-- Use the installed `android-emulator-debug` skill for Android emulator lifecycle, `adb`, screenshots, and log capture work.
-- Use the repo-local `keepassgo-apk-test` skill for KeePassGO-specific APK build and emulator test runs.
 - The available Go skills for this repository are:
   `go-code-review`,
   `go-concurrency`,
@@ -128,20 +126,6 @@ These features are product requirements, not “nice to have” ideas.
 - Keep `golangci-lint` passing.
 - Keep `go test ./...` passing.
 - Track `gogio` as a Go tool and keep a reproducible `make apk` path for Android packaging.
-- Keep the Android build requirements aligned with the known working setup:
-  `ANDROID_SDK_ROOT=/opt/android-sdk`,
-  local `ANDROID_NDK_ROOT=/opt/android-ndk`,
-  CI `ANDROID_NDK_ROOT=/opt/android-sdk/ndk`,
-  local `JAVA_HOME=/usr/lib/jvm/java-25-openjdk`,
-  CI `JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64`.
-- Remember the known Android runtime regression:
-  `gioui.org v0.9.0` produced a black screen on the `KeepassGoAPI35` emulator, while `gioui.org v0.8.0` rendered correctly. Treat Gio upgrades on Android as regression-sensitive and verify them on-device or in the emulator.
-- When validating an APK in the emulator, prefer the known KeePassGO setup:
-  AVD `KeepassGoAPI35`,
-  package `org.julianfamily.keepassgo`,
-  activity `org.gioui.GioActivity`.
-- Do not run emulator/manual APK tests against the user’s real persisted app state.
-  Use an isolated `KEEPASSGO_STATE_DIR` for host-side validation, and when emulator testing requires seeded vault data, use sanitized test/demo vaults rather than the user’s real vault files whenever possible.
 - When running tests or other automated validation that may touch persisted UI state, set `KEEPASSGO_STATE_DIR` to an isolated temporary directory so recent-vault history and other local state do not pollute the user’s real config.
 - Prefer commands shaped like `KEEPASSGO_STATE_DIR=\"$(mktemp -d)\" go test ./...` for ad hoc local validation unless a test already manages its own isolated state directory.
 - Do not assume the agent can decrypt SOPS-encrypted secrets in this repository.

README.md

@@ -41,24 +41,6 @@ Desktop build:
 go build ./...
 ```
 
-## Arch Linux Package
-
-An AUR-style package definition for the Linux desktop client lives under:
-
-- `packaging/archlinux/keepassgo-git/`
-
-From that directory you can build and install it with:
-
-```bash
-makepkg -si
-```
-
-The package installs:
-
-- `/usr/bin/keepassgo`
-- a desktop entry at `/usr/share/applications/keepassgo.desktop`
-- application icons under the hicolor theme
-
 ## Android Packaging
 
 KeePassGO uses Gio, so Android packaging is done with `gogio`.

appstate/state.go

@@ -61,7 +61,6 @@ type SynchronizableSession interface {
 type AdvancedSynchronizableSession interface {
 	CurrentSession
 	SynchronizeFromLocal(string) error
-	SynchronizeFromLocalBytes(string, []byte) error
 	SynchronizeToLocal(string) error
 	SynchronizeFromRemote(webdav.Client, string) error
 	SynchronizeToRemote(webdav.Client, string) error
@@ -723,18 +722,6 @@ func (s *State) SynchronizeFromLocal(path string) error {
 	return nil
 }
 
-func (s *State) SynchronizeFromLocalBytes(name string, content []byte) error {
-	session, ok := s.Session.(AdvancedSynchronizableSession)
-	if !ok {
-		return fmt.Errorf("session is not advanced-synchronizable")
-	}
-	if err := session.SynchronizeFromLocalBytes(name, content); err != nil {
-		return err
-	}
-	s.Dirty = false
-	return nil
-}
-
 func (s *State) SynchronizeToLocal(path string) error {
 	session, ok := s.Session.(AdvancedSynchronizableSession)
 	if !ok {

appstate/state_test.go

@@ -1584,26 +1584,6 @@ func (s *lifecycleStubSession) OpenRemote(_ webdav.Client, path string, _ vault.
 	return nil
 }
 
-func (s *lifecycleStubSession) SynchronizeFromLocal(string) error {
-	return nil
-}
-
-func (s *lifecycleStubSession) SynchronizeFromLocalBytes(string, []byte) error {
-	return nil
-}
-
-func (s *lifecycleStubSession) SynchronizeToLocal(string) error {
-	return nil
-}
-
-func (s *lifecycleStubSession) SynchronizeFromRemote(webdav.Client, string) error {
-	return nil
-}
-
-func (s *lifecycleStubSession) SynchronizeToRemote(webdav.Client, string) error {
-	return nil
-}
-
 func (s *lifecycleStubSession) ChangeMasterKey(key vault.MasterKey) error {
 	s.changedKey = key
 	return nil

autofillcache/cache_test.go

@@ -51,7 +51,7 @@ func TestBuildFiltersAndNormalizesEntries(t *testing.T) {
 		t.Fatalf("first host = %q, want 10.0.2.2", got.Entries[0].Host)
 	}
 	if got.Entries[1].Host != "surveillance.crew.example.invalid" {
-		t.Fatalf("second host = %q, want surveillance.crew.example.invalid", got.Entries[1].Host)
+		t.Fatalf("second host = %q, want lights.julianfamily.org", got.Entries[1].Host)
 	}
 	if len(got.Entries[1].Targets) != 3 {
 		t.Fatalf("len(second targets) = %d, want 3", len(got.Entries[1].Targets))

docs/accessibility.md

@@ -15,7 +15,7 @@ KeePassGO currently targets keyboard-first desktop use on Linux and Windows.
   - list navigation
   - search focus
   - new-entry focus transitions
-- Controls that participate in keyboard navigation have intent-revealing accessibility labels through `accessibilityLabel` in [`ui_accessibility.go`](/workspace/keepassgo/ui_accessibility.go).
+- Controls that participate in keyboard navigation have intent-revealing accessibility labels through `accessibilityLabel` in [`ui_accessibility.go`](/home/rustyryan/dev/go/src/git.julianfamily.org/keepassgo/ui_accessibility.go).
 
 ## Current screen-reader boundary
 

go.mod

@@ -6,7 +6,6 @@ replace gioui.org/cmd => ./third_party/gioui-cmd
 
 require (
 	gioui.org v0.8.0
-	gioui.org/x v0.8.0
 	github.com/atotto/clipboard v0.1.4
 	github.com/tobischo/gokeepasslib/v3 v3.6.2
 	golang.org/x/exp/shiny v0.0.0-20260312153236-7ab1446f8b90
@@ -19,7 +18,6 @@ require (
 	4d63.com/gochecknoglobals v0.2.2 // indirect
 	gioui.org/cmd v0.8.0 // indirect
 	gioui.org/shader v1.0.8 // indirect
-	git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0 // indirect
 	github.com/4meepo/tagalign v1.4.2 // indirect
 	github.com/Abirdcfly/dupword v0.1.3 // indirect
 	github.com/Antonboom/errname v1.0.0 // indirect
@@ -76,7 +74,6 @@ require (
 	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
 	github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/godbus/dbus/v5 v5.0.6 // indirect
 	github.com/gofrs/flock v0.12.1 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
@@ -195,7 +192,7 @@ require (
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
 	golang.org/x/crypto v0.48.0 // indirect
-	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
+	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
 	golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
 	golang.org/x/image v0.37.0 // indirect
 	golang.org/x/mod v0.33.0 // indirect

go.sum

@@ -42,10 +42,6 @@ gioui.org v0.8.0/go.mod h1:vEMmpxMOd/iwJhXvGVIzWEbxMWhnMQ9aByOGQdlQ8rc=
 gioui.org/cpu v0.0.0-20210808092351-bfe733dd3334/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
 gioui.org/shader v1.0.8 h1:6ks0o/A+b0ne7RzEqRZK5f4Gboz2CfG+mVliciy6+qA=
 gioui.org/shader v1.0.8/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM=
-gioui.org/x v0.8.0 h1:RhIlQNOFKKn8D8FeaKKaXCo7vB3x+fq4VcD10HW/YpA=
-gioui.org/x v0.8.0/go.mod h1:aXtQb+kyqoUOjDl5/uMqAopjzVzMkeHBbMQOGT5KnSE=
-git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0 h1:bGG/g4ypjrCJoSvFrP5hafr9PPB5aw8SjcOWWila7ZI=
-git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0/go.mod h1:+axXBRUTIDlCeE73IKeD/os7LoEnTKdkp8/gQOFjqyo=
 github.com/4meepo/tagalign v1.4.2 h1:0hcLHPGMjDyM1gHG58cS73aQF8J4TdVR96TZViorO9E=
 github.com/4meepo/tagalign v1.4.2/go.mod h1:+p4aMyFM+ra7nb41CnFG6aSDXqRxU/w1VQqScKqDARI=
 github.com/Abirdcfly/dupword v0.1.3 h1:9Pa1NuAsZvpFPi9Pqkd93I7LIYRURj+A//dFd5tgBeE=
@@ -228,8 +224,6 @@ github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro=
-github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
 github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -675,8 +669,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
+golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
-golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
+golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
 golang.org/x/exp/shiny v0.0.0-20260312153236-7ab1446f8b90 h1:kyPrwnEYXdME284bE7xgS9BPxhG7MCa5hw1/TpaTJVs=
 golang.org/x/exp/shiny v0.0.0-20260312153236-7ab1446f8b90/go.mod h1:jqkJFnLVkS8zgKKY4+MOPCZtuZGw3hONUjhapUSwZ8c=
 golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=

main.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"image"
 	"image/color"
-	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -27,7 +26,6 @@ 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"
@@ -202,7 +200,6 @@ const (
 type ui struct {
 	mode                           string
 	theme                          *material.Theme
-	fileExplorer                   *explorer.Explorer
 	logoHorizontal                 paint.ImageOp
 	splashSquare                   paint.ImageOp
 	search                         widget.Editor
@@ -412,8 +409,6 @@ type ui struct {
 	lifecycleMode                  string
 	syncSourceMode                 syncSourceMode
 	syncDirection                  syncDirection
-	syncLocalImportName            string
-	syncLocalImportContent         []byte
 	syncLocalPath                  widget.Editor
 	syncRemoteBaseURL              widget.Editor
 	syncRemotePath                 widget.Editor
@@ -1221,19 +1216,6 @@ 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:
@@ -1273,12 +1255,6 @@ 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)
@@ -1293,37 +1269,6 @@ 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:
@@ -1752,16 +1697,12 @@ func (u *ui) restoreStartupLifecycleTarget() {
 func (u *ui) hasSelectedLifecycleTarget() bool {
 	switch strings.TrimSpace(u.lifecycleMode) {
 	case "remote":
-		return u.hasSelectedRemoteTarget()
+		return strings.TrimSpace(u.remoteBaseURL.Text()) != "" && strings.TrimSpace(u.remotePath.Text()) != ""
 	default:
 		return strings.TrimSpace(u.vaultPath.Text()) != ""
 	}
 }
 
-func (u *ui) hasSelectedRemoteTarget() bool {
-	return strings.TrimSpace(u.remoteBaseURL.Text()) != "" && strings.TrimSpace(u.remotePath.Text()) != ""
-}
-
 func (u *ui) latestRecentVault() (string, time.Time) {
 	for _, path := range u.recentVaults {
 		if strings.TrimSpace(path) == "" {
@@ -1772,56 +1713,6 @@ 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) showRemoteConnectionChooser() bool {
-	return u.lifecycleMode != "remote" || !u.hasSelectedRemoteTarget()
-}
-
-func (u *ui) switchToLifecycleSelection(mode string) {
-	u.state.Session = &session.Manager{}
-	u.state.CurrentPath = nil
-	u.state.SelectedEntryID = ""
-	u.state.Section = appstate.SectionEntries
-	u.state.Dirty = false
-	u.state.ErrorMessage = ""
-	u.state.StatusMessage = ""
-	u.loadingMessage = ""
-	u.loadingActionLabel = ""
-	u.lastLifecycleAction = ""
-	u.lifecycleMode = mode
-	u.editingEntry = false
-	u.currentPath = nil
-	u.syncedPath = nil
-	u.clearMasterPassword()
-	u.keyFilePath.SetText("")
-	u.search.SetText("")
-	switch mode {
-	case "remote":
-		u.vaultPath.SetText("")
-		u.remoteBaseURL.SetText("")
-		u.remotePath.SetText("")
-		u.remoteUsername.SetText("")
-		u.remotePassword.SetText("")
-		u.rememberRemoteAuth.Value = false
-	default:
-		u.vaultPath.SetText("")
-		u.remoteBaseURL.SetText("")
-		u.remotePath.SetText("")
-		u.remoteUsername.SetText("")
-		u.remotePassword.SetText("")
-		u.rememberRemoteAuth.Value = false
-	}
-	u.requestMasterPassFocus = u.hasSelectedLifecycleTarget()
-	u.filter()
-}
-
 func (u *ui) latestRecentRemote() (recentRemoteRecord, bool, time.Time) {
 	for _, record := range u.recentRemotes {
 		if strings.TrimSpace(record.BaseURL) == "" || strings.TrimSpace(record.Path) == "" {
@@ -3169,7 +3060,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.startChooseSyncLocalSourceAction()
+		u.runAction("choose sync path", func() error { return u.chooseExistingFileAction(&u.syncLocalPath) })
 	}
 	for i := range u.recentVaultClicks {
 		for u.recentVaultClicks[i].Clicked(gtx) {
@@ -3199,10 +3090,6 @@ func (u *ui) layout(gtx layout.Context) layout.Dimensions {
 		if u.lifecycleBusy() {
 			continue
 		}
-		if u.shouldUseLockedSinglePane() {
-			u.switchToLifecycleSelection("local")
-			continue
-		}
 		u.vaultPath.SetText("")
 		u.state.ErrorMessage = ""
 		u.state.StatusMessage = ""
@@ -3212,10 +3099,6 @@ func (u *ui) layout(gtx layout.Context) layout.Dimensions {
 		if u.lifecycleBusy() {
 			continue
 		}
-		if u.shouldUseLockedSinglePane() {
-			u.switchToLifecycleSelection("remote")
-			continue
-		}
 		u.remoteBaseURL.SetText("")
 		u.remotePath.SetText("")
 		u.remoteUsername.SetText("")
@@ -4746,6 +4629,7 @@ func (u *ui) detailPanelContent(gtx layout.Context) layout.Dimensions {
 	_ = panel
 	return layout.Flex{Axis: layout.Vertical}.Layout(gtx, func() []layout.FlexChild {
 		if u.isVaultLocked() {
+			summary := u.currentVaultSummary()
 			return []layout.FlexChild{
 				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
 					lbl := material.Label(u.theme, unit.Sp(18), "Unlock Vault")
@@ -4758,6 +4642,47 @@ func (u *ui) detailPanelContent(gtx layout.Context) layout.Dimensions {
 					lbl.Color = mutedColor
 					return lbl.Layout(gtx)
 				}),
+				layout.Rigid(layout.Spacer{Height: unit.Dp(10)}.Layout),
+				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+					if strings.TrimSpace(summary.Title) == "" {
+						return layout.Dimensions{}
+					}
+					return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
+						return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+							layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+								lbl := material.Label(u.theme, unit.Sp(11), "UNLOCK TARGET")
+								lbl.Color = mutedColor
+								return lbl.Layout(gtx)
+							}),
+							layout.Rigid(layout.Spacer{Height: unit.Dp(2)}.Layout),
+							layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+								lbl := material.Label(u.theme, unit.Sp(15), summary.Title)
+								lbl.Color = accentColor
+								return lbl.Layout(gtx)
+							}),
+							layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+								if strings.TrimSpace(summary.Detail) == "" || summary.Detail == summary.Title {
+									return layout.Dimensions{}
+								}
+								return layout.Inset{Top: unit.Dp(2)}.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
+									lbl := material.Label(u.theme, unit.Sp(12), summary.Detail)
+									lbl.Color = mutedColor
+									return lbl.Layout(gtx)
+								})
+							}),
+							layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+								if strings.TrimSpace(summary.Context) == "" {
+									return layout.Dimensions{}
+								}
+								return layout.Inset{Top: unit.Dp(2)}.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
+									lbl := material.Label(u.theme, unit.Sp(12), summary.Context)
+									lbl.Color = mutedColor
+									return lbl.Layout(gtx)
+								})
+							}),
+						)
+					})
+				}),
 				layout.Rigid(layout.Spacer{Height: unit.Dp(12)}.Layout),
 				layout.Rigid(u.unlockPanel),
 			}
@@ -5938,7 +5863,6 @@ 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 })
@@ -5953,7 +5877,6 @@ 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

main_test.go

@@ -135,7 +135,7 @@ func TestUISearchBehaviorIsConsistentAcrossDesktopAndPhoneLayouts(t *testing.T)
 					{ID: "tpl-2", Title: "SSH Login", URL: "ssh://infra.internal", Path: []string{"Templates", "Infra"}},
 				},
 				RecycleBin: []vault.Entry{
-					{ID: "deleted-1", Title: "Deleted Bellagio", URL: "https://bellagio.example.invalid", Path: []string{"Root", "Internet"}},
+					{ID: "deleted-1", Title: "Deleted Bellagio", URL: "https://bellagio.example.com", Path: []string{"Root", "Internet"}},
 					{ID: "deleted-2", Title: "Deleted HVAC", URL: "https://climate.example.com", Path: []string{"Root", "Home"}},
 				},
 			})
@@ -1754,67 +1754,6 @@ func TestUIAdvancedSynchronizeFromLocalMergesIntoCurrentVault(t *testing.T) {
 	}
 }
 
-func TestUIAdvancedSynchronizeFromImportedLocalVaultMergesIntoCurrentVault(t *testing.T) {
-	t.Parallel()
-
-	key := vault.MasterKey{Password: "correct horse battery staple"}
-	currentPath := filepath.Join(t.TempDir(), "current.kdbx")
-
-	writeKDBXMainTestFile(t, currentPath, vault.Model{
-		Entries: []vault.Entry{{
-			ID:       "entry-current",
-			Title:    "Vault Console",
-			Username: "dannyocean",
-			Password: "token-current",
-			URL:      "https://vault.crew.example.invalid",
-			Path:     []string{"Root", "Internet"},
-		}},
-	}, key)
-
-	var other bytes.Buffer
-	if err := vault.SaveKDBX(&other, vault.Model{
-		Entries: []vault.Entry{{
-			ID:       "entry-other",
-			Title:    "Bellagio",
-			Username: "rustyryan",
-			Password: "token-other",
-			URL:      "https://bellagio.example.invalid",
-			Path:     []string{"Root", "Internet"},
-		}},
-	}, key.Password); err != nil {
-		t.Fatalf("SaveKDBX(other) error = %v", err)
-	}
-
-	u := newUIWithSession("desktop", &session.Manager{})
-	u.masterPassword.SetText(key.Password)
-	u.vaultPath.SetText(currentPath)
-	if err := u.openVaultAction(); err != nil {
-		t.Fatalf("openVaultAction() error = %v", err)
-	}
-
-	u.openAdvancedSyncDialog()
-	u.syncDirection = syncDirectionPull
-	u.syncSourceMode = syncSourceLocal
-	u.syncLocalImportName = "Selected Android vault"
-	u.syncLocalImportContent = other.Bytes()
-	u.syncLocalPath.SetText("Selected Android vault")
-	if err := u.advancedSyncAction(); err != nil {
-		t.Fatalf("advancedSyncAction() error = %v", err)
-	}
-
-	var reopened session.Manager
-	if err := reopened.Open(currentPath, key); err != nil {
-		t.Fatalf("reopen Open(current) error = %v", err)
-	}
-	model, err := reopened.Current()
-	if err != nil {
-		t.Fatalf("reopened Current() error = %v", err)
-	}
-	if got := len(model.EntriesInPath([]string{"Root", "Internet"})); got != 2 {
-		t.Fatalf("len(EntriesInPath(Root/Internet)) = %d, want 2", got)
-	}
-}
-
 func TestUIStartOpenVaultActionAppliesResultOnMainThread(t *testing.T) {
 	t.Parallel()
 
@@ -4336,178 +4275,6 @@ func TestSelectingRecentVaultSwitchesToLocalMode(t *testing.T) {
 	}
 }
 
-func TestRestoreStartupLifecycleTargetSelectsMostRecentLocalVault(t *testing.T) {
-	t.Parallel()
-
-	u := newUIWithSession("desktop", &session.Manager{})
-	u.lifecycleMode = "remote"
-	u.vaultPath.SetText("")
-	u.recentVaults = []string{"/tmp/example.kdbx"}
-	u.recentVaultUsedAt["/tmp/example.kdbx"] = time.Date(2026, time.April, 5, 1, 2, 3, 0, time.UTC)
-	u.recentRemotes = nil
-
-	u.restoreStartupLifecycleTarget()
-
-	if got := u.lifecycleMode; got != "local" {
-		t.Fatalf("lifecycleMode after restore = %q, want local", got)
-	}
-	if got := u.vaultPath.Text(); got != "/tmp/example.kdbx" {
-		t.Fatalf("vaultPath after restore = %q, want /tmp/example.kdbx", got)
-	}
-}
-
-func TestShowLocalVaultChooser(t *testing.T) {
-	t.Parallel()
-
-	u := newUIWithSession("desktop", &session.Manager{})
-	u.lifecycleMode = "local"
-	u.vaultPath.SetText("")
-	if got := u.showLocalVaultChooser(); !got {
-		t.Fatal("showLocalVaultChooser() = false, want true when no local vault is selected")
-	}
-
-	u.vaultPath.SetText("/tmp/example.kdbx")
-	if got := u.showLocalVaultChooser(); got {
-		t.Fatal("showLocalVaultChooser() = true, want false when a local vault is selected")
-	}
-
-	u.lifecycleMode = "remote"
-	if got := u.showLocalVaultChooser(); !got {
-		t.Fatal("showLocalVaultChooser() = false, want true outside local lifecycle mode")
-	}
-}
-
-func TestShowRemoteConnectionChooser(t *testing.T) {
-	t.Parallel()
-
-	u := newUIWithSession("desktop", &session.Manager{})
-	u.lifecycleMode = "remote"
-	u.remoteBaseURL.SetText("")
-	u.remotePath.SetText("")
-	if got := u.showRemoteConnectionChooser(); !got {
-		t.Fatal("showRemoteConnectionChooser() = false, want true when no remote connection is selected")
-	}
-
-	u.remoteBaseURL.SetText("https://dav.crew.example.invalid")
-	u.remotePath.SetText("vaults/bellagio.kdbx")
-	if got := u.showRemoteConnectionChooser(); got {
-		t.Fatal("showRemoteConnectionChooser() = true, want false when a remote connection is selected")
-	}
-
-	u.lifecycleMode = "local"
-	if got := u.showRemoteConnectionChooser(); !got {
-		t.Fatal("showRemoteConnectionChooser() = false, want true outside remote lifecycle mode")
-	}
-}
-
-func TestSwitchToLifecycleSelectionResetsLockedLocalSession(t *testing.T) {
-	t.Parallel()
-
-	u := newUIWithSession("desktop", summarySession{hasVault: true, locked: true})
-	u.lifecycleMode = "local"
-	u.vaultPath.SetText("/vaults/bellagio.kdbx")
-	u.remoteBaseURL.SetText("https://dav.crew.example.invalid")
-	u.remotePath.SetText("vaults/remote.kdbx")
-	u.remoteUsername.SetText("dannyocean")
-	u.remotePassword.SetText("topsecret")
-	u.rememberRemoteAuth.Value = true
-	u.masterPassword.SetText("correct horse battery staple")
-	u.keyFilePath.SetText("/vaults/keyfile.keyx")
-	u.search.SetText("crew")
-	u.state.CurrentPath = []string{"Crew"}
-	u.state.SelectedEntryID = "entry-1"
-	u.state.Section = appstate.SectionTemplates
-	u.state.Dirty = true
-
-	u.switchToLifecycleSelection("local")
-
-	if !u.shouldShowLifecycleSetup() {
-		t.Fatal("shouldShowLifecycleSetup() = false, want true after switching away from locked local vault")
-	}
-	if got := u.lifecycleMode; got != "local" {
-		t.Fatalf("lifecycleMode = %q, want local", got)
-	}
-	if got := u.vaultPath.Text(); got != "" {
-		t.Fatalf("vaultPath = %q, want empty", got)
-	}
-	if got := u.remoteBaseURL.Text(); got != "" {
-		t.Fatalf("remoteBaseURL = %q, want empty", got)
-	}
-	if got := u.remotePath.Text(); got != "" {
-		t.Fatalf("remotePath = %q, want empty", got)
-	}
-	if got := u.remoteUsername.Text(); got != "" {
-		t.Fatalf("remoteUsername = %q, want empty", got)
-	}
-	if got := u.remotePassword.Text(); got != "" {
-		t.Fatalf("remotePassword = %q, want empty", got)
-	}
-	if u.rememberRemoteAuth.Value {
-		t.Fatal("rememberRemoteAuth = true, want false")
-	}
-	if got := u.masterPassword.Text(); got != "" {
-		t.Fatalf("masterPassword = %q, want empty", got)
-	}
-	if got := u.keyFilePath.Text(); got != "" {
-		t.Fatalf("keyFilePath = %q, want empty", got)
-	}
-	if got := u.search.Text(); got != "" {
-		t.Fatalf("search = %q, want empty", got)
-	}
-	if got := u.state.Section; got != appstate.SectionEntries {
-		t.Fatalf("state.Section = %q, want %q", got, appstate.SectionEntries)
-	}
-	if len(u.state.CurrentPath) != 0 {
-		t.Fatalf("state.CurrentPath = %v, want empty", u.state.CurrentPath)
-	}
-	if got := u.state.SelectedEntryID; got != "" {
-		t.Fatalf("state.SelectedEntryID = %q, want empty", got)
-	}
-	if u.state.Dirty {
-		t.Fatal("state.Dirty = true, want false")
-	}
-}
-
-func TestSwitchToLifecycleSelectionResetsLockedRemoteSession(t *testing.T) {
-	t.Parallel()
-
-	u := newUIWithSession("desktop", summarySession{hasVault: true, locked: true, remote: true})
-	u.lifecycleMode = "local"
-	u.vaultPath.SetText("/vaults/bellagio.kdbx")
-	u.remoteBaseURL.SetText("https://dav.crew.example.invalid")
-	u.remotePath.SetText("vaults/remote.kdbx")
-	u.remoteUsername.SetText("rustyryan")
-	u.remotePassword.SetText("topsecret")
-	u.rememberRemoteAuth.Value = true
-
-	u.switchToLifecycleSelection("remote")
-
-	if !u.shouldShowLifecycleSetup() {
-		t.Fatal("shouldShowLifecycleSetup() = false, want true after switching away from locked remote vault")
-	}
-	if got := u.lifecycleMode; got != "remote" {
-		t.Fatalf("lifecycleMode = %q, want remote", got)
-	}
-	if got := u.vaultPath.Text(); got != "" {
-		t.Fatalf("vaultPath = %q, want empty", got)
-	}
-	if got := u.remoteBaseURL.Text(); got != "" {
-		t.Fatalf("remoteBaseURL = %q, want empty", got)
-	}
-	if got := u.remotePath.Text(); got != "" {
-		t.Fatalf("remotePath = %q, want empty", got)
-	}
-	if got := u.remoteUsername.Text(); got != "" {
-		t.Fatalf("remoteUsername = %q, want empty", got)
-	}
-	if got := u.remotePassword.Text(); got != "" {
-		t.Fatalf("remotePassword = %q, want empty", got)
-	}
-	if u.rememberRemoteAuth.Value {
-		t.Fatal("rememberRemoteAuth = true, want false")
-	}
-}
-
 func TestSelectingRecentRemoteSwitchesToRemoteMode(t *testing.T) {
 	t.Parallel()
 

packaging/archlinux/keepassgo-git/.SRCINFO

@@ -1,26 +0,0 @@
-pkgbase = keepassgo-git
-	pkgdesc = KeePass-compatible password manager written in Go
-	pkgver = r160.5fa79bd
-	pkgrel = 1
-	url = https://git.julianfamily.org/joejulian/keepassgo
-	arch = x86_64
-	arch = aarch64
-	license = custom
-	makedepends = git
-	makedepends = go
-	makedepends = pkgconf
-	depends = glibc
-	depends = hicolor-icon-theme
-	depends = libx11
-	depends = libxcursor
-	depends = libxfixes
-	depends = libxkbcommon
-	depends = libxkbcommon-x11
-	depends = mesa
-	depends = wayland
-	provides = keepassgo
-	conflicts = keepassgo
-	source = git+https://git.julianfamily.org/joejulian/keepassgo.git
-	sha256sums = SKIP
-
-pkgname = keepassgo-git

packaging/archlinux/keepassgo-git/PKGBUILD

@@ -1,63 +0,0 @@
-pkgname=keepassgo-git
-pkgver=r0.0000000
-pkgrel=1
-pkgdesc='KeePass-compatible password manager written in Go'
-arch=('x86_64' 'aarch64')
-url='https://git.julianfamily.org/joejulian/keepassgo'
-license=('custom')
-depends=(
-  'glibc'
-  'hicolor-icon-theme'
-  'libx11'
-  'libxcursor'
-  'libxfixes'
-  'libxkbcommon'
-  'libxkbcommon-x11'
-  'mesa'
-  'wayland'
-)
-makedepends=(
-  'git'
-  'go'
-  'pkgconf'
-)
-provides=('keepassgo')
-conflicts=('keepassgo')
-source=('git+https://git.julianfamily.org/joejulian/keepassgo.git')
-sha256sums=('SKIP')
-
-_repo_dir() {
-  if [[ -d "${srcdir}/keepassgo/.git" ]]; then
-    printf '%s\n' "${srcdir}/keepassgo"
-    return
-  fi
-
-  cd "${startdir}/../../.." || exit 1
-  pwd
-}
-
-pkgver() {
-  cd "$(_repo_dir)"
-  printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-build() {
-  cd "$(_repo_dir)"
-  export CGO_ENABLED=1
-  export GOFLAGS="-trimpath"
-  go build -o keepassgo .
-}
-
-package() {
-  cd "$(_repo_dir)"
-
-  install -Dm755 keepassgo "${pkgdir}/usr/bin/keepassgo"
-  install -Dm644 assets/keepassgo-icon.png \
-    "${pkgdir}/usr/share/icons/hicolor/512x512/apps/keepassgo.png"
-  install -Dm644 assets/keepassgo-icon.svg \
-    "${pkgdir}/usr/share/icons/hicolor/scalable/apps/keepassgo.svg"
-  install -Dm644 packaging/archlinux/keepassgo-git/keepassgo.desktop \
-    "${pkgdir}/usr/share/applications/keepassgo.desktop"
-  install -Dm644 README.md \
-    "${pkgdir}/usr/share/licenses/${pkgname}/README.md"
-}

packaging/archlinux/keepassgo-git/keepassgo.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=KeePassGO
-Comment=KeePass-compatible password manager
-Exec=keepassgo
-Icon=keepassgo
-Terminal=false
-Categories=Utility;Security;
-Keywords=keepass;password;vault;kdbx;
-StartupNotify=true

session/session.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"io"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -178,18 +177,6 @@ func (m *Manager) SynchronizeFromLocal(path string) error {
 	return m.persistMergedToCurrentSource(merged)
 }
 
-func (m *Manager) SynchronizeFromLocalBytes(name string, content []byte) error {
-	other, _, err := loadLocalSourceBytes(name, content, m.key)
-	if err != nil {
-		return err
-	}
-	merged, err := m.mergedWithPeer(other)
-	if err != nil {
-		return err
-	}
-	return m.persistMergedToCurrentSource(merged)
-}
-
 func (m *Manager) SynchronizeToLocal(path string) error {
 	other, config, err := loadLocalSourceOrEmpty(path, m.key)
 	if err != nil {
@@ -921,17 +908,6 @@ func loadLocalSource(path string, key vault.MasterKey) (vault.Model, *vault.KDBX
 	return model, config, nil
 }
 
-func loadLocalSourceBytes(name string, content []byte, key vault.MasterKey) (vault.Model, *vault.KDBXConfig, error) {
-	if len(content) == 0 {
-		return vault.Model{}, nil, fmt.Errorf("open %s for synchronize: %w", name, io.EOF)
-	}
-	model, config, err := vault.LoadKDBXWithConfig(bytes.NewReader(content), key)
-	if err != nil {
-		return vault.Model{}, nil, fmt.Errorf("decode %s for synchronize: %w", name, err)
-	}
-	return model, config, nil
-}
-
 func loadLocalSourceOrEmpty(path string, key vault.MasterKey) (vault.Model, *vault.KDBXConfig, error) {
 	model, config, err := loadLocalSource(path, key)
 	if err == nil {

session/session_test.go

@@ -953,63 +953,6 @@ func TestSynchronizeFromLocalMergesOtherVaultIntoCurrentSource(t *testing.T) {
 	}
 }
 
-func TestSynchronizeFromLocalBytesMergesOtherVaultIntoCurrentSource(t *testing.T) {
-	t.Parallel()
-
-	key := vault.MasterKey{Password: "correct horse battery staple"}
-	currentPath := filepath.Join(t.TempDir(), "current.kdbx")
-
-	currentModel := vault.Model{
-		Entries: []vault.Entry{{
-			ID:       "entry-current",
-			Title:    "Vault Console",
-			Username: "dannyocean",
-			Password: "token-current",
-			URL:      "https://vault.crew.example.invalid",
-			Path:     []string{"Root", "Internet"},
-		}},
-	}
-	otherModel := vault.Model{
-		Entries: []vault.Entry{{
-			ID:       "entry-other",
-			Title:    "Bellagio",
-			Username: "rustyryan",
-			Password: "token-other",
-			URL:      "https://bellagio.example.invalid",
-			Path:     []string{"Root", "Internet"},
-		}},
-	}
-
-	writeKDBXTestFile(t, currentPath, currentModel, key)
-	var other bytes.Buffer
-	if err := vault.SaveKDBX(&other, otherModel, key.Password); err != nil {
-		t.Fatalf("SaveKDBX(other) error = %v", err)
-	}
-
-	var sess Manager
-	if err := sess.Open(currentPath, key); err != nil {
-		t.Fatalf("Open(current) error = %v", err)
-	}
-
-	if err := sess.SynchronizeFromLocalBytes("picked-other.kdbx", other.Bytes()); err != nil {
-		t.Fatalf("SynchronizeFromLocalBytes() error = %v", err)
-	}
-
-	var reopened Manager
-	if err := reopened.Open(currentPath, key); err != nil {
-		t.Fatalf("reopen Open(current) error = %v", err)
-	}
-	current, err := reopened.Current()
-	if err != nil {
-		t.Fatalf("reopened Current() error = %v", err)
-	}
-
-	got := current.EntriesInPath([]string{"Root", "Internet"})
-	if len(got) != 2 {
-		t.Fatalf("len(EntriesInPath(Root/Internet)) = %d, want 2", len(got))
-	}
-}
-
 func TestSynchronizeToLocalWritesMergedVaultToTarget(t *testing.T) {
 	t.Parallel()
 

ui_forms.go

@@ -20,9 +20,6 @@ import (
 
 func (u *ui) lifecycleControls(gtx layout.Context) layout.Dimensions {
 	busy := u.lifecycleBusy()
-	showLocalChooser := u.showLocalVaultChooser()
-	showRemoteChooser := u.showRemoteConnectionChooser()
-	selectedLocalPath := strings.TrimSpace(u.vaultPath.Text())
 	return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
 		layout.Rigid(func(gtx layout.Context) layout.Dimensions {
 			lbl := material.Label(u.theme, unit.Sp(12), "OPEN A VAULT")
@@ -62,172 +59,173 @@ func (u *ui) lifecycleControls(gtx layout.Context) layout.Dimensions {
 			if u.lifecycleMode == "remote" {
 				return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
 					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !showRemoteChooser {
-							return layout.Dimensions{}
-						}
 						lbl := material.Label(u.theme, unit.Sp(12), "LOCATION")
 						lbl.Color = mutedColor
 						return lbl.Layout(gtx)
 					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout),
+					layout.Rigid(labeledEditorHelp(u.theme, "Remote Base URL", "Base WebDAV endpoint, for example https://server/remote.php/webdav.", &u.remoteBaseURL, false)),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
+					layout.Rigid(labeledEditorHelp(u.theme, "Remote Path", "Path to the remote .kdbx file under the WebDAV base URL.", &u.remotePath, false)),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
 					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !showRemoteChooser {
+						if strings.TrimSpace(u.remoteBaseURL.Text()) == "" || strings.TrimSpace(u.remotePath.Text()) == "" {
 							return layout.Dimensions{}
 						}
-						return layout.Spacer{Height: unit.Dp(4)}.Layout(gtx)
+						record := u.currentRemoteRecord()
+						lastGroup := u.recentRemoteGroup(record.BaseURL, record.Path)
+						return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
+							return layout.UniformInset(unit.Dp(10)).Layout(gtx, func(gtx layout.Context) layout.Dimensions {
+								return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+									layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+										lbl := material.Label(u.theme, unit.Sp(12), "SELECTED CONNECTION")
+										lbl.Color = mutedColor
+										return lbl.Layout(gtx)
+									}),
+									layout.Rigid(layout.Spacer{Height: unit.Dp(2)}.Layout),
+									layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+										lbl := material.Label(u.theme, unit.Sp(14), friendlyRecentRemoteLabel(record))
+										lbl.Color = accentColor
+										return lbl.Layout(gtx)
+									}),
+									layout.Rigid(layout.Spacer{Height: unit.Dp(2)}.Layout),
+									layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+										lbl := material.Label(u.theme, unit.Sp(11), "Path: "+strings.TrimSpace(record.Path))
+										lbl.Color = mutedColor
+										return lbl.Layout(gtx)
+									}),
+									layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+										lbl := material.Label(u.theme, unit.Sp(11), "Server: "+strings.TrimSpace(record.BaseURL))
+										lbl.Color = mutedColor
+										return lbl.Layout(gtx)
+									}),
+									layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+										lbl := material.Label(u.theme, unit.Sp(11), "Auth: "+recentRemoteStoredAuthSummary(recentRemoteRecord{
+											Username: strings.TrimSpace(u.remoteUsername.Text()),
+											Password: u.remotePassword.Text(),
+										}))
+										lbl.Color = mutedColor
+										return lbl.Layout(gtx)
+									}),
+									layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+										if len(lastGroup) == 0 {
+											return layout.Dimensions{}
+										}
+										lbl := material.Label(u.theme, unit.Sp(11), "Last group: "+strings.Join(u.displayEntryPath(lastGroup), " / "))
+										lbl.Color = mutedColor
+										return lbl.Layout(gtx)
+									}),
+									layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout),
+									layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+										if busy {
+											return layout.Dimensions{}
+										}
+										return tonedButton(gtx, u.theme, &u.clearRemoteSelection, "Change...")
+									}),
+								)
+							})
+						})
 					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(8)}.Layout),
 					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !showRemoteChooser {
+						if busy {
 							return layout.Dimensions{}
 						}
-						return labeledEditorHelp(u.theme, "Remote Base URL", "Base WebDAV endpoint, for example https://server/remote.php/webdav.", &u.remoteBaseURL, false)(gtx)
+						return u.recentRemoteList(gtx)
 					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(10)}.Layout),
 					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !showRemoteChooser {
-							return layout.Dimensions{}
-						}
-						return layout.Spacer{Height: unit.Dp(6)}.Layout(gtx)
-					}),
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !showRemoteChooser {
-							return layout.Dimensions{}
-						}
-						return labeledEditorHelp(u.theme, "Remote Path", "Path to the remote .kdbx file under the WebDAV base URL.", &u.remotePath, false)(gtx)
-					}),
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !showRemoteChooser {
-							return layout.Dimensions{}
-						}
-						return layout.Spacer{Height: unit.Dp(6)}.Layout(gtx)
-					}),
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if showRemoteChooser || !u.hasSelectedRemoteTarget() {
-							return layout.Dimensions{}
-						}
-						return layout.Dimensions{}
-					}),
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if showRemoteChooser && !busy {
-							return u.recentRemoteList(gtx)
-						}
-						return layout.Dimensions{}
-					}),
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !showRemoteChooser {
-							return layout.Dimensions{}
-						}
-						return layout.Spacer{Height: unit.Dp(10)}.Layout(gtx)
-					}),
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !showRemoteChooser {
-							return layout.Dimensions{}
-						}
 						lbl := material.Label(u.theme, unit.Sp(12), "AUTHENTICATION")
 						lbl.Color = mutedColor
 						return lbl.Layout(gtx)
 					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout),
+					layout.Rigid(labeledEditorHelp(u.theme, "Remote Username", "Username used to authenticate to the WebDAV server.", &u.remoteUsername, false)),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
 					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !showRemoteChooser {
-							return layout.Dimensions{}
-						}
-						return layout.Spacer{Height: unit.Dp(4)}.Layout(gtx)
-					}),
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !showRemoteChooser {
-							return layout.Dimensions{}
-						}
-						return labeledEditorHelp(u.theme, "Remote Username", "Username used to authenticate to the WebDAV server.", &u.remoteUsername, false)(gtx)
-					}),
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !showRemoteChooser {
-							return layout.Dimensions{}
-						}
-						return layout.Spacer{Height: unit.Dp(6)}.Layout(gtx)
-					}),
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !showRemoteChooser {
-							return layout.Dimensions{}
-						}
 						return labeledEditorHelp(u.theme, "Remote Password", "Password or app token used to authenticate to the WebDAV server.", &u.remotePassword, true)(gtx)
 					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
 					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !showRemoteChooser {
-							return layout.Dimensions{}
-						}
-						return layout.Spacer{Height: unit.Dp(6)}.Layout(gtx)
-					}),
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !showRemoteChooser {
-							return layout.Dimensions{}
-						}
 						box := material.CheckBox(u.theme, &u.rememberRemoteAuth, "Remember sign-in on this device")
 						box.Color = accentColor
 						return box.Layout(gtx)
 					}),
 					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !showRemoteChooser {
-							return layout.Dimensions{}
-						}
 						return layout.Inset{Top: unit.Dp(4)}.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
 							return tonedButton(gtx, u.theme, &u.openRemotePrefsHelp, "Settings & Help")
 						})
 					}),
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+					layout.Rigid(layout.Spacer{Height: unit.Dp(8)}.Layout),
-						if !showRemoteChooser {
-							return layout.Dimensions{}
-						}
-						return layout.Spacer{Height: unit.Dp(8)}.Layout(gtx)
-					}),
 				)
 			}
 			return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
 				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					if !showLocalChooser {
-						return layout.Dimensions{}
-					}
 					lbl := material.Label(u.theme, unit.Sp(12), "RECENT VAULTS")
 					lbl.Color = mutedColor
 					return lbl.Layout(gtx)
 				}),
+				layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout),
 				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					if !showLocalChooser {
+					if busy {
-						return layout.Dimensions{}
-					}
-					return layout.Spacer{Height: unit.Dp(4)}.Layout(gtx)
-				}),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					if !showLocalChooser || busy {
 						return layout.Dimensions{}
 					}
 					return u.recentVaultList(gtx)
 				}),
+				layout.Rigid(layout.Spacer{Height: unit.Dp(8)}.Layout),
 				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					if !showLocalChooser {
-						return layout.Dimensions{}
-					}
-					return layout.Spacer{Height: unit.Dp(8)}.Layout(gtx)
-				}),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					if !showLocalChooser {
-						return layout.Dimensions{}
-					}
 					lbl := material.Label(u.theme, unit.Sp(12), "VAULT FILE")
 					lbl.Color = mutedColor
 					return lbl.Layout(gtx)
 				}),
+				layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout),
 				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					if !showLocalChooser {
+					selectedPath := strings.TrimSpace(u.vaultPath.Text())
-						return layout.Dimensions{}
-					}
-					return layout.Spacer{Height: unit.Dp(4)}.Layout(gtx)
-				}),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
 					switch {
 					case busy:
 						return labeledEditorHelp(u.theme, "Vault Path", localVaultPathHelp(), &u.vaultPath, false)(gtx)
-					case selectedLocalPath == "":
+					case selectedPath == "":
 						return localPathSelector(u.theme, &u.vaultPath, &u.pickVaultPath)(gtx)
 					default:
-						return layout.Dimensions{}
+						lastGroup := u.recentVaultGroup(selectedPath)
+						return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
+							return layout.UniformInset(unit.Dp(10)).Layout(gtx, func(gtx layout.Context) layout.Dimensions {
+								return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+									layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+										lbl := material.Label(u.theme, unit.Sp(12), "SELECTED VAULT")
+										lbl.Color = mutedColor
+										return lbl.Layout(gtx)
+									}),
+									layout.Rigid(layout.Spacer{Height: unit.Dp(2)}.Layout),
+									layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+										lbl := material.Label(u.theme, unit.Sp(16), friendlyRecentVaultLabel(selectedPath))
+										lbl.Color = accentColor
+										return lbl.Layout(gtx)
+									}),
+									layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+										dir := compactPathDirectorySummary(selectedPath)
+										if dir == "" {
+											return layout.Dimensions{}
+										}
+										lbl := material.Label(u.theme, unit.Sp(11), dir)
+										lbl.Color = mutedColor
+										return lbl.Layout(gtx)
+									}),
+									layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+										if len(lastGroup) == 0 {
+											return layout.Dimensions{}
+										}
+										lbl := material.Label(u.theme, unit.Sp(11), "Last group: "+strings.Join(u.displayEntryPath(lastGroup), " / "))
+										lbl.Color = mutedColor
+										return lbl.Layout(gtx)
+									}),
+									layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
+									layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+										return tonedButton(gtx, u.theme, &u.clearVaultSelection, "Change...")
+									}),
+								)
+							})
+						})
 					}
 				}),
 			)
@@ -298,26 +296,10 @@ func (u *ui) lifecycleControls(gtx layout.Context) layout.Dimensions {
 		layout.Rigid(func(gtx layout.Context) layout.Dimensions {
 			if u.lifecycleMode == "remote" {
 				label := u.remoteOpenButtonLabel()
-				return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+				if busy {
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+					return passiveTonedButton(gtx, u.theme, label)
-						if busy {
+				}
-							return passiveTonedButton(gtx, u.theme, label)
+				return tonedButton(gtx, u.theme, &u.openRemote, label)
-						}
-						return tonedButton(gtx, u.theme, &u.openRemote, label)
-					}),
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if busy || !u.hasSelectedRemoteTarget() {
-							return layout.Dimensions{}
-						}
-						return layout.Spacer{Height: unit.Dp(8)}.Layout(gtx)
-					}),
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if busy || !u.hasSelectedRemoteTarget() {
-							return layout.Dimensions{}
-						}
-						return u.selectedRemoteConnectionCard(gtx)
-					}),
-				)
 			}
 			return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
 				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
@@ -343,118 +325,11 @@ func (u *ui) lifecycleControls(gtx layout.Context) layout.Dimensions {
 					}
 					return sectionTabButton(gtx, u.theme, &u.createVault, "Create New Vault", false)
 				}),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					if busy || selectedLocalPath == "" {
-						return layout.Dimensions{}
-					}
-					return layout.Spacer{Height: unit.Dp(8)}.Layout(gtx)
-				}),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					if busy || selectedLocalPath == "" {
-						return layout.Dimensions{}
-					}
-					return u.selectedLocalVaultCard(gtx, selectedLocalPath)
-				}),
 			)
 		}),
 	)
 }
 
-func (u *ui) selectedRemoteConnectionCard(gtx layout.Context) layout.Dimensions {
-	record := u.currentRemoteRecord()
-	lastGroup := u.recentRemoteGroup(record.BaseURL, record.Path)
-	return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
-		return layout.UniformInset(unit.Dp(10)).Layout(gtx, func(gtx layout.Context) layout.Dimensions {
-			return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					lbl := material.Label(u.theme, unit.Sp(12), "SELECTED CONNECTION")
-					lbl.Color = mutedColor
-					return lbl.Layout(gtx)
-				}),
-				layout.Rigid(layout.Spacer{Height: unit.Dp(2)}.Layout),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					lbl := material.Label(u.theme, unit.Sp(14), friendlyRecentRemoteLabel(record))
-					lbl.Color = accentColor
-					return lbl.Layout(gtx)
-				}),
-				layout.Rigid(layout.Spacer{Height: unit.Dp(2)}.Layout),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					lbl := material.Label(u.theme, unit.Sp(11), "Path: "+strings.TrimSpace(record.Path))
-					lbl.Color = mutedColor
-					return lbl.Layout(gtx)
-				}),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					lbl := material.Label(u.theme, unit.Sp(11), "Server: "+strings.TrimSpace(record.BaseURL))
-					lbl.Color = mutedColor
-					return lbl.Layout(gtx)
-				}),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					lbl := material.Label(u.theme, unit.Sp(11), "Auth: "+recentRemoteStoredAuthSummary(recentRemoteRecord{
-						Username: strings.TrimSpace(u.remoteUsername.Text()),
-						Password: u.remotePassword.Text(),
-					}))
-					lbl.Color = mutedColor
-					return lbl.Layout(gtx)
-				}),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					if len(lastGroup) == 0 {
-						return layout.Dimensions{}
-					}
-					lbl := material.Label(u.theme, unit.Sp(11), "Last group: "+strings.Join(u.displayEntryPath(lastGroup), " / "))
-					lbl.Color = mutedColor
-					return lbl.Layout(gtx)
-				}),
-				layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					return tonedButton(gtx, u.theme, &u.clearRemoteSelection, "Open Different Connection")
-				}),
-			)
-		})
-	})
-}
-
-func (u *ui) selectedLocalVaultCard(gtx layout.Context, path string) layout.Dimensions {
-	lastGroup := u.recentVaultGroup(path)
-	return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
-		return layout.UniformInset(unit.Dp(10)).Layout(gtx, func(gtx layout.Context) layout.Dimensions {
-			return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					lbl := material.Label(u.theme, unit.Sp(12), "SELECTED VAULT")
-					lbl.Color = mutedColor
-					return lbl.Layout(gtx)
-				}),
-				layout.Rigid(layout.Spacer{Height: unit.Dp(2)}.Layout),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					lbl := material.Label(u.theme, unit.Sp(16), friendlyRecentVaultLabel(path))
-					lbl.Color = accentColor
-					return lbl.Layout(gtx)
-				}),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					dir := compactPathDirectorySummary(path)
-					if dir == "" {
-						return layout.Dimensions{}
-					}
-					lbl := material.Label(u.theme, unit.Sp(11), dir)
-					lbl.Color = mutedColor
-					return lbl.Layout(gtx)
-				}),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					if len(lastGroup) == 0 {
-						return layout.Dimensions{}
-					}
-					lbl := material.Label(u.theme, unit.Sp(11), "Last group: "+strings.Join(u.displayEntryPath(lastGroup), " / "))
-					lbl.Color = mutedColor
-					return lbl.Layout(gtx)
-				}),
-				layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					return tonedButton(gtx, u.theme, &u.clearVaultSelection, "Open Different Vault")
-				}),
-			)
-		})
-	})
-}
-
 func (u *ui) lifecycleSecuritySettingsSummary() string {
 	return "Cipher and KDF now live in Vault Settings so opening and creating a vault stays focused on the file, key material, and sync choices."
 }
@@ -1337,14 +1212,12 @@ func selectorEditorHelp(th *material.Theme, label, help string, editor *widget.E
 func (u *ui) unlockPanel(gtx layout.Context) layout.Dimensions {
 	targetLabel := "Locked vault"
 	targetValue := "Unlock the active vault to continue."
-	changeLabel := "Open Different Vault"
 	if u.state.Session != nil {
 		if strings.TrimSpace(u.remoteBaseURL.Text()) != "" || strings.TrimSpace(u.remotePath.Text()) != "" {
 			baseURL := strings.TrimSpace(u.remoteBaseURL.Text())
 			path := strings.TrimSpace(u.remotePath.Text())
 			targetLabel = "Remote vault"
 			targetValue = friendlyRecentRemoteLabel(recentRemoteRecord{BaseURL: baseURL, Path: path})
-			changeLabel = "Open Different Connection"
 			if strings.TrimSpace(targetValue) == "" {
 				targetValue = "Remote WebDAV vault"
 			}
@@ -1360,42 +1233,25 @@ func (u *ui) unlockPanel(gtx layout.Context) layout.Dimensions {
 			}
 		}
 	}
-	targetCard := func(gtx layout.Context) layout.Dimensions {
-		return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
-			return layout.UniformInset(unit.Dp(10)).Layout(gtx, func(gtx layout.Context) layout.Dimensions {
-				return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						lbl := material.Label(u.theme, unit.Sp(12), strings.ToUpper(targetLabel))
-						lbl.Color = mutedColor
-						return lbl.Layout(gtx)
-					}),
-					layout.Rigid(layout.Spacer{Height: unit.Dp(2)}.Layout),
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						lbl := material.Body1(u.theme, targetValue)
-						lbl.Color = accentColor
-						return lbl.Layout(gtx)
-					}),
-					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						if !u.shouldUseLockedSinglePane() {
-							return layout.Dimensions{}
-						}
-						return layout.Inset{Top: unit.Dp(6)}.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
-							if targetLabel == "Remote vault" {
-								return tonedButton(gtx, u.theme, &u.clearRemoteSelection, changeLabel)
-							}
-							return tonedButton(gtx, u.theme, &u.clearVaultSelection, changeLabel)
-						})
-					}),
-				)
-			})
-		})
-	}
 	return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
 		layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-			if u.mode == "desktop" {
+			return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
-				return layout.Dimensions{}
+				return layout.UniformInset(unit.Dp(10)).Layout(gtx, func(gtx layout.Context) layout.Dimensions {
-			}
+					return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
-			return targetCard(gtx)
+						layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+							lbl := material.Label(u.theme, unit.Sp(12), strings.ToUpper(targetLabel))
+							lbl.Color = mutedColor
+							return lbl.Layout(gtx)
+						}),
+						layout.Rigid(layout.Spacer{Height: unit.Dp(2)}.Layout),
+						layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+							lbl := material.Body1(u.theme, targetValue)
+							lbl.Color = accentColor
+							return lbl.Layout(gtx)
+						}),
+					)
+				})
+			})
 		}),
 		layout.Rigid(layout.Spacer{Height: unit.Dp(8)}.Layout),
 		layout.Rigid(func(gtx layout.Context) layout.Dimensions {
@@ -1407,18 +1263,6 @@ func (u *ui) unlockPanel(gtx layout.Context) layout.Dimensions {
 		layout.Rigid(func(gtx layout.Context) layout.Dimensions {
 			return tonedButton(gtx, u.theme, &u.unlockVault, "Unlock")
 		}),
-		layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-			if u.mode != "desktop" {
-				return layout.Dimensions{}
-			}
-			return layout.Spacer{Height: unit.Dp(8)}.Layout(gtx)
-		}),
-		layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-			if u.mode != "desktop" {
-				return layout.Dimensions{}
-			}
-			return targetCard(gtx)
-		}),
 	)
 }