From cd89e5c58d858ddb40f0263e61e6e29cdb9e4891 Mon Sep 17 00:00:00 2001
From: ExceptionsOccur <yuyu.tao@foxmail.com>
Date: Sat, 1 Mar 2025 17:38:10 +0800
Subject: [PATCH] fix(mobile): the page for adding photos to the album cannot
 be navigated back using gestures #16409

---
 .../lib/widgets/asset_grid/immich_asset_grid_view.dart   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart b/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart
index c38e61a47356d..3815fc660eb57 100644
--- a/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart
+++ b/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart
@@ -542,7 +542,14 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
   Widget build(BuildContext context) {
     return PopScope(
       canPop: !(widget.selectionActive && _selectedAssets.isNotEmpty),
-      onPopInvokedWithResult: (didPop, _) => !didPop ? _deselectAll() : null,
+      onPopInvokedWithResult: (didPop, _) {
+        if (didPop) {
+          return;
+        } else {
+          _deselectAll();
+          Navigator.of(context).canPop() ? Navigator.of(context).pop() : null;
+        }
+      },
       child: Stack(
         children: [
           AssetDragRegion(