Merge PR #1689

Yubico · Sep 13, 2024 · aa485d4 · aa485d4
2 parents 3099cfc + 8d9e9e2
commit aa485d4
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/lib/app/views/reset_dialog.dart b/lib/app/views/reset_dialog.dart
@@ -123,6 +123,12 @@ class _ResetDialogState extends ConsumerState<ResetDialog> {
         _application == Capability.fido2 &&
         !ref.watch(rpcStateProvider.select((state) => state.isAdmin));
 
+    // show the progress widgets on desktop, or on Android when using USB
+    final showResetProgress = _resetting &&
+        (!Platform.isAndroid ||
+            ref.read(currentDeviceProvider)?.transport == Transport.usb ||
+            _currentStep == _totalSteps);
+
     return ResponsiveDialog(
       title: Text(l10n.s_factory_reset),
       key: factoryResetCancel,
@@ -322,7 +328,7 @@ class _ResetDialogState extends ConsumerState<ResetDialog> {
                 },
               ),
             ],
-            if (_resetting)
+            if (showResetProgress)
               if (_application == Capability.fido2 && _currentStep >= 0) ...[
                 Text('${l10n.s_status}: ${_getMessage()}'),
                 LinearProgressIndicator(value: progress),