π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] Fix device trash deletion feedback
Priyanshu Dangare351e1afb995f
diff --git a/mobile/apps/photos/lib/utils/delete_file_util.dart b/mobile/apps/photos/lib/utils/delete_file_util.dartindex c416f9d141..9913ead3d5 100644--- a/mobile/apps/photos/lib/utils/delete_file_util.dart+++ b/mobile/apps/photos/lib/utils/delete_file_util.dart@@ -1361,33 +1361,31 @@ Future<void> permanentlyDeleteFromDeviceTrash() async {if (!await PhotoManager.canManageMedia()) {try {- await _deleteFromDeviceTrash(selectedFiles);+ final didDelete = await _deleteFromDeviceTrash(selectedFiles);+ if (didDelete && context.mounted) {+ await showMediaManagementHintSheet(context);+ }+ return;} catch (e) {if (context.mounted) {await showGenericErrorDialog(context: context, error: e);}- }- } else {- if (!context.mounted) return;- final actionResult = await showBottomSheetComponent<ButtonResult>(- context: context,- builder: (_) => PermanentlyDeleteConfirmationSheet(- onDelete: () => _deleteFromDeviceTrash(selectedFiles),- ),- );- if (actionResult?.action == ButtonAction.error && context.mounted) {- await showGenericErrorDialog(- context: context,- error: actionResult!.exception,- );+ return;}}- if (context.mounted) {- await showMediaManagementHintSheet(context);+ if (!context.mounted) return;+ final result = await showBottomSheetComponent<ButtonResult>(+ context: context,+ builder: (_) => PermanentlyDeleteConfirmationSheet(+ onDelete: () => _deleteFromDeviceTrash(selectedFiles),+ ),+ );+ if (result?.action == ButtonAction.error && context.mounted) {+ await showGenericErrorDialog(context: context, error: result!.exception);}}-Future<void> _deleteFromDeviceTrash(SelectedFiles selectedFiles) async {+Future<bool> _deleteFromDeviceTrash(SelectedFiles selectedFiles) async {final fileIDs = selectedFiles.files.map((f) => f.localID!).toList();final deletedIDs = <String>{};try {@@ -1395,6 +1393,10 @@ Future<void> _deleteFromDeviceTrash(SelectedFiles selectedFiles) async {final result = await PhotoManager.editor.deleteWithIds(batch);deletedIDs.addAll(result);}+ return deletedIDs.isNotEmpty;+ } catch (e, s) {+ _logger.severe("failed to delete from device trash:", e, s);+ rethrow;} finally {if (deletedIDs.isNotEmpty) {final deletedFiles = selectedFiles.files.where(