Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] Update empty trash confirmation

Priyanshu Dangarea808192e5067
diff --git a/mobile/apps/photos/lib/services/sync/trash_sync_service.dart b/mobile/apps/photos/lib/services/sync/trash_sync_service.dart
index 76f14c1c60..58b30b7027 100644
--- a/mobile/apps/photos/lib/services/sync/trash_sync_service.dart
+++ b/mobile/apps/photos/lib/services/sync/trash_sync_service.dart
@@ -260,16 +260,11 @@ class TrashSyncService {
}
Future<void> emptyTrash() async {
- try {
- await _gateway.emptyTrash(_getSyncTime());
- await _trashDB.clearTable();
- unawaited(syncTrash());
- Bus.instance.fire(TrashUpdatedEvent());
- Bus.instance.fire(ForceReloadTrashPageEvent());
- } catch (e, s) {
- _logger.severe("failed to empty trash", e, s);
- rethrow;
- }
+ await _gateway.emptyTrash(_getSyncTime());
+ await _trashDB.clearTable();
+ unawaited(syncTrash());
+ Bus.instance.fire(TrashUpdatedEvent());
+ 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 4e82176009..6b6b8169f6 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart
@@ -153,9 +153,10 @@ class _TrashPageState extends State<_TrashPage> {
child: FABComponent(
label: l10n.deleteAll,
icon: const HugeIcon(icon: HugeIcons.strokeRoundedDelete02),
- onTap: () async {
- await emptyTrash(context, _isOnEnteTrash);
- },
+ onTap: () => showConfirmDeleteAllTrashSheet(
+ context,
+ _isOnEnteTrash,
+ ),
),
);
},
diff --git a/mobile/apps/photos/lib/utils/delete_file_util.dart b/mobile/apps/photos/lib/utils/delete_file_util.dart
index 7a05e16cc8..79db6c225b 100644
--- a/mobile/apps/photos/lib/utils/delete_file_util.dart
+++ b/mobile/apps/photos/lib/utils/delete_file_util.dart
@@ -339,38 +339,49 @@ Future<bool> deleteFromEnteTrash(
}
}
-Future<bool> emptyTrash(BuildContext context, bool isOnEnteTrash) async {
- final actionResult = await showChoiceActionSheet(
- context,
- title: context.strings.emptyTrashQuestion,
- body: context.strings.permDeleteWarning,
- firstButtonLabel: context.strings.empty,
- isCritical: true,
- firstButtonOnTap: () async {
- try {
- if (isOnEnteTrash) {
- await trashSyncService.emptyTrash();
- } else {
- await _emptyDeviceTrash(context);
- }
- } catch (e, s) {
- _logger.info("failed empty trash", e, s);
- rethrow;
+Future<void> showConfirmDeleteAllTrashSheet(
+ BuildContext context,
+ bool isOnEnteTrash,
+) async {
+ var didDeleteDeviceTrash = false;
+
+ Future<void> emptyTrash() async {
+ try {
+ if (isOnEnteTrash) {
+ await trashSyncService.emptyTrash();
+ } else {
+ didDeleteDeviceTrash = await _emptyDeviceTrash();
}
- },
+ } catch (e, s) {
+ final trashKind = isOnEnteTrash ? "Ente" : "device";
+ _logger.severe("failed to empty $trashKind trash", e, s);
+ if (context.mounted) {
+ await showGenericErrorDialog(context: context, error: e);
+ }
+ rethrow;
+ }
+ }
+
+ await showBottomSheetComponent<void>(
+ context: context,
+ useRootNavigator: Platform.isIOS,
+ builder: (sheetContext) => BottomSheetComponent(
+ title: sheetContext.strings.emptyTrashQuestion,
+ message: sheetContext.strings.permDeleteWarning,
+ closeTooltip: sheetContext.strings.close,
+ actions: [
+ ButtonComponent(
+ label: sheetContext.strings.empty,
+ variant: ButtonComponentVariant.critical,
+ dismissModalOnSuccess: true,
+ onTap: emptyTrash,
+ ),
+ ],
+ ),
);
- if (actionResult?.action == null ||
- actionResult!.action == ButtonAction.cancel) {
- return false;
- } else if (actionResult.action == ButtonAction.error) {
- if (!context.mounted) return false;
- await showGenericErrorDialog(
- context: context,
- error: actionResult.exception,
- );
- return false;
- } else {
- return true;
+
+ if (didDeleteDeviceTrash && context.mounted) {
+ await showMediaManagementHintSheet(context);
}
}
@@ -1421,7 +1432,7 @@ Future<(Set<String>, Object?)> _deleteFromDeviceTrash(
}
}
-Future<void> _emptyDeviceTrash(BuildContext context) async {
+Future<bool> _emptyDeviceTrash() async {
final trash = (await NativeService.getTrash())
.map((f) => f.localID.toString())
.toList();
@@ -1432,6 +1443,7 @@ Future<void> _emptyDeviceTrash(BuildContext context) async {
deletedIDs.addAll(result);
if (result.length != batch.length) break;
}
+ return deletedIDs.isNotEmpty;
} finally {
if (deletedIDs.isNotEmpty) {
Bus.instance.fire(ForceReloadTrashPageEvent());