Skip to content

fix(mobile): reflect asset deletions instantly #26835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alextran1502 merged 1 commit into from
Mar 17, 2026
Merged

fix(mobile): reflect asset deletions instantly #26835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';
Future<void> performArchiveAction(BuildContext context, WidgetRef ref, {required ActionSource source}) async {
if (!context.mounted) return;

final result = await ref.read(actionProvider.notifier).archive(source);
ref.read(multiSelectProvider.notifier).reset();

if (source == ActionSource.viewer) {
EventStream.shared.emit(const ViewerReloadAssetEvent());
}

final result = await ref.read(actionProvider.notifier).archive(source);
ref.read(multiSelectProvider.notifier).reset();

final successMessage = 'archive_action_prompt'.t(context: context, args: {'count': result.count.toString()});

if (context.mounted) {
Expand Down
6 changes: 3 additions & 3 deletions mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ class DeleteActionButton extends ConsumerWidget {
if (confirm != true) return;
}

final result = await ref.read(actionProvider.notifier).trashRemoteAndDeleteLocal(source);
ref.read(multiSelectProvider.notifier).reset();

if (source == ActionSource.viewer) {
EventStream.shared.emit(const ViewerReloadAssetEvent());
}

final result = await ref.read(actionProvider.notifier).trashRemoteAndDeleteLocal(source);
ref.read(multiSelectProvider.notifier).reset();

final successMessage = 'delete_action_prompt'.t(context: context, args: {'count': result.count.toString()});

if (context.mounted) {
Expand Down
6 changes: 3 additions & 3 deletions mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ class DeletePermanentActionButton extends ConsumerWidget {
false;
if (!confirm) return;

final result = await ref.read(actionProvider.notifier).deleteRemoteAndLocal(source);
ref.read(multiSelectProvider.notifier).reset();

if (source == ActionSource.viewer) {
EventStream.shared.emit(const ViewerReloadAssetEvent());
}

final result = await ref.read(actionProvider.notifier).deleteRemoteAndLocal(source);
ref.read(multiSelectProvider.notifier).reset();

final successMessage = 'delete_permanently_action_prompt'.t(
context: context,
args: {'count': result.count.toString()},
Expand Down
6 changes: 3 additions & 3 deletions mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';
Future<void> performMoveToLockFolderAction(BuildContext context, WidgetRef ref, {required ActionSource source}) async {
if (!context.mounted) return;

final result = await ref.read(actionProvider.notifier).moveToLockFolder(source);
ref.read(multiSelectProvider.notifier).reset();

if (source == ActionSource.viewer) {
EventStream.shared.emit(const ViewerReloadAssetEvent());
}

final result = await ref.read(actionProvider.notifier).moveToLockFolder(source);
ref.read(multiSelectProvider.notifier).reset();

final successMessage = 'move_to_lock_folder_action_prompt'.t(
context: context,
args: {'count': result.count.toString()},
Expand Down
6 changes: 3 additions & 3 deletions mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ class RemoveFromAlbumActionButton extends ConsumerWidget {
return;
}

final result = await ref.read(actionProvider.notifier).removeFromAlbum(source, albumId);
ref.read(multiSelectProvider.notifier).reset();

if (source == ActionSource.viewer) {
EventStream.shared.emit(const ViewerReloadAssetEvent());
}

final result = await ref.read(actionProvider.notifier).removeFromAlbum(source, albumId);
ref.read(multiSelectProvider.notifier).reset();

final successMessage = 'remove_from_album_action_prompt'.t(
context: context,
args: {'count': result.count.toString()},
Expand Down
6 changes: 3 additions & 3 deletions mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ class TrashActionButton extends ConsumerWidget {
return;
}

final result = await ref.read(actionProvider.notifier).trash(source);
ref.read(multiSelectProvider.notifier).reset();

if (source == ActionSource.viewer) {
EventStream.shared.emit(const ViewerReloadAssetEvent());
}

final result = await ref.read(actionProvider.notifier).trash(source);
ref.read(multiSelectProvider.notifier).reset();

final successMessage = 'trash_action_prompt'.t(context: context, args: {'count': result.count.toString()});

if (context.mounted) {
Expand Down
6 changes: 3 additions & 3 deletions mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ import 'package:immich_mobile/domain/utils/event_stream.dart';
Future<void> performUnArchiveAction(BuildContext context, WidgetRef ref, {required ActionSource source}) async {
if (!context.mounted) return;

final result = await ref.read(actionProvider.notifier).unArchive(source);
ref.read(multiSelectProvider.notifier).reset();

if (source == ActionSource.viewer) {
EventStream.shared.emit(const ViewerReloadAssetEvent());
}

final result = await ref.read(actionProvider.notifier).unArchive(source);
ref.read(multiSelectProvider.notifier).reset();

final successMessage = 'unarchive_action_prompt'.t(context: context, args: {'count': result.count.toString()});

if (context.mounted) {
Expand Down
64 changes: 26 additions & 38 deletions mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,17 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
late final _preloader = AssetPreloader(timelineService: ref.read(timelineServiceProvider), mounted: () => mounted);

late int _currentPage = widget.initialIndex;
late int _totalAssets = ref.read(timelineServiceProvider).totalAssets;

StreamSubscription? _reloadSubscription;
KeepAliveLink? _stackChildrenKeepAlive;

bool _assetReloadRequested = false;

void _onTapNavigate(int direction) {
final page = _pageController.page?.toInt();
if (page == null) return;
final target = page + direction;
final maxPage = ref.read(timelineServiceProvider).totalAssets - 1;
final maxPage = _totalAssets - 1;
if (target >= 0 && target <= maxPage) {
_currentPage = target;
_pageController.jumpToPage(target);
_onAssetChanged(target);
}
Expand Down Expand Up @@ -141,7 +139,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {

final page = _pageController.page?.round();
if (page != null && page != _currentPage) {
_currentPage = page;
_onAssetChanged(page);
}
return false;
Expand All @@ -153,8 +150,9 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
}

void _onAssetChanged(int index) async {
final timelineService = ref.read(timelineServiceProvider);
final asset = await timelineService.getAssetAsync(index);
_currentPage = index;

final asset = await ref.read(timelineServiceProvider).getAssetAsync(index);
if (asset == null) return;

AssetViewer._setAsset(ref, asset);
Expand Down Expand Up @@ -193,11 +191,20 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
case TimelineReloadEvent():
_onTimelineReloadEvent();
case ViewerReloadAssetEvent():
_assetReloadRequested = true;
_onViewerReloadEvent();
default:
}
}

void _onViewerReloadEvent() {
if (_totalAssets <= 1) return;

final index = _pageController.page?.round() ?? 0;
final target = index >= _totalAssets - 1 ? index - 1 : index + 1;
_pageController.animateToPage(target, duration: Durations.medium1, curve: Curves.easeInOut);
_onAssetChanged(target);
}

void _onTimelineReloadEvent() {
final timelineService = ref.read(timelineServiceProvider);
final totalAssets = timelineService.totalAssets;
Expand All @@ -207,43 +214,24 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
return;
}

var index = _pageController.page?.round() ?? 0;
final currentAsset = ref.read(assetViewerProvider).currentAsset;
if (currentAsset != null) {
final newIndex = timelineService.getIndex(currentAsset.heroTag);
if (newIndex != null && newIndex != index) {
index = newIndex;
_currentPage = index;
_pageController.jumpToPage(index);
}
}
final assetIndex = currentAsset != null ? timelineService.getIndex(currentAsset.heroTag) : null;
final index = (assetIndex ?? _currentPage).clamp(0, totalAssets - 1);

if (index >= totalAssets) {
index = totalAssets - 1;
_currentPage = index;
if (index != _currentPage) {
_pageController.jumpToPage(index);
_onAssetChanged(index);
} else if (currentAsset != null && assetIndex == null) {
_onAssetChanged(index);
}

if (_assetReloadRequested) {
_assetReloadRequested = false;
_onAssetReloadEvent(index);
if (_totalAssets != totalAssets) {
setState(() {
_totalAssets = totalAssets;
});
}
}

void _onAssetReloadEvent(int index) async {
final timelineService = ref.read(timelineServiceProvider);

final newAsset = await timelineService.getAssetAsync(index);
if (newAsset == null) return;

final currentAsset = ref.read(assetViewerProvider).currentAsset;

// Do not reload if the asset has not changed
if (newAsset.heroTag == currentAsset?.heroTag) return;

_onAssetChanged(index);
}

void _setSystemUIMode(bool controls, bool details) {
final mode = !controls || (CurrentPlatform.isIOS && details)
? SystemUiMode.immersiveSticky
Expand Down Expand Up @@ -301,7 +289,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
: CurrentPlatform.isIOS
? const FastScrollPhysics()
: const FastClampingScrollPhysics(),
itemCount: ref.read(timelineServiceProvider).totalAssets,
itemCount: _totalAssets,
itemBuilder: (context, index) =>
AssetPage(index: index, heroOffset: _heroOffset, onTapNavigate: _onTapNavigate),
),
Expand Down
Loading