Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] fix shared media delete copy

Priyanshu Dangarec1c3f72b0077
diff --git a/mobile/apps/photos/lib/ui/actions/file/file_actions.dart b/mobile/apps/photos/lib/ui/actions/file/file_actions.dart
index 9cb85a0b98..56fc5f12a8 100644
--- a/mobile/apps/photos/lib/ui/actions/file/file_actions.dart
+++ b/mobile/apps/photos/lib/ui/actions/file/file_actions.dart
@@ -37,6 +37,7 @@ Future<void> showSingleFileDeleteSheet(
if (!context.mounted) return;
await showDeleteConfirmationSheet(
context,
+ files: [file],
count: 1,
isLocal: isLocal,
isRemote: false,
@@ -70,6 +71,7 @@ Future<void> showSingleFileDeleteSheet(
}
final didDelete = await showDeleteConfirmationSheet(
context,
+ files: [file],
isLocal: isLocal,
isRemote: isRemote,
count: 1,
diff --git a/mobile/apps/photos/lib/utils/delete_file_util.dart b/mobile/apps/photos/lib/utils/delete_file_util.dart
index 750744e03b..58ed33ebf3 100644
--- a/mobile/apps/photos/lib/utils/delete_file_util.dart
+++ b/mobile/apps/photos/lib/utils/delete_file_util.dart
@@ -926,6 +926,7 @@ Future<void> showDeleteSheet(
didDelete =
await showDeleteConfirmationSheet(
context,
+ files: localGalleryDeletableFiles,
count: localGalleryDeletableFiles.length,
isLocal: true,
isRemote: false,
@@ -971,6 +972,7 @@ Future<void> showDeleteSheet(
var didDeleteLocalFiles = false;
final actionResult = await showDeleteConfirmationSheet(
context,
+ files: deletableFiles,
isLocal: hasLocalFiles,
isRemote: hasRemoteFiles,
count: deletableFiles.length,
@@ -1107,6 +1109,7 @@ class _MoreOptionsButtonState extends State<_MoreOptionsButton> {
Future<bool?> showDeleteConfirmationSheet(
BuildContext context, {
+ required List<EnteFile> files,
required bool isLocal,
required bool isRemote,
required int count,
@@ -1115,10 +1118,11 @@ Future<bool?> showDeleteConfirmationSheet(
required Future<bool> Function() onDeleteFromBoth,
}) async {
final isTrashAction =
- Platform.isIOS ||
- (Platform.isAndroid &&
- flagService.internalUser &&
- !await isAndroidSDKVersionLowerThan(android11SDKINT));
+ files.every((file) => !file.isSharedMediaToAppSandbox) &&
+ (Platform.isIOS ||
+ (Platform.isAndroid &&
+ flagService.internalUser &&
+ !await isAndroidSDKVersionLowerThan(android11SDKINT)));
if (!context.mounted) return null;
return showBottomSheetComponent<bool>(
context: context,