Make management lock codes nullable

Yubico · Jan 8, 2025 · 30e3ff3 · 30e3ff3
1 parent 6f920d2
commit 30e3ff3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/lib/android/management/state.dart b/lib/android/management/state.dart
@@ -48,8 +48,8 @@ class _AndroidManagementStateNotifier extends ManagementStateNotifier {
 
   @override
   Future<void> writeConfig(DeviceConfig config,
-      {String currentLockCode = '',
-      String newLockCode = '',
+      {String? currentLockCode,
+      String? newLockCode,
       bool reboot = false}) async {
     if (reboot) {
       state = const AsyncValue.loading();

diff --git a/lib/desktop/management/state.dart b/lib/desktop/management/state.dart
@@ -97,8 +97,8 @@ class _DesktopManagementStateNotifier extends ManagementStateNotifier {
 
   @override
   Future<void> writeConfig(DeviceConfig config,
-      {String currentLockCode = '',
-      String newLockCode = '',
+      {String? currentLockCode,
+      String? newLockCode,
       bool reboot = false}) async {
     await _session.command('configure', target: _subpath, params: {
       ...config.toJson(),

diff --git a/lib/management/state.dart b/lib/management/state.dart
@@ -28,9 +28,7 @@ final managementStateProvider = AsyncNotifierProvider.autoDispose
 abstract class ManagementStateNotifier
     extends ApplicationStateNotifier<DeviceInfo> {
   Future<void> writeConfig(DeviceConfig config,
-      {String currentLockCode = '',
-      String newLockCode = '',
-      bool reboot = false});
+      {String? currentLockCode, String? newLockCode, bool reboot = false});
 
   Future<void> setMode({
     required int interfaces,

diff --git a/lib/management/views/management_screen.dart b/lib/management/views/management_screen.dart
@@ -308,7 +308,7 @@ class _ManagementScreenState extends ConsumerState<ManagementScreen> {
               widget.deviceData.info.config
                   .copyWith(enabledCapabilities: _enabled),
               reboot: reboot,
-              currentLockCode: _lockCodeController.text);
+              currentLockCode: isLocked ? _lockCodeController.text : null);
       if (!mounted) return;
       Navigator.pop(context);
       showMessage(context, l10n.s_config_updated);