From 60117f13df395bc367eb1c77b5c5dff13b7925b9 Mon Sep 17 00:00:00 2001 From: Thang Nguyen Date: Fri, 13 Nov 2026 15:36:00 +0700 Subject: [PATCH 1/5] fix(mobile): make pair-device screen copy accurate about what syncs --- app/lib/mobile/screens/mobile_sync_screen.dart | 6 +++--- app/test/mobile/mobile_settings_screen_test.dart | 4 ++-- app/test/mobile/screens/sync_screen_test.dart | 6 ++++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/lib/mobile/screens/mobile_sync_screen.dart b/app/lib/mobile/screens/mobile_sync_screen.dart index 76d575b1..f09dd3d7 100644 --- a/app/lib/mobile/screens/mobile_sync_screen.dart +++ b/app/lib/mobile/screens/mobile_sync_screen.dart @@ -271,11 +271,11 @@ class _MobileSyncScreenState extends State { Widget _buildHero() => Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text('Sync with Supabase', style: mobileHeading(size: 22)), + Text('Sync between devices', style: mobileHeading(size: 22)), const SizedBox(height: MobileTokens.space2), Text( - 'No account needed. Your hosts, keys & snippets stay end-to-end ' - 'encrypted across devices.', + 'No account needed. Syncs your hosts and their passwords. ' + 'Keys and snippets are not synced.', style: mobileBody(size: 14, color: MobileColors.textMuted), ), ], diff --git a/app/test/mobile/mobile_settings_screen_test.dart b/app/test/mobile/mobile_settings_screen_test.dart index 5a5216ee..f470c82f 100644 --- a/app/test/mobile/mobile_settings_screen_test.dart +++ b/app/test/mobile/mobile_settings_screen_test.dart @@ -68,7 +68,7 @@ void main() { await tester.pump(const Duration(milliseconds: 200)); // MobileSyncScreen heading must be visible. - expect(find.text('Sync with Supabase'), findsOneWidget); + expect(find.text('Sync between devices'), findsOneWidget); expect(find.byType(MobileSyncScreen), findsOneWidget); }); @@ -79,6 +79,6 @@ void main() { await tester.pump(); await tester.pump(const Duration(milliseconds: 200)); expect(find.byType(MobileSyncScreen), findsOneWidget); - expect(find.text('Sync with Supabase'), findsOneWidget); + expect(find.text('Sync between devices'), findsOneWidget); }); } diff --git a/app/test/mobile/screens/sync_screen_test.dart b/app/test/mobile/screens/sync_screen_test.dart index c4f6a383..424c2244 100644 --- a/app/test/mobile/screens/sync_screen_test.dart +++ b/app/test/mobile/screens/sync_screen_test.dart @@ -64,9 +64,11 @@ Future _pump( void main() { setUp(() => SharedPreferences.setMockInitialValues({})); - testWidgets('renders heading "Sync with Supabase"', (tester) async { + testWidgets('renders heading "Sync between devices"', (tester) async { await _pump(tester); - expect(find.text('Sync with Supabase'), findsOneWidget); + expect(find.text('Sync between devices'), findsOneWidget); + expect(find.textContaining('Keys and snippets are not synced'), findsOneWidget); + expect(find.textContaining('end-to-end'), findsNothing); }); testWidgets('renders "Scan QR code" button', (tester) async { From e4e984bf1c3a0fd51db3a8f4d89ac768247cf5f8 Mon Sep 17 00:00:00 2001 From: Thang Nguyen Date: Fri, 13 Nov 2026 15:36:01 +0700 Subject: [PATCH 2/5] fix(mobile): auto-lock row states the real behavior --- app/lib/mobile/screens/mobile_settings_screen.dart | 2 +- app/test/mobile/screens/settings_screen_test.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/lib/mobile/screens/mobile_settings_screen.dart b/app/lib/mobile/screens/mobile_settings_screen.dart index 2a9b6ea4..17baa5e3 100644 --- a/app/lib/mobile/screens/mobile_settings_screen.dart +++ b/app/lib/mobile/screens/mobile_settings_screen.dart @@ -165,7 +165,7 @@ class _MobileSettingsScreenState extends State { SettingsRow( leading: const Icon(FLucideIcons.timer, color: MobileColors.textMuted, size: 20), title: 'Auto-lock', - value: 'After 1 min', + value: 'Immediately when you leave the app', ), ], ); diff --git a/app/test/mobile/screens/settings_screen_test.dart b/app/test/mobile/screens/settings_screen_test.dart index 0164dac1..b55f92d4 100644 --- a/app/test/mobile/screens/settings_screen_test.dart +++ b/app/test/mobile/screens/settings_screen_test.dart @@ -135,7 +135,7 @@ void main() { for (final t in [ 'Biometric unlock', 'Auto-lock', - 'After 1 min', + 'Immediately when you leave the app', 'Shortcut key bar', 'Supabase sync', 'Pair new device', From 1b51a29153b34f46a34b54eb34c72f6d296dd368 Mon Sep 17 00:00:00 2001 From: Thang Nguyen Date: Fri, 13 Nov 2026 15:36:01 +0700 Subject: [PATCH 3/5] fix(mobile): remove app-wide lock switch from the host form --- .../screens/mobile_add_host_screen.dart | 45 ------------------- .../mobile/screens/add_host_screen_test.dart | 24 ++-------- 2 files changed, 4 insertions(+), 65 deletions(-) diff --git a/app/lib/mobile/screens/mobile_add_host_screen.dart b/app/lib/mobile/screens/mobile_add_host_screen.dart index 3e1d76f1..2a377026 100644 --- a/app/lib/mobile/screens/mobile_add_host_screen.dart +++ b/app/lib/mobile/screens/mobile_add_host_screen.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; -import 'package:shared_preferences/shared_preferences.dart'; import 'package:yourssh_ui/yourssh_ui.dart'; import '../../models/host.dart'; @@ -9,7 +8,6 @@ import '../../models/ssh_key.dart'; import '../../providers/host_provider.dart'; import '../../providers/key_provider.dart'; import '../../providers/session_provider.dart'; -import '../security/app_lock_gate.dart'; import '../theme/mobile_theme.dart'; import '../theme/mobile_tokens.dart'; import '../widgets/button_label.dart'; @@ -348,7 +346,6 @@ class _MobileAddHostScreenState extends State { hint: _isEdit ? 'Leave blank to keep current' : null, textInputAction: TextInputAction.done, ), - const ListGroup(children: [_BiometricRow()]), ]); } @@ -560,45 +557,3 @@ class _CertAgentNoteRow extends StatelessWidget { ); } } - -/// Toggle row for Face ID / biometric app-lock (reads/writes -/// [kAppLockPrefKey] in SharedPreferences — same key as AppLockGate). -class _BiometricRow extends StatefulWidget { - const _BiometricRow(); - - @override - State<_BiometricRow> createState() => _BiometricRowState(); -} - -class _BiometricRowState extends State<_BiometricRow> { - bool _enabled = true; - bool _loaded = false; - - @override - void initState() { - super.initState(); - SharedPreferences.getInstance().then((p) { - if (!mounted) return; - setState(() { - _enabled = p.getBool(kAppLockPrefKey) ?? true; - _loaded = true; - }); - }); - } - - Future _toggle(bool v) async { - setState(() => _enabled = v); - final p = await SharedPreferences.getInstance(); - await p.setBool(kAppLockPrefKey, v); - } - - @override - Widget build(BuildContext context) { - if (!_loaded) return const SizedBox.shrink(); - return SettingsRow( - title: 'Unlock with biometrics', - toggle: _enabled, - onToggle: _toggle, - ); - } -} diff --git a/app/test/mobile/screens/add_host_screen_test.dart b/app/test/mobile/screens/add_host_screen_test.dart index 4ad53b98..09d09530 100644 --- a/app/test/mobile/screens/add_host_screen_test.dart +++ b/app/test/mobile/screens/add_host_screen_test.dart @@ -222,32 +222,16 @@ void main() { expect(_editable(tester, snippetField).controller.text, 'tmux attach'); }); - // ── Fix 1: biometric toggle uses the shared kAppLockPrefKey ───────────── + // The app lock lives in Settings -> Security, not in the per-host form. - testWidgets('biometric toggle persists under shared kAppLockPrefKey', - (tester) async { + testWidgets('host form has no app-lock / biometric switch', (tester) async { SharedPreferences.setMockInitialValues({}); final hosts = HostProvider(StorageService()); await tester.pumpWidget(_wrap(hosts, const MobileAddHostScreen())); await tester.pumpAndSettle(); - // The switch should be present and enabled by default (kAppLockPrefKey - // absent → defaults to true). - final switchFinder = find.byType(FSwitch); - expect(switchFinder, findsOneWidget); - expect(tester.widget(switchFinder).value, isTrue); - - // Toggle it off. - await tester.ensureVisible(switchFinder); - await tester.pumpAndSettle(); - await tester.tap(switchFinder); - await tester.pumpAndSettle(); - - final prefs = await SharedPreferences.getInstance(); - // Must write under the SHARED key, not a local orphan key. - expect(prefs.getBool(kAppLockPrefKey), isFalse); - // The old orphan key must not exist. - expect(prefs.getBool('yourssh.app_lock_enabled'), isNull); + expect(find.byType(FSwitch), findsNothing); + expect(find.text('Unlock with biometrics'), findsNothing); }); // ── Fix 2: "Save & connect" wires connectAny; plain "Save" does not ───── From 5eb0a187eae4c4509a3b9cc0e675709392404de9 Mon Sep 17 00:00:00 2001 From: Thang Nguyen Date: Fri, 13 Nov 2026 15:40:33 +0700 Subject: [PATCH 4/5] fix(keys): delete stored passphrase on key removal and remember dismissed ~/.ssh keys --- app/lib/main.dart | 1 + app/lib/mobile/mobile_bootstrap.dart | 4 +- app/lib/providers/key_provider.dart | 46 ++++++++++++++- app/lib/services/storage_service.dart | 2 + app/test/providers/key_provider_test.dart | 70 +++++++++++++++++++++++ 5 files changed, 120 insertions(+), 3 deletions(-) diff --git a/app/lib/main.dart b/app/lib/main.dart index 89c334f4..454ea07b 100644 --- a/app/lib/main.dart +++ b/app/lib/main.dart @@ -241,6 +241,7 @@ class _YourSSHAppState extends State with WindowListener { _hostProvider = HostProvider(_storage); _keyProvider = KeyProvider(); _keyProvider.savePassphrase = _storage.savePassphrase; + _keyProvider.deletePassphrase = _storage.deletePassphrase; _settingsProvider = SettingsProvider(); _ssh.isShellIntegrationEnabled = () => _settingsProvider.shellIntegrationEnabled; diff --git a/app/lib/mobile/mobile_bootstrap.dart b/app/lib/mobile/mobile_bootstrap.dart index 5ebcfe89..d006bee4 100644 --- a/app/lib/mobile/mobile_bootstrap.dart +++ b/app/lib/mobile/mobile_bootstrap.dart @@ -43,7 +43,9 @@ class MobileBootstrap { storage = StorageService(); ssh = SshService(storage); hostProvider = HostProvider(storage); - keyProvider = KeyProvider()..savePassphrase = storage.savePassphrase; + keyProvider = KeyProvider() + ..savePassphrase = storage.savePassphrase + ..deletePassphrase = storage.deletePassphrase; settings = SettingsProvider(); knownHosts = KnownHostsProvider(storage)..load(); sessions = SessionProvider(ssh, TabMetadataService()); diff --git a/app/lib/providers/key_provider.dart b/app/lib/providers/key_provider.dart index 912340f3..11204f33 100644 --- a/app/lib/providers/key_provider.dart +++ b/app/lib/providers/key_provider.dart @@ -7,6 +7,7 @@ import '../models/ssh_key.dart'; class KeyProvider extends ChangeNotifier { static const _prefsKey = 'yourssh.keys'; + static const _dismissedKey = 'yourssh.keys.dismissed'; List _keys = []; List get keys => _keys; @@ -18,7 +19,11 @@ class KeyProvider extends ChangeNotifier { /// read the real home directory. final bool discoverSshKeys; - KeyProvider({this.discoverSshKeys = true}) { + /// Directory scanned by auto-discovery; defaults to `~/.ssh`. Tests inject a + /// temp dir. + final String? sshDirPath; + + KeyProvider({this.discoverSshKeys = true, this.sshDirPath}) { ready = _load(); } @@ -40,8 +45,10 @@ class KeyProvider extends ChangeNotifier { } Future _discoverSshKeys() async { - final sshDir = Directory(p.join(Platform.environment['HOME'] ?? '', '.ssh')); + final sshDir = Directory( + sshDirPath ?? p.join(Platform.environment['HOME'] ?? '', '.ssh')); if (!sshDir.existsSync()) return; + final dismissed = await _loadDismissed(); final knownPrivate = {'id_ed25519', 'id_rsa', 'id_ecdsa', 'id_dsa'}; for (final name in knownPrivate) { @@ -50,6 +57,8 @@ class KeyProvider extends ChangeNotifier { if (!keyFile.existsSync()) continue; // Skip already registered keys if (_keys.any((k) => k.privateKeyPath == keyFile.path)) continue; + // Skip keys the user removed earlier + if (dismissed.contains(keyFile.path)) continue; final algo = _algorithmFrom(name); final pubKey = pubFile.existsSync() ? pubFile.readAsStringSync().trim() : ''; @@ -78,6 +87,24 @@ class KeyProvider extends ChangeNotifier { /// main.dart — StorageService is not in the provider tree). Future Function(String keyId, String passphrase)? savePassphrase; + /// Deletes a key's stored passphrase (wired to + /// StorageService.deletePassphrase in main.dart / mobile bootstrap). + Future Function(String keyId)? deletePassphrase; + + Future> _loadDismissed() async { + final prefs = await SharedPreferences.getInstance(); + return (prefs.getStringList(_dismissedKey) ?? const []).toSet(); + } + + Future _saveDismissed(Set paths) async { + final prefs = await SharedPreferences.getInstance(); + if (paths.isEmpty) { + await prefs.remove(_dismissedKey); + } else { + await prefs.setStringList(_dismissedKey, paths.toList()); + } + } + Future addKeyFromFile(String path, String label) async { final file = File(path); if (!file.existsSync()) throw Exception('Key file not found: $path'); @@ -93,6 +120,9 @@ class KeyProvider extends ChangeNotifier { privateKeyPath: path, ); _keys.add(entry); + // Explicit re-import clears an earlier dismissal of this path. + final dismissed = await _loadDismissed(); + if (dismissed.remove(path)) await _saveDismissed(dismissed); final certFile = File('$path-cert.pub'); if (certFile.existsSync()) { _keys.last.certificatePath = certFile.path; @@ -103,8 +133,20 @@ class KeyProvider extends ChangeNotifier { } Future deleteKey(String id) async { + final removed = findById(id); _keys.removeWhere((k) => k.id == id); await _save(); + // Remember the path so auto-discovery doesn't re-add it next launch. + final path = removed?.privateKeyPath; + if (path != null && path.isNotEmpty) { + final dismissed = await _loadDismissed(); + if (dismissed.add(path)) await _saveDismissed(dismissed); + } + try { + await deletePassphrase?.call(id); + } catch (e) { + debugPrint('[KeyProvider] failed to delete passphrase for $id: $e'); + } notifyListeners(); } diff --git a/app/lib/services/storage_service.dart b/app/lib/services/storage_service.dart index ed9eb848..f5b68a5c 100644 --- a/app/lib/services/storage_service.dart +++ b/app/lib/services/storage_service.dart @@ -149,6 +149,8 @@ class StorageService { Future loadPassphrase(String keyId) => _loadSecret('pp_$keyId'); + Future deletePassphrase(String keyId) => _deleteSecret('pp_$keyId'); + /// Generic secret store for app-scoped secrets (e.g., sync passphrase). /// Caller is responsible for key namespacing. Future saveGenericSecret(String key, String value) => diff --git a/app/test/providers/key_provider_test.dart b/app/test/providers/key_provider_test.dart index e9487d4c..574aee57 100644 --- a/app/test/providers/key_provider_test.dart +++ b/app/test/providers/key_provider_test.dart @@ -7,6 +7,7 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); setUp(() => SharedPreferences.setMockInitialValues({})); + _keyRemovalTests(); group('KeyProvider certificate methods', () { test('setCertificate persists certificatePath on the key entry', () async { @@ -58,3 +59,72 @@ String _tmpKeyFile() { f.writeAsStringSync('placeholder'); return f.path; } + +void _keyRemovalTests() { + group('KeyProvider removal', () { + late Directory sshDir; + setUp(() { + SharedPreferences.setMockInitialValues({}); + sshDir = Directory.systemTemp.createTempSync('ssh_dir_'); + File('${sshDir.path}/id_ed25519').writeAsStringSync('k'); + File('${sshDir.path}/id_ed25519.pub').writeAsStringSync('pub'); + }); + tearDown(() => sshDir.deleteSync(recursive: true)); + + test('deleteKey deletes the stored passphrase', () async { + final provider = KeyProvider(discoverSshKeys: false); + await provider.ready; + final deleted = []; + provider.deletePassphrase = (id) async => deleted.add(id); + final entry = await provider.addKeyFromFile(_tmpKeyFile(), 'k'); + + await provider.deleteKey(entry.id); + + expect(deleted, [entry.id]); + }); + + test('a failing passphrase delete does not break removal', () async { + final provider = KeyProvider(discoverSshKeys: false); + await provider.ready; + provider.deletePassphrase = (id) async => throw Exception('boom'); + final entry = await provider.addKeyFromFile(_tmpKeyFile(), 'k'); + + await provider.deleteKey(entry.id); + + expect(provider.keys, isEmpty); + }); + + test('removed auto-discovered key is not re-added on next launch', () async { + final first = KeyProvider(sshDirPath: sshDir.path); + await first.ready; + expect(first.keys, hasLength(1)); + await first.deleteKey(first.keys.first.id); + + final second = KeyProvider(sshDirPath: sshDir.path); + await second.ready; + + expect(second.keys, isEmpty); + }); + + test('explicit re-import clears the dismissal', () async { + final first = KeyProvider(sshDirPath: sshDir.path); + await first.ready; + await first.deleteKey(first.keys.first.id); + + final second = KeyProvider(sshDirPath: sshDir.path); + await second.ready; + await second.addKeyFromFile('${sshDir.path}/id_ed25519', 'again'); + expect(second.keys, hasLength(1)); + await second.deleteKey(second.keys.first.id); + + // Re-import then (no) removal: dismissal was cleared, so re-importing + // and relaunching keeps the key. + final third = KeyProvider(sshDirPath: sshDir.path); + await third.ready; + await third.addKeyFromFile('${sshDir.path}/id_ed25519', 'again'); + final fourth = KeyProvider(sshDirPath: sshDir.path); + await fourth.ready; + expect(fourth.keys, hasLength(1)); + }); + }); +} From 0f4db135c65435d480c1c757ce0bfd0bc92c9b12 Mon Sep 17 00:00:00 2001 From: Thang Nguyen Date: Fri, 13 Nov 2026 15:40:53 +0700 Subject: [PATCH 5/5] chore(mobile): drop unused imports after host-form lock switch removal --- app/lib/mobile/screens/mobile_add_host_screen.dart | 1 - app/test/mobile/screens/add_host_screen_test.dart | 1 - 2 files changed, 2 deletions(-) diff --git a/app/lib/mobile/screens/mobile_add_host_screen.dart b/app/lib/mobile/screens/mobile_add_host_screen.dart index 2a377026..6c7917e7 100644 --- a/app/lib/mobile/screens/mobile_add_host_screen.dart +++ b/app/lib/mobile/screens/mobile_add_host_screen.dart @@ -13,7 +13,6 @@ import '../theme/mobile_tokens.dart'; import '../widgets/button_label.dart'; import '../widgets/list_group.dart'; import '../widgets/section_header.dart'; -import '../widgets/settings_row.dart'; /// Grouped add/edit host form for mobile (Design 02). /// diff --git a/app/test/mobile/screens/add_host_screen_test.dart b/app/test/mobile/screens/add_host_screen_test.dart index 09d09530..f93ceeba 100644 --- a/app/test/mobile/screens/add_host_screen_test.dart +++ b/app/test/mobile/screens/add_host_screen_test.dart @@ -4,7 +4,6 @@ import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:yourssh/mobile/screens/mobile_add_host_screen.dart'; -import 'package:yourssh/mobile/security/app_lock_gate.dart'; import 'package:yourssh/mobile/theme/mobile_theme.dart'; import 'package:yourssh/models/app_session.dart'; import 'package:yourssh/theme/app_theme.dart';