[fix] Null pointer when activity finish

rh-id · Jan 30, 2024 · 451b543 · 451b543
1 parent bacc468
commit 451b543
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/navigator/src/main/java/m/co/rh/id/anavigator/Navigator.java b/navigator/src/main/java/m/co/rh/id/anavigator/Navigator.java
@@ -1101,7 +1101,14 @@ protected void initViewAnimator() {
     private void checkAndConfigureRequestOrientation() {
         Activity activity = getActivity();
         int activityOrientation = activity.getRequestedOrientation();
-        StatefulView currentRoute = mNavRouteStack.peek().getStatefulView();
+        NavRoute navRoute = mNavRouteStack.peek();
+        if (navRoute == null) {
+            if (activityOrientation != mActivityDefaultScreenOrientation) {
+                activity.setRequestedOrientation(mActivityDefaultScreenOrientation);
+            }
+            return;
+        }
+        StatefulView currentRoute = navRoute.getStatefulView();
         if (currentRoute instanceof NavActivity.RequestOrientation) {
             int routeOrientation = ((NavActivity.RequestOrientation) currentRoute).getRequestedOrientation();
             if (activityOrientation != routeOrientation) {