Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] replace system trash ID with local ID

Priyanshu Dangare2fe60398dd89
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 37cb77c120..e2189f2c4f 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
@@ -1309,16 +1309,16 @@ class _FileSelectionActionsWidgetState
Future<void> _restoreFilesFromSystemTrash(SelectedFiles selectedFiles) async {
final files = selectedFiles.files.map(trashFileToAssetEntity).toList();
- final restoredIDs = <int>{};
+ final restoredIDs = <String>{};
try {
for (final batch in files.chunks(batchSize)) {
final result = await PhotoManager.editor.android.restoreFromTrash(batch);
- restoredIDs.addAll(result.map(int.parse));
+ restoredIDs.addAll(result);
}
} finally {
if (restoredIDs.isNotEmpty) {
final restoredFiles = selectedFiles.files.where(
- (f) => restoredIDs.contains(f.asTrashFile!.systemTrashID!),
+ (f) => restoredIDs.contains(f.localID),
);
selectedFiles.unSelectAll(restoredFiles.toSet());
Bus.instance.fire(ForceReloadTrashPageEvent());
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart b/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart
index 6263d60715..cae2e89dec 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart
@@ -173,7 +173,6 @@ class _TrashPageState extends State<_TrashPage> {
updateAt: trash.deleteBy - const Duration(days: 30).inMicroseconds,
deleteBy: trash.deleteBy,
isSystemOnly: true,
- systemTrashID: trash.localID,
),
);
}
diff --git a/mobile/apps/photos/lib/utils/delete_file_util.dart b/mobile/apps/photos/lib/utils/delete_file_util.dart
index a91b4d7ccf..2b4298e8ce 100644
--- a/mobile/apps/photos/lib/utils/delete_file_util.dart
+++ b/mobile/apps/photos/lib/utils/delete_file_util.dart
@@ -17,7 +17,6 @@ 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";
@@ -1390,18 +1389,18 @@ Future<void> permanentlyDeleteFromSystemTrash(
Future<void> _deleteFromSystemTrash(SelectedFiles selectedFiles) async {
final fileIDs = selectedFiles.files
- .map((f) => f.asTrashFile!.systemTrashID!.toString())
+ .map((f) => f.localID!)
.toList();
- final deletedIDs = <int>{};
+ final deletedIDs = <String>{};
try {
for (final batch in fileIDs.chunks(batchSize)) {
final result = await PhotoManager.editor.deleteWithIds(batch);
- deletedIDs.addAll(result.map(int.parse));
+ deletedIDs.addAll(result);
}
} finally {
if (deletedIDs.isNotEmpty) {
final deletedFiles = selectedFiles.files.where(
- (f) => deletedIDs.contains(f.asTrashFile!.systemTrashID!),
+ (f) => deletedIDs.contains(f.localID),
);
selectedFiles.unSelectAll(deletedFiles.toSet());
Bus.instance.fire(ForceReloadTrashPageEvent());