fix: show dialog on delete local action

This commit is contained in:
shenlong-tanwen 2025-09-22 04:58:52 +05:30
parent 0be71c82b3
commit 9db0baa42b
7 changed files with 61 additions and 12 deletions

View File

@ -56,6 +56,8 @@ sealed class BaseAsset {
// Overridden in subclasses // Overridden in subclasses
AssetState get storage; AssetState get storage;
String? get localId;
String? get remoteId;
String get heroTag; String get heroTag;
@override @override

View File

@ -2,12 +2,12 @@ part of 'base_asset.model.dart';
class LocalAsset extends BaseAsset { class LocalAsset extends BaseAsset {
final String id; final String id;
final String? remoteId; final String? remoteAssetId;
final int orientation; final int orientation;
const LocalAsset({ const LocalAsset({
required this.id, required this.id,
this.remoteId, String? remoteId,
required super.name, required super.name,
super.checksum, super.checksum,
required super.type, required super.type,
@ -19,7 +19,13 @@ class LocalAsset extends BaseAsset {
super.isFavorite = false, super.isFavorite = false,
super.livePhotoVideoId, super.livePhotoVideoId,
this.orientation = 0, this.orientation = 0,
}); }) : remoteAssetId = remoteId;
@override
String? get localId => id;
@override
String? get remoteId => remoteAssetId;
@override @override
AssetState get storage => remoteId == null ? AssetState.local : AssetState.merged; AssetState get storage => remoteId == null ? AssetState.local : AssetState.merged;

View File

@ -5,7 +5,7 @@ enum AssetVisibility { timeline, hidden, archive, locked }
// Model for an asset stored in the server // Model for an asset stored in the server
class RemoteAsset extends BaseAsset { class RemoteAsset extends BaseAsset {
final String id; final String id;
final String? localId; final String? localAssetId;
final String? thumbHash; final String? thumbHash;
final AssetVisibility visibility; final AssetVisibility visibility;
final String ownerId; final String ownerId;
@ -13,7 +13,7 @@ class RemoteAsset extends BaseAsset {
const RemoteAsset({ const RemoteAsset({
required this.id, required this.id,
this.localId, String? localId,
required super.name, required super.name,
required this.ownerId, required this.ownerId,
required super.checksum, required super.checksum,
@ -28,7 +28,13 @@ class RemoteAsset extends BaseAsset {
this.visibility = AssetVisibility.timeline, this.visibility = AssetVisibility.timeline,
super.livePhotoVideoId, super.livePhotoVideoId,
this.stackId, this.stackId,
}); }) : localAssetId = localId;
@override
String? get localId => localAssetId;
@override
String? get remoteId => id;
@override @override
AssetState get storage => localId == null ? AssetState.remote : AssetState.merged; AssetState get storage => localId == null ? AssetState.remote : AssetState.merged;

View File

@ -8,6 +8,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_bu
import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart'; import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
import 'package:immich_mobile/providers/infrastructure/action.provider.dart'; import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
import 'package:immich_mobile/providers/timeline/multiselect.provider.dart'; import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
import 'package:immich_mobile/widgets/asset_grid/delete_dialog.dart';
import 'package:immich_mobile/widgets/common/immich_toast.dart'; import 'package:immich_mobile/widgets/common/immich_toast.dart';
/// This delete action has the following behavior: /// This delete action has the following behavior:
@ -22,7 +23,17 @@ class DeleteLocalActionButton extends ConsumerWidget {
return; return;
} }
final result = await ref.read(actionProvider.notifier).deleteLocal(source); bool? backedUpOnly = await showDialog<bool>(
context: context,
builder: (BuildContext context) => DeleteLocalOnlyDialog(onDeleteLocal: (_) {}),
);
if (backedUpOnly == null) {
// User cancelled the dialog
return;
}
final result = await ref.read(actionProvider.notifier).deleteLocal(source, backedUpOnly);
ref.read(multiSelectProvider.notifier).reset(); ref.read(multiSelectProvider.notifier).reset();
if (source == ActionSource.viewer) { if (source == ActionSource.viewer) {

View File

@ -252,8 +252,15 @@ class ActionNotifier extends Notifier<void> {
} }
} }
Future<ActionResult> deleteLocal(ActionSource source) async { Future<ActionResult> deleteLocal(ActionSource source, bool backedUpOnly) async {
final ids = _getLocalIdsForSource(source); final List<String> ids;
if (backedUpOnly) {
final assets = _getAssets(source);
ids = assets.where((asset) => asset.storage == AssetState.merged).map((asset) => asset.localId!).toList();
} else {
ids = _getLocalIdsForSource(source);
}
try { try {
final deletedCount = await _service.deleteLocal(ids); final deletedCount = await _service.deleteLocal(ids);
return ActionResult(count: deletedCount, success: true); return ActionResult(count: deletedCount, success: true);

View File

@ -1,5 +1,6 @@
import 'dart:io'; import 'dart:io';
import 'package:device_info_plus/device_info_plus.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/domain/models/asset/base_asset.model.dart'; import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@ -8,6 +9,7 @@ import 'package:immich_mobile/domain/models/store.model.dart';
import 'package:immich_mobile/entities/asset.entity.dart' as asset_entity; import 'package:immich_mobile/entities/asset.entity.dart' as asset_entity;
import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart';
import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart';
import 'package:immich_mobile/extensions/platform_extensions.dart';
import 'package:immich_mobile/extensions/response_extensions.dart'; import 'package:immich_mobile/extensions/response_extensions.dart';
import 'package:immich_mobile/repositories/asset_api.repository.dart'; import 'package:immich_mobile/repositories/asset_api.repository.dart';
import 'package:immich_mobile/utils/hash.dart'; import 'package:immich_mobile/utils/hash.dart';
@ -20,11 +22,26 @@ final assetMediaRepositoryProvider = Provider((ref) => AssetMediaRepository(ref.
class AssetMediaRepository { class AssetMediaRepository {
final AssetApiRepository _assetApiRepository; final AssetApiRepository _assetApiRepository;
static final Logger _log = Logger("AssetMediaRepository"); static final Logger _log = Logger("AssetMediaRepository");
const AssetMediaRepository(this._assetApiRepository); const AssetMediaRepository(this._assetApiRepository);
Future<List<String>> deleteAll(List<String> ids) => PhotoManager.editor.deleteWithIds(ids); Future<List<String>> deleteAll(List<String> ids) async {
if (CurrentPlatform.isIOS) {
return PhotoManager.editor.deleteWithIds(ids);
} else if (CurrentPlatform.isAndroid) {
final androidInfo = await DeviceInfoPlugin().androidInfo;
if (androidInfo.version.sdkInt < 30) {
return PhotoManager.editor.deleteWithIds(ids);
}
return PhotoManager.editor.android.moveToTrash(
// Only the id is needed
ids.map((id) => AssetEntity(id: id, width: 1, height: 1, typeInt: 0)).toList(),
);
}
return [];
}
Future<asset_entity.Asset?> get(String id) async { Future<asset_entity.Asset?> get(String id) async {
final entity = await AssetEntity.fromId(id); final entity = await AssetEntity.fromId(id);

View File

@ -22,12 +22,12 @@ class DeleteLocalOnlyDialog extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
void onDeleteBackedUpOnly() { void onDeleteBackedUpOnly() {
context.pop(); context.pop(true);
onDeleteLocal(true); onDeleteLocal(true);
} }
void onForceDelete() { void onForceDelete() {
context.pop(); context.pop(false);
onDeleteLocal(false); onDeleteLocal(false);
} }