π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] Confirm permanent trash deletion
Priyanshu Dangare1da52f297ff7
diff --git a/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dart b/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dartindex 138f8af2c9..37cb77c120 100644--- a/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dart@@ -1114,7 +1114,7 @@ class _FileSelectionActionsWidgetState(f) => f.asTrashFile!.isSystemOnly,);if (isSystemOnly) {- await _deleteFromSystemTrash(widget.selectedFiles);+ await permanentlyDeleteFromSystemTrash(context, widget.selectedFiles);return;}if (await deleteFromEnteTrash(@@ -1325,24 +1325,3 @@ Future<void> _restoreFilesFromSystemTrash(SelectedFiles selectedFiles) async {}}}--Future<void> _deleteFromSystemTrash(SelectedFiles selectedFiles) async {- final fileIDs = selectedFiles.files- .map((f) => f.asTrashFile!.systemTrashID!.toString())- .toList();- final deletedIDs = <int>{};- try {- for (final batch in fileIDs.chunks(batchSize)) {- final result = await PhotoManager.editor.deleteWithIds(batch);- deletedIDs.addAll(result.map(int.parse));- }- } finally {- if (deletedIDs.isNotEmpty) {- final deletedFiles = selectedFiles.files.where(- (f) => deletedIDs.contains(f.asTrashFile!.systemTrashID!),- );- selectedFiles.unSelectAll(deletedFiles.toSet());- Bus.instance.fire(ForceReloadTrashPageEvent());- }- }-}diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dart b/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dartindex 9a6997883e..e12c808402 100644--- a/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dart@@ -274,7 +274,12 @@ class FileBottomBarState extends State<FileBottomBar> {),onPressed: () async {if (widget.file.isDeviceTrash) {- await _permanentlyDeleteFromSystemTrash();+ final selectedFiles = SelectedFiles()+ ..toggleSelection(widget.file);+ await permanentlyDeleteFromSystemTrash(context, selectedFiles);+ if (selectedFiles.files.isEmpty) {+ await widget.onFileRemoved(widget.file);+ }return;}if (await deleteFromEnteTrash(context, [@@ -332,12 +337,4 @@ class FileBottomBarState extends State<FileBottomBar> {Bus.instance.fire(ForceReloadTrashPageEvent());await widget.onFileRemoved(widget.file);}-- Future<void> _permanentlyDeleteFromSystemTrash() async {- final id = widget.file.asTrashFile!.systemTrashID!.toString();- final deletedIDs = await PhotoManager.editor.deleteWithIds([id]);- if (deletedIDs.isEmpty) return;- await widget.onFileRemoved(widget.file);- Bus.instance.fire(ForceReloadTrashPageEvent());- }}diff --git a/mobile/apps/photos/lib/utils/delete_file_util.dart b/mobile/apps/photos/lib/utils/delete_file_util.dartindex 3b56db1d8a..77920ce5c4 100644--- a/mobile/apps/photos/lib/utils/delete_file_util.dart+++ b/mobile/apps/photos/lib/utils/delete_file_util.dart@@ -3,6 +3,7 @@ import 'dart:io';import 'dart:math';import 'package:ente_components/ente_components.dart';+import "package:ente_pure_utils/ente_pure_utils.dart";import "package:ente_strings/ente_strings.dart";import 'package:flutter/material.dart';import 'package:logging/logging.dart';@@ -16,6 +17,7 @@ import "package:photos/events/force_reload_trash_page_event.dart";import 'package:photos/events/local_photos_updated_event.dart';import 'package:photos/gateways/trash/models/trash_item_request.dart';import "package:photos/models/button_result.dart";+import "package:photos/models/file/extensions/file_props.dart";import 'package:photos/models/file/file.dart';import "package:photos/models/file/trash_file.dart";import "package:photos/models/files_split.dart";@@ -294,41 +296,28 @@ Future<List<EnteFile>> deleteFilesOnDeviceOnly(Future<bool> deleteFromTrash(BuildContext context, List<EnteFile> files) async {final trashFiles = files.map((file) => file as EnteTrashFile).toList();bool didDeletionStart = false;- final l10n = context.strings;final actionResult = await showBottomSheetComponent<ButtonResult>(context: context,useRootNavigator: Platform.isIOS,- builder: (sheetContext) => BottomSheetComponent(- title: l10n.areYouSure,- message: l10n.selectedItemsWillBePermanentlyDeletedAndCannotBeRecovered,- illustration: Image.asset("assets/warning-grey.png"),- closeTooltip: l10n.close,- closeResult: ButtonResult(ButtonAction.fourth),- actions: [- ButtonComponent(- label: l10n.yesDelete,- variant: ButtonComponentVariant.critical,- onTap: () =>- _runDeleteAction(sheetContext, ButtonAction.first, () async {- try {- didDeletionStart = true;- await trashSyncService.deleteFromTrash(trashFiles);- Bus.instance.fire(- FilesUpdatedEvent(- trashFiles,- type: EventType.deletedFromEverywhere,- source: "deleteFromTrash",- ),- );- // FilesUpdatedEvent does not reload Trash here.- Bus.instance.fire(ForceReloadTrashPageEvent());- } catch (e, s) {- _logger.info("failed to delete from trash", e, s);- rethrow;- }- }),- ),- ],+ builder: (_) => PermanentlyDeleteConfirmationSheet(+ onDelete: () async {+ try {+ didDeletionStart = true;+ await trashSyncService.deleteFromTrash(trashFiles);+ Bus.instance.fire(+ FilesUpdatedEvent(+ trashFiles,+ type: EventType.deletedFromEverywhere,+ source: "deleteFromTrash",+ ),+ );+ // FilesUpdatedEvent does not reload Trash here.+ Bus.instance.fire(ForceReloadTrashPageEvent());+ } catch (e, s) {+ _logger.info("failed to delete from trash", e, s);+ rethrow;+ }+ },),);@@ -1051,6 +1040,31 @@ Exception _toException(Object error) {return error is Exception ? error : Exception(error.toString());}+class PermanentlyDeleteConfirmationSheet extends StatelessWidget {+ const PermanentlyDeleteConfirmationSheet({required this.onDelete, super.key});++ final Future<void> Function() onDelete;++ @override+ Widget build(BuildContext context) {+ final l10n = context.strings;+ return BottomSheetComponent(+ title: l10n.areYouSure,+ message: l10n.selectedItemsWillBePermanentlyDeletedAndCannotBeRecovered,+ illustration: Image.asset("assets/warning-grey.png"),+ closeTooltip: l10n.close,+ closeResult: ButtonResult(ButtonAction.fourth),+ actions: [+ ButtonComponent(+ label: l10n.yesDelete,+ variant: ButtonComponentVariant.critical,+ onTap: () => _runDeleteAction(context, ButtonAction.first, onDelete),+ ),+ ],+ );+ }+}+class _MoreOptionsButton extends StatefulWidget {const _MoreOptionsButton({required this.onTap});@@ -1319,3 +1333,56 @@ class DeleteConfirmationSheetState extends State<DeleteConfirmationSheet> {);}}++Future<void> permanentlyDeleteFromSystemTrash(+ BuildContext context,+ SelectedFiles selectedFiles,+) async {+ if (!await PhotoManager.canManageMedia()) {+ try {+ await _deleteFromSystemTrash(selectedFiles);+ } 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: () => _deleteFromSystemTrash(selectedFiles),+ ),+ );+ if (actionResult?.action == ButtonAction.error && context.mounted) {+ await showGenericErrorDialog(+ context: context,+ error: actionResult!.exception,+ );+ }+ }+ if (context.mounted) {+ await showMediaManagementHintSheet(context);+ }+}++Future<void> _deleteFromSystemTrash(SelectedFiles selectedFiles) async {+ final fileIDs = selectedFiles.files+ .map((f) => f.asTrashFile!.systemTrashID!.toString())+ .toList();+ final deletedIDs = <int>{};+ try {+ for (final batch in fileIDs.chunks(batchSize)) {+ final result = await PhotoManager.editor.deleteWithIds(batch);+ deletedIDs.addAll(result.map(int.parse));+ }+ } finally {+ if (deletedIDs.isNotEmpty) {+ final deletedFiles = selectedFiles.files.where(+ (f) => deletedIDs.contains(f.asTrashFile!.systemTrashID!),+ );+ selectedFiles.unSelectAll(deletedFiles.toSet());+ Bus.instance.fire(ForceReloadTrashPageEvent());+ }+ }+}