High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
feat: delete actions (#20034)
Alexaa344a398984
diff --git a/i18n/en.json b/i18n/en.jsonindex ddcb01bf94..bbd6debd5e 100644--- a/i18n/en.json+++ b/i18n/en.json@@ -1575,6 +1575,7 @@"resolved_all_duplicates": "Resolved all duplicates","restore": "Restore","restore_all": "Restore all",+ "restore_trash_action_prompt": "{count} restored from trash","restore_user": "Restore user","restored_asset": "Restored asset","resume": "Resume",diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dartindex 865c35be54..2c5006953f 100644--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart@@ -171,6 +171,18 @@ class RemoteAssetRepository extends DriftDatabaseRepository {});}+ Future<void> restoreTrash(List<String> ids) {+ return _db.batch((batch) async {+ for (final id in ids) {+ batch.update(+ _db.remoteAssetEntity,+ const RemoteAssetEntityCompanion(deletedAt: Value(null)),+ where: (e) => e.id.equals(id),+ );+ }+ });+ }+Future<void> delete(List<String> ids) {return _db.remoteAssetEntity.deleteWhere((row) => row.id.isIn(ids));}diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dartindex 0c3eee59af..7bbae9a80a 100644--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart@@ -332,6 +332,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {_remoteQueryBuilder(filter: (row) => row.deletedAt.isNotNull() & row.ownerId.equals(userId),groupBy: groupBy,+ joinLocal: true,);TimelineQuery archived(String userId, GroupAssetsBy groupBy) =>@@ -443,11 +444,16 @@ class DriftTimelineRepository extends DriftDatabaseRepository {TimelineQuery _remoteQueryBuilder({required Expression<bool> Function($RemoteAssetEntityTable row) filter,GroupAssetsBy groupBy = GroupAssetsBy.day,+ bool joinLocal = false,}) {return (bucketSource: () => _watchRemoteBucket(filter: filter, groupBy: groupBy),- assetSource: (offset, count) =>- _getRemoteAssets(filter: filter, offset: offset, count: count),+ assetSource: (offset, count) => _getRemoteAssets(+ filter: filter,+ offset: offset,+ count: count,+ joinLocal: joinLocal,+ ),);}@@ -480,13 +486,35 @@ class DriftTimelineRepository extends DriftDatabaseRepository {required Expression<bool> Function($RemoteAssetEntityTable row) filter,required int offset,required int count,+ bool joinLocal = false,}) {- final query = _db.remoteAssetEntity.select()- ..where(filter)- ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])- ..limit(count, offset: offset);+ if (joinLocal) {+ final query = _db.remoteAssetEntity.select().join([+ leftOuterJoin(+ _db.localAssetEntity,+ _db.remoteAssetEntity.checksum+ .equalsExp(_db.localAssetEntity.checksum),+ useColumns: false,+ ),+ ])+ ..addColumns([_db.localAssetEntity.id])+ ..where(filter(_db.remoteAssetEntity))+ ..orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)])+ ..limit(count, offset: offset);- return query.map((row) => row.toDto()).get();+ return query.map((row) {+ final asset = row.readTable(_db.remoteAssetEntity).toDto();+ final localId = row.read(_db.localAssetEntity.id);+ return asset.copyWith(localId: localId);+ }).get();+ } else {+ final query = _db.remoteAssetEntity.select()+ ..where(filter)+ ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])+ ..limit(count, offset: offset);++ return query.map((row) => row.toDto()).get();+ }}}diff --git a/mobile/lib/presentation/pages/drift_trash.page.dart b/mobile/lib/presentation/pages/drift_trash.page.dartindex 9cd2fac760..108a7e1cc9 100644--- a/mobile/lib/presentation/pages/drift_trash.page.dart+++ b/mobile/lib/presentation/pages/drift_trash.page.dart@@ -2,8 +2,10 @@ import 'package:auto_route/auto_route.dart';import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/extensions/translate_extensions.dart';+import 'package:immich_mobile/presentation/widgets/bottom_sheet/trash_bottom_sheet.widget.dart';import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';+import 'package:immich_mobile/providers/server_info.provider.dart';import 'package:immich_mobile/providers/user.provider.dart';@RoutePage()@@ -29,6 +31,7 @@ class DriftTrashPage extends StatelessWidget {),],child: Timeline(+ showStorageIndicator: true,appBar: SliverAppBar(title: Text('trash'.t(context: context)),floating: true,@@ -37,6 +40,27 @@ class DriftTrashPage extends StatelessWidget {centerTitle: true,elevation: 0,),+ topSliverWidgetHeight: 24,+ topSliverWidget: Consumer(+ builder: (context, ref, child) {+ final trashDays = ref.watch(+ serverInfoProvider.select((v) => v.serverConfig.trashDays),+ );++ return SliverPadding(+ padding: const EdgeInsets.all(16.0),+ sliver: SliverToBoxAdapter(+ child: SizedBox(+ height: 24.0,+ child: const Text(+ "trash_page_info",+ ).t(context: context, args: {"days": "$trashDays"}),+ ),+ ),+ );+ },+ ),+ bottomSheet: const TrashBottomBar(),),);}diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dartsimilarity index 94%rename from mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dartrename to mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dartindex d81f998a7b..9f88d640dd 100644--- a/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart+++ b/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart@@ -18,7 +18,8 @@ class DeletePermanentActionButton extends ConsumerWidget {return;}- final result = await ref.read(actionProvider.notifier).delete(source);+ final result =+ await ref.read(actionProvider.notifier).deleteRemoteAndLocal(source);ref.read(multiSelectProvider.notifier).reset();final successMessage = 'delete_action_prompt'.t(diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dartnew file mode 100644index 0000000000..3ec75c60c2--- /dev/null+++ b/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart@@ -0,0 +1,59 @@+import 'package:flutter/material.dart';+import 'package:fluttertoast/fluttertoast.dart';+import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/constants/enums.dart';+import 'package:immich_mobile/extensions/translate_extensions.dart';+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';+import 'package:immich_mobile/widgets/common/immich_toast.dart';++class DeleteTrashActionButton extends ConsumerWidget {+ final ActionSource source;++ const DeleteTrashActionButton({super.key, required this.source});++ void _onTap(BuildContext context, WidgetRef ref) async {+ if (!context.mounted) {+ return;+ }++ final result =+ await ref.read(actionProvider.notifier).deleteRemoteAndLocal(source);+ ref.read(multiSelectProvider.notifier).reset();++ final successMessage = 'restore_trash_action_prompt'.t(+ context: context,+ args: {'count': result.count.toString()},+ );++ if (context.mounted) {+ ImmichToast.show(+ context: context,+ msg: result.success+ ? successMessage+ : 'scaffold_body_error_occurred'.t(context: context),+ gravity: ToastGravity.BOTTOM,+ toastType: result.success ? ToastType.success : ToastType.error,+ );+ }+ }++ @override+ Widget build(BuildContext context, WidgetRef ref) {+ return TextButton.icon(+ icon: Icon(+ Icons.delete_forever,+ color: Colors.red[400],+ ),+ label: Text(+ "delete".t(context: context),+ style: TextStyle(+ fontSize: 14,+ color: Colors.red[400],+ fontWeight: FontWeight.bold,+ ),+ ),+ onPressed: () => _onTap(context, ref),+ );+ }+}diff --git a/mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dartnew file mode 100644index 0000000000..05ee469d25--- /dev/null+++ b/mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart@@ -0,0 +1,56 @@+import 'package:flutter/material.dart';+import 'package:fluttertoast/fluttertoast.dart';+import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/constants/enums.dart';+import 'package:immich_mobile/extensions/translate_extensions.dart';+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';+import 'package:immich_mobile/widgets/common/immich_toast.dart';++class RestoreTrashActionButton extends ConsumerWidget {+ final ActionSource source;++ const RestoreTrashActionButton({super.key, required this.source});++ void _onTap(BuildContext context, WidgetRef ref) async {+ if (!context.mounted) {+ return;+ }++ final result = await ref.read(actionProvider.notifier).restoreTrash(source);+ ref.read(multiSelectProvider.notifier).reset();++ final successMessage = 'restore_trash_action_prompt'.t(+ context: context,+ args: {'count': result.count.toString()},+ );++ if (context.mounted) {+ ImmichToast.show(+ context: context,+ msg: result.success+ ? successMessage+ : 'scaffold_body_error_occurred'.t(context: context),+ gravity: ToastGravity.BOTTOM,+ toastType: result.success ? ToastType.success : ToastType.error,+ );+ }+ }++ @override+ Widget build(BuildContext context, WidgetRef ref) {+ return TextButton.icon(+ icon: const Icon(+ Icons.history_rounded,+ ),+ label: Text(+ 'restore'.t(),+ style: const TextStyle(+ fontSize: 14,+ fontWeight: FontWeight.bold,+ ),+ ),+ onPressed: () => _onTap(context, ref),+ );+ }+}diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dartindex 89822fef91..0e426fde6d 100644--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart@@ -7,7 +7,7 @@ import 'package:immich_mobile/domain/models/exif.model.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';import 'package:immich_mobile/extensions/translate_extensions.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';-import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';diff --git a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dartindex 9ed35da4cd..deaaea0d39 100644--- a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart+++ b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart@@ -1,7 +1,7 @@import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';-import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';diff --git a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dartindex a1e1255a9f..8199271bfe 100644--- a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart+++ b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';-import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';diff --git a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dartindex 373d264d82..d83b8e399d 100644--- a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart+++ b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';-import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';@@ -44,6 +44,9 @@ class GeneralBottomSheet extends ConsumerWidget {: const DeletePermanentActionButton(source: ActionSource.timeline,),+ if (multiselect.hasLocal || multiselect.hasMerged) ...[+ const DeleteLocalActionButton(source: ActionSource.timeline),+ ],const EditDateTimeActionButton(),const EditLocationActionButton(source: ActionSource.timeline),const MoveToLockFolderActionButton(diff --git a/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dartindex 7f82f750f7..a644e6a035 100644--- a/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart+++ b/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart@@ -1,7 +1,7 @@import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';-import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';diff --git a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dartindex cfb6fe4f1a..2e6047f0ba 100644--- a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart+++ b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart@@ -3,7 +3,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';import 'package:immich_mobile/domain/models/album/album.model.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';-import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';diff --git a/mobile/lib/presentation/widgets/bottom_sheet/trash_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/trash_bottom_sheet.widget.dartnew file mode 100644index 0000000000..9f8216c4ed--- /dev/null+++ b/mobile/lib/presentation/widgets/bottom_sheet/trash_bottom_sheet.widget.dart@@ -0,0 +1,32 @@+import 'package:flutter/material.dart';+import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/constants/enums.dart';+import 'package:immich_mobile/extensions/build_context_extensions.dart';+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart';+import 'package:immich_mobile/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart';++class TrashBottomBar extends ConsumerWidget {+ const TrashBottomBar({super.key});++ @override+ Widget build(BuildContext context, WidgetRef ref) {+ return SafeArea(+ child: Align(+ alignment: Alignment.bottomCenter,+ child: SizedBox(+ height: 64,+ child: Container(+ color: context.themeData.canvasColor,+ child: const Row(+ mainAxisAlignment: MainAxisAlignment.spaceEvenly,+ children: [+ DeleteTrashActionButton(source: ActionSource.timeline),+ RestoreTrashActionButton(source: ActionSource.timeline),+ ],+ ),+ ),+ ),+ ),+ );+ }+}diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dartindex cb025ef941..419ba0f902 100644--- a/mobile/lib/providers/infrastructure/action.provider.dart+++ b/mobile/lib/providers/infrastructure/action.provider.dart@@ -206,6 +206,7 @@ class ActionNotifier extends Notifier<void> {Future<ActionResult> trash(ActionSource source) async {final ids = _getOwnedRemoteIdsForSource(source);+try {await _service.trash(ids);return ActionResult(count: ids.length, success: true);@@ -219,10 +220,26 @@ class ActionNotifier extends Notifier<void> {}}- Future<ActionResult> delete(ActionSource source) async {+ Future<ActionResult> restoreTrash(ActionSource source) async {+ final ids = _getOwnedRemoteIdsForSource(source);+ try {+ await _service.restoreTrash(ids);+ return ActionResult(count: ids.length, success: true);+ } catch (error, stack) {+ _logger.severe('Failed to restore trash assets', error, stack);+ return ActionResult(+ count: ids.length,+ success: false,+ error: error.toString(),+ );+ }+ }++ Future<ActionResult> deleteRemoteAndLocal(ActionSource source) async {final ids = _getOwnedRemoteIdsForSource(source);+ final localIds = _getLocalIdsForSource(source);try {- await _service.delete(ids);+ await _service.deleteRemoteAndLocal(ids, localIds);return ActionResult(count: ids.length, success: true);} catch (error, stack) {_logger.severe('Failed to delete assets', error, stack);diff --git a/mobile/lib/providers/timeline/multiselect.provider.dart b/mobile/lib/providers/timeline/multiselect.provider.dartindex b1a926545d..9e0f690e7d 100644--- a/mobile/lib/providers/timeline/multiselect.provider.dart+++ b/mobile/lib/providers/timeline/multiselect.provider.dart@@ -23,15 +23,22 @@ class MultiSelectState {});bool get isEnabled => selectedAssets.isNotEmpty;++ /// Cloud onlybool get hasRemote => selectedAssets.any((asset) =>asset.storage == AssetState.remote ||asset.storage == AssetState.merged,);+bool get hasLocal => selectedAssets.any((asset) => asset.storage == AssetState.local,);+ bool get hasMerged => selectedAssets.any(+ (asset) => asset.storage == AssetState.merged,+ );+MultiSelectState copyWith({Set<BaseAsset>? selectedAssets,Set<BaseAsset>? lockedSelectionAssets,diff --git a/mobile/lib/repositories/asset_api.repository.dart b/mobile/lib/repositories/asset_api.repository.dartindex 4c854973b1..6d08b4f0d9 100644--- a/mobile/lib/repositories/asset_api.repository.dart+++ b/mobile/lib/repositories/asset_api.repository.dart@@ -13,6 +13,7 @@ final assetApiRepositoryProvider = Provider(ref.watch(apiServiceProvider).assetsApi,ref.watch(apiServiceProvider).searchApi,ref.watch(apiServiceProvider).stacksApi,+ ref.watch(apiServiceProvider).trashApi,),);@@ -20,8 +21,14 @@ class AssetApiRepository extends ApiRepository {final AssetsApi _api;final SearchApi _searchApi;final StacksApi _stacksApi;+ final TrashApi _trashApi;- AssetApiRepository(this._api, this._searchApi, this._stacksApi);+ AssetApiRepository(+ this._api,+ this._searchApi,+ this._stacksApi,+ this._trashApi,+ );Future<Asset> update(String id, {String? description}) async {final response = await checkNull(@@ -56,6 +63,10 @@ class AssetApiRepository extends ApiRepository {return _api.deleteAssets(AssetBulkDeleteDto(ids: ids, force: force));}+ Future<void> restoreTrash(List<String> ids) async {+ await _trashApi.restoreAssets(BulkIdsDto(ids: ids));+ }+Future<void> updateVisibility(List<String> ids,AssetVisibilityEnum visibility,diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dartindex 7b0d74e420..63bc053a41 100644--- a/mobile/lib/services/action.service.dart+++ b/mobile/lib/services/action.service.dart@@ -127,9 +127,25 @@ class ActionService {await _remoteAssetRepository.trash(remoteIds);}- Future<void> delete(List<String> remoteIds) async {+ Future<void> restoreTrash(List<String> ids) async {+ await _assetApiRepository.restoreTrash(ids);+ await _remoteAssetRepository.restoreTrash(ids);+ }++ Future<void> deleteRemoteAndLocal(+ List<String> remoteIds,+ List<String> localIds,+ ) async {await _assetApiRepository.delete(remoteIds, true);await _remoteAssetRepository.delete(remoteIds);++ if (localIds.isNotEmpty) {+ final deletedIds = await _assetMediaRepository.deleteAll(localIds);++ if (deletedIds.isNotEmpty) {+ await _localAssetRepository.delete(deletedIds);+ }+ }}Future<void> deleteLocal(List<String> localIds) async {