[Fix] StatefulViewDialog crash when pop itself from route

rh-id · Dec 1, 2021 · 20a33e7 · 20a33e7
1 parent 4945e08
commit 20a33e7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/example/src/main/java/m/co/rh/id/anavigator/example/dialog/Dialog2Page.java b/example/src/main/java/m/co/rh/id/anavigator/example/dialog/Dialog2Page.java
@@ -43,6 +43,8 @@ protected View createView(Activity activity, ViewGroup container) {
         });
         Button buttonRetry = view.findViewById(R.id.button_retry);
         buttonRetry.setOnClickListener(v -> getNavigator().retry());
+        Button buttonDismis = view.findViewById(R.id.button_dismiss);
+        buttonDismis.setOnClickListener(v -> getNavigator().pop());
         Toast.makeText(activity, "Dialog page 2 createView", Toast.LENGTH_LONG).show();
         return view;
     }

diff --git a/example/src/main/res/layout/page_dialog_2.xml b/example/src/main/res/layout/page_dialog_2.xml
@@ -57,4 +57,13 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/button_rebuild" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/button_dismiss"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Dismiss current dialog"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/button_retry" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/navigator/src/main/java/m/co/rh/id/anavigator/StatefulViewDialog.java b/navigator/src/main/java/m/co/rh/id/anavigator/StatefulViewDialog.java
@@ -89,6 +89,7 @@ final void dismissWithoutPop(ACT activity) {
     public void dispose(ACT activity) {
         super.dispose(activity);
         if (mActiveDialog != null) {
+            mShouldPop = false;
             mActiveDialog.dismiss();
         }
         mActiveDialog = null;