Ensure NFC devices are deselected when hidden

Yubico · Feb 7, 2025 · 8f5b68c · 8f5b68c
1 parent d8efd52
commit 8f5b68c
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/lib/app/views/settings_page.dart b/lib/app/views/settings_page.dart
@@ -207,6 +207,7 @@ class _ToggleDevicesDialog extends ConsumerWidget {
         .watch(attachedDevicesProvider)
         .where((e) => e.transport == Transport.nfc);
     if (nfcDevices.isEmpty) {
+      // Pop dialog if no NFC devices
       Navigator.of(context).pop();
     }
     return ResponsiveDialog(
@@ -218,7 +219,7 @@ class _ToggleDevicesDialog extends ConsumerWidget {
           mainAxisSize: MainAxisSize.min,
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
-            Text(l10n.p_toggle_devices_desc),
+            Text(l10n.l_toggle_devices_desc),
             const SizedBox(height: 8.0),
             ...nfcDevices.map(
               (e) => Row(

diff --git a/lib/desktop/state.dart b/lib/desktop/state.dart
@@ -197,9 +197,15 @@ class DesktopCurrentDeviceNotifier extends CurrentDeviceNotifier {
   DeviceNode? build() {
     SharedPreferences prefs = ref.watch(prefProvider);
     final devices = ref.watch(attachedDevicesProvider);
+    final hidden = ref.watch(hiddenDevicesProvider);
     final lastDevice = prefs.getString(_lastDevice) ?? '';
 
-    var node = devices.where((dev) => dev.path.key == lastDevice).firstOrNull;
+    // Ensure hidden devices are deselected
+    var node = devices
+        .where(
+          (dev) => dev.path.key == lastDevice && !hidden.contains(dev.path.key),
+        )
+        .firstOrNull;
     if (node == null) {
       final parts = lastDevice.split('/');
       if (parts.firstOrNull == 'pid') {

diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
@@ -154,7 +154,6 @@
     "s_show_hidden_devices": "Versteckte Geräte anzeigen",
     "s_toggle_devices": null,
     "l_toggle_devices_desc": null,
-    "p_toggle_devices_desc": null,
     "s_sn_serial": "S/N: {serial}",
     "@s_sn_serial": {
         "placeholders": {

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -154,7 +154,6 @@
     "s_show_hidden_devices": "Show hidden devices",
     "s_toggle_devices": "Toggle devices",
     "l_toggle_devices_desc": "Show or hide devices",
-    "p_toggle_devices_desc": "Show or hide devices.",
     "s_sn_serial": "S/N: {serial}",
     "@s_sn_serial": {
         "placeholders": {

diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
@@ -154,7 +154,6 @@
     "s_show_hidden_devices": "Afficher appareils masqués",
     "s_toggle_devices": null,
     "l_toggle_devices_desc": null,
-    "p_toggle_devices_desc": null,
     "s_sn_serial": "N/S\u00a0: {serial}",
     "@s_sn_serial": {
         "placeholders": {

diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
@@ -154,7 +154,6 @@
     "s_show_hidden_devices": "非表示のデバイスを表示",
     "s_toggle_devices": null,
     "l_toggle_devices_desc": null,
-    "p_toggle_devices_desc": null,
     "s_sn_serial": "S/N：{serial}",
     "@s_sn_serial": {
         "placeholders": {

diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
@@ -154,7 +154,6 @@
     "s_show_hidden_devices": "Pokaż ukryte urządzenia",
     "s_toggle_devices": null,
     "l_toggle_devices_desc": null,
-    "p_toggle_devices_desc": null,
     "s_sn_serial": "S/N: {serial}",
     "@s_sn_serial": {
         "placeholders": {

diff --git a/lib/l10n/app_sk.arb b/lib/l10n/app_sk.arb
@@ -154,7 +154,6 @@
     "s_show_hidden_devices": "Zobraziť skryté zariadenia",
     "s_toggle_devices": null,
     "l_toggle_devices_desc": null,
-    "p_toggle_devices_desc": null,
     "s_sn_serial": "S/N: {serial}",
     "@s_sn_serial": {
         "placeholders": {

diff --git a/lib/l10n/app_vi.arb b/lib/l10n/app_vi.arb
@@ -154,7 +154,6 @@
     "s_show_hidden_devices": "Hiển thị các thiết bị ẩn",
     "s_toggle_devices": null,
     "l_toggle_devices_desc": null,
-    "p_toggle_devices_desc": null,
     "s_sn_serial": "S/N: {serial}",
     "@s_sn_serial": {
         "placeholders": {