Merge remote-tracking branch 'origin/develop' into develop

deckerst · Oct 30, 2024 · ac1af6e · ac1af6e
2 parents 41d7e97 + c9663fe
commit ac1af6e
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 deletions.
diff --git a/lib/widgets/collection/entry_set_action_delegate.dart b/lib/widgets/collection/entry_set_action_delegate.dart
@@ -310,7 +310,9 @@ class EntrySetActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAware
       type: ConfirmationDialog.deleteForever,
       message: l10n.deleteEntriesConfirmationDialogMessage(todoCount),
       confirmationButtonLabel: l10n.deleteButtonLabel,
-    )) return;
+    )) {
+      return;
+    }
 
     if (!await checkStoragePermissionForAlbums(context, storageDirs, entries: entries)) return;
 

diff --git a/lib/widgets/common/action_mixins/entry_storage.dart b/lib/widgets/common/action_mixins/entry_storage.dart
@@ -327,7 +327,9 @@ mixin EntryStorageMixin on FeedbackMixin, PermissionAwareMixin, SizeAwareMixin {
         type: ConfirmationDialog.moveToBin,
         message: l10n.binEntriesConfirmationDialogMessage(entries.length),
         confirmationButtonLabel: l10n.deleteButtonLabel,
-      )) return;
+      )) {
+        return;
+      }
     }
 
     final entriesByDestination = <String, Set<AvesEntry>>{};

diff --git a/lib/widgets/dialogs/filter_editors/edit_vault_dialog.dart b/lib/widgets/dialogs/filter_editors/edit_vault_dialog.dart
@@ -134,7 +134,9 @@ class _EditVaultDialogState extends State<EditVaultDialog> with FeedbackMixin, V
                       context: context,
                       message: l10n.settingsDisablingBinWarningDialogMessage,
                       confirmationButtonLabel: l10n.applyButtonLabel,
-                    )) return;
+                    )) {
+                      return;
+                    }
                   }
                 }
               }

diff --git a/lib/widgets/dialogs/pick_dialogs/album_pick_page.dart b/lib/widgets/dialogs/pick_dialogs/album_pick_page.dart
@@ -263,7 +263,9 @@ class _AlbumPickPageState extends State<_AlbumPickPage> {
       type: ConfirmationDialog.createVault,
       message: l10n.newVaultWarningDialogMessage,
       confirmationButtonLabel: l10n.continueButtonLabel,
-    )) return;
+    )) {
+      return;
+    }
 
     final details = await showDialog<VaultDetails>(
       context: context,

diff --git a/lib/widgets/filter_grids/common/action_delegates/album_set.dart b/lib/widgets/filter_grids/common/action_delegates/album_set.dart
@@ -206,7 +206,9 @@ class AlbumChipSetActionDelegate extends ChipSetActionDelegate<AlbumFilter> with
         type: ConfirmationDialog.createVault,
         message: l10n.newVaultWarningDialogMessage,
         confirmationButtonLabel: l10n.continueButtonLabel,
-      )) return;
+      )) {
+        return;
+      }
 
       final details = await showDialog<VaultDetails>(
         context: context,

diff --git a/lib/widgets/settings/privacy/privacy.dart b/lib/widgets/settings/privacy/privacy.dart
@@ -123,7 +123,9 @@ class SettingsTilePrivacyEnableBin extends SettingsTile {
           context: context,
           message: l10n.settingsDisablingBinWarningDialogMessage,
           confirmationButtonLabel: l10n.applyButtonLabel,
-        )) return false;
+        )) {
+          return false;
+        }
 
         // delete forever trashed items
         await EntrySetActionDelegate().doDelete(

diff --git a/lib/widgets/viewer/action/entry_action_delegate.dart b/lib/widgets/viewer/action/entry_action_delegate.dart
@@ -434,7 +434,9 @@ class EntryActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAwareMix
       type: ConfirmationDialog.deleteForever,
       message: l10n.deleteEntriesConfirmationDialogMessage(1),
       confirmationButtonLabel: l10n.deleteButtonLabel,
-    )) return;
+    )) {
+      return;
+    }
 
     if (!await checkStoragePermission(context, {targetEntry})) return;