#2005 fix: NPE in onSaveInstanceState due to null navhostcontroller

Author: sds100

CHANGELOG.md

@@ -5,6 +5,7 @@
 ## Fixed
 - #2007 Volume up/down action bottom sheet is cut off on some devices.
 - #2004 Do not crash when launching wireless debugging screen on some devices.
+- #2005 NPE in onSaveInstanceState
 
 ## [4.0.0](https://github.com/sds100/KeyMapper/releases/tag/v4.0.0)
 

app/src/main/java/io/github/sds100/keymapper/MainFragment.kt

@@ -60,7 +60,7 @@ class MainFragment : Fragment() {
 
     private lateinit var composeView: ComposeView
 
-    private lateinit var navController: NavHostController
+    private var navController: NavHostController? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -98,7 +98,7 @@ class MainFragment : Fragment() {
             // is destroyed
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
             setContent {
-                SetupNavigation(navigationProvider, navController)
+                SetupNavigation(navigationProvider, navController!!)
 
                 KeyMapperTheme {
                     BaseMainNavHost(
@@ -111,10 +111,10 @@ class MainFragment : Fragment() {
                                         ),
                                     ),
                             ),
-                        navController = navController,
+                        navController = navController!!,
                         setupAccessibilityServiceDelegate = setupAccessibilityServiceDelegate,
                         composableDestinations = {
-                            composableDestinations(navController)
+                            composableDestinations(navController!!)
                         },
                     )
                 }
@@ -123,15 +123,15 @@ class MainFragment : Fragment() {
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        navController.saveState()?.let(outState::putAll)
+        navController?.saveState()?.let(outState::putAll)
 
         super.onSaveInstanceState(outState)
     }
 
     override fun onDestroyView() {
         // onSaveInstanceState is only called when the activity's onSaveInstanceState method
         // is called so use our own place to save the navigation state
-        navigationProvider.savedState = navController.saveState()
+        navigationProvider.savedState = navController?.saveState()
 
         super.onDestroyView()
     }