[AppRouter] Fix crash on pop page

proninyaroslav · Aug 11, 2024 · ffe7641 · ffe7641
1 parent 769f68e
commit ffe7641
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/lib/ui/app_router.dart b/lib/ui/app_router.dart
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Yaroslav Pronin <[email protected]>
+// Copyright (C) 2021-2024 Yaroslav Pronin <[email protected]>
 // Copyright (C) 2021 Insurgo Inc. <[email protected]>
 //
 // This file is part of LibreTrack.
@@ -219,7 +219,7 @@ class AppRouterDelegate extends RouterDelegate<AppRoutePath>
       reportsRouteUpdateToEngine: true,
       pages: pages,
       onDidRemovePage: (page) {
-        _popState();
+        _stateStack.pop();
       },
     );
   }

diff --git a/lib/ui/parcels/parcels_cubit.dart b/lib/ui/parcels/parcels_cubit.dart
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Yaroslav Pronin <[email protected]>
+// Copyright (C) 2021-2024 Yaroslav Pronin <[email protected]>
 // Copyright (C) 2021 Insurgo Inc. <[email protected]>
 //
 // This file is part of LibreTrack.
@@ -75,11 +75,13 @@ class ParcelsCubit extends Cubit<ParcelsState> {
         ));
 
   Future<void> observeParcels() async {
-    emit(ParcelsState.initial(
-      filters: state.filters,
-      search: state.search,
-      sort: state.sort,
-    ));
+    if (!isClosed) {
+      emit(ParcelsState.initial(
+        filters: state.filters,
+        search: state.search,
+        sort: state.sort,
+      ));
+    }
 
     final group = StreamGroup.mergeBroadcast([
       _trackRepo.observeAllTracks().asyncMap(
@@ -119,15 +121,17 @@ class ParcelsCubit extends Cubit<ParcelsState> {
               archive.add(info);
             }
           }
-          emit(
-            ParcelsState.loaded(
-              active: active,
-              archive: archive,
-              filters: state.filters,
-              search: state.search,
-              sort: state.sort,
-            ),
-          );
+          if (!isClosed) {
+            emit(
+              ParcelsState.loaded(
+                active: active,
+                archive: archive,
+                filters: state.filters,
+                search: state.search,
+                sort: state.sort,
+              ),
+            );
+          }
         },
         failed: (error) {
           emit(