Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mobile][photos] implement permanently delete from system trash

Priyanshu Dangarebebab88884f4
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.dart
index 8e12fa7a8f..8a70643d1b 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
@@ -179,7 +179,7 @@ class _FileSelectionActionsWidgetState
SelectionActionButton(
hugeIcon: HugeIcons.strokeRoundedDelete01,
labelText: context.strings.permanentlyDelete,
- onTap: _permanentlyDelete,
+ onTap: _permanentlyDeleteFromTrash,
isCritical: true,
),
);
@@ -488,6 +488,27 @@ class _FileSelectionActionsWidgetState
);
}
+ if (widget.type.showRestoreOption()) {
+ items.add(
+ SelectionActionButton(
+ hugeIcon: HugeIcons.strokeRoundedRestoreBin,
+ labelText: context.strings.restore,
+ onTap: _restore,
+ ),
+ );
+ }
+
+ if (widget.type.showPermanentlyDeleteOption()) {
+ items.add(
+ SelectionActionButton(
+ hugeIcon: HugeIcons.strokeRoundedDelete01,
+ labelText: context.strings.permanentlyDelete,
+ onTap: _permanentlyDeleteFromTrash,
+ isCritical: true,
+ ),
+ );
+ }
+
if (widget.type.showBulkEditTime()) {
items.add(
SelectionActionButton(
@@ -1087,8 +1108,18 @@ class _FileSelectionActionsWidgetState
);
}
- Future<void> _permanentlyDelete() async {
- if (await deleteFromTrash(context, widget.selectedFiles.files.toList())) {
+ Future<void> _permanentlyDeleteFromTrash() async {
+ final isSystemOnly = widget.selectedFiles.files.every(
+ (f) => f.asTrashFile!.isSystemOnly,
+ );
+ if (isSystemOnly) {
+ await _deleteFromSystemTrash(widget.selectedFiles);
+ return;
+ }
+ if (await deleteFromEnteTrash(
+ context,
+ widget.selectedFiles.files.toList(),
+ )) {
widget.selectedFiles.clearAll();
}
}
@@ -1287,3 +1318,18 @@ Future<void> _restoreFilesFromSystemTrash(SelectedFiles selectedFiles) async {
selectedFiles.unSelectAll(restoredFiles.toSet());
Bus.instance.fire(ForceReloadTrashPageEvent());
}
+
+Future<void> _deleteFromSystemTrash(SelectedFiles selectedFiles) async {
+ final fileIDs = selectedFiles.files
+ .map((f) => f.asTrashFile!.systemTrashID!.toString())
+ .toList();
+ final deletedIDs = (await PhotoManager.editor.deleteWithIds(
+ fileIDs,
+ )).map(int.parse);
+ if (deletedIDs.isEmpty) return;
+ 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.dart
index d55ebd2854..9a6997883e 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
@@ -273,11 +273,15 @@ class FileBottomBarState extends State<FileBottomBar> {
color: Colors.white,
),
onPressed: () async {
- final trashedFile = <EnteTrashFile>[];
- trashedFile.add(widget.file.asEnteTrashFile!);
- if (await deleteFromTrash(context, trashedFile) == true) {
- if (!mounted) return;
- Navigator.pop(context);
+ if (widget.file.isDeviceTrash) {
+ await _permanentlyDeleteFromSystemTrash();
+ return;
+ }
+ if (await deleteFromEnteTrash(context, [
+ widget.file.asEnteTrashFile!,
+ ]) ==
+ true) {
+ widget.onFileRemoved(widget.file);
}
},
),
@@ -328,4 +332,12 @@ 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/test/utils/delete_file_util_test.dart b/mobile/apps/photos/test/utils/delete_file_util_test.dart
index 904976846d..3b9aad2fe9 100644
--- a/mobile/apps/photos/test/utils/delete_file_util_test.dart
+++ b/mobile/apps/photos/test/utils/delete_file_util_test.dart
@@ -53,7 +53,7 @@ void main() {
await tester.pumpWidget(
_TestApp(
onOpen: (context) async {
- result = await deleteFromTrash(context, [file]);
+ result = await deleteFromEnteTrash(context, [file]);
},
),
);