Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] display toast message after restoring from device trash

Priyanshu Dangareebc3bfc84ede
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 e8b1fefcfe..46d61a5a3c 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
@@ -1,5 +1,6 @@
import "dart:async";
import "dart:io";
+
import "package:ente_icons/ente_icons.dart";
import "package:ente_pure_utils/ente_pure_utils.dart";
import "package:ente_strings/ente_strings.dart";
@@ -1096,10 +1097,18 @@ class _FileSelectionActionsWidgetState
(f) => f.isDeviceTrash,
);
if (isDeviceOnly) {
- _restoreFilesFromDeviceTrash(widget.selectedFiles).onError((e, s) {
- if (!mounted) return;
- showGenericErrorDialog(context: context, error: e).ignore();
- });
+ _restoreFilesFromDeviceTrash(widget.selectedFiles)
+ .then((restoredCount) {
+ if (restoredCount == 0 || !mounted) return;
+ showToast(
+ context,
+ context.strings.restoredItems(count: restoredCount),
+ );
+ })
+ .onError((e, s) {
+ if (!mounted) return;
+ showGenericErrorDialog(context: context, error: e).ignore();
+ });
return;
}
showCollectionActionSheet(
@@ -1314,7 +1323,7 @@ class _FileSelectionActionsWidgetState
}
}
- Future<void> _restoreFilesFromDeviceTrash(SelectedFiles selectedFiles) async {
+ Future<int> _restoreFilesFromDeviceTrash(SelectedFiles selectedFiles) async {
final files = selectedFiles.files
.map((f) => f.asDeviceTrashFile!.toAssetEntity())
.toList();
@@ -1326,6 +1335,7 @@ class _FileSelectionActionsWidgetState
);
restoredIDs.addAll(result);
}
+ return restoredIDs.length;
} catch (e, s) {
_logger.warning("_restoreFilesFromDeviceTrash failed:", e, s);
rethrow;
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 42fbfbefa7..43e7d09f08 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
@@ -2,6 +2,7 @@ import "dart:async";
import "dart:io";
import "package:ente_strings/ente_strings.dart";
+import "package:ente_ui/utils/toast_util.dart";
import "package:flutter/cupertino.dart";
import "package:flutter/material.dart";
import "package:flutter_svg/flutter_svg.dart";
@@ -242,10 +243,21 @@ class FileBottomBarState extends State<FileBottomBar> {
icon: const Icon(CupertinoIcons.gobackward, color: Colors.white),
onPressed: () {
if (widget.file.isDeviceTrash) {
- _restoreFromDeviceTrash().onError((e, s) {
- if (!mounted) return;
- showGenericErrorDialog(context: context, error: e).ignore();
- });
+ _restoreFromDeviceTrash()
+ .then((didRestore) {
+ if (!didRestore || !mounted) return;
+ showToast(
+ context,
+ context.strings.restoredItems(count: 1),
+ );
+ })
+ .onError((e, s) {
+ if (!mounted) return;
+ showGenericErrorDialog(
+ context: context,
+ error: e,
+ ).ignore();
+ });
return;
}
final selectedFiles = SelectedFiles();
@@ -328,12 +340,13 @@ class FileBottomBarState extends State<FileBottomBar> {
);
}
- Future<void> _restoreFromDeviceTrash() async {
+ Future<bool> _restoreFromDeviceTrash() async {
final restoredIDs = await PhotoManager.editor.android.restoreFromTrash([
widget.file.asDeviceTrashFile!.toAssetEntity(),
]);
- if (restoredIDs.isEmpty) return;
+ if (restoredIDs.isEmpty) return false;
Bus.instance.fire(ForceReloadTrashPageEvent());
await widget.onFileRemoved(widget.file);
+ return true;
}
}
diff --git a/mobile/packages/strings/lib/l10n/arb/strings_en.arb b/mobile/packages/strings/lib/l10n/arb/strings_en.arb
index 6b4f2cc50d..a470ec2735 100644
--- a/mobile/packages/strings/lib/l10n/arb/strings_en.arb
+++ b/mobile/packages/strings/lib/l10n/arb/strings_en.arb
@@ -3393,6 +3393,16 @@
"description": "Display text for an action which triggers a restore of item from trash",
"type": "text"
},
+ "restoredItems": "{count, plural, one{Restored item} other{Restored {count} items}}",
+ "@restoredItems": {
+ "description": "Success message after restoring items",
+ "placeholders": {
+ "count": {
+ "type": "int",
+ "example": "3"
+ }
+ }
+ },
"restoreToAlbum": "Restore to album",
"restoringFiles": "Restoring files...",
"restoringItems": "Restoring...",