[RFR-630] Ensure laucher is not called after fragment is detached

cyface-de · Jun 27, 2023 · 104a200 · 104a200
1 parent d821bfb
commit 104a200
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/ui/r4r/src/main/kotlin/de/cyface/app/r4r/capturing/marker/MarkerFragment.kt b/ui/r4r/src/main/kotlin/de/cyface/app/r4r/capturing/marker/MarkerFragment.kt
@@ -129,6 +129,11 @@ class MarkerFragment : Fragment() {
         _binding = null
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        map?.onDestroy()
+    }
+
     companion object {
         fun eventPassed(): Boolean {
             val now = Calendar.getInstance()

diff --git a/utils/src/main/kotlin/de/cyface/app/utils/Map.kt b/utils/src/main/kotlin/de/cyface/app/utils/Map.kt
@@ -73,7 +73,7 @@ class Map(
     private val view: MapView,
     savedInstanceState: Bundle?,
     onMapReadyRunnable: Runnable,
-    permissionLauncher: ActivityResultLauncher<Array<String>>,
+    private var permissionLauncher: ActivityResultLauncher<Array<String>>?,
     private val ignoreAutoZoom: Boolean = false
 ) : OnMapReadyCallback, LocationListener {
     /**
@@ -131,7 +131,8 @@ class Map(
         view.onCreate(savedInstanceState)
         val activity = view.context as Activity
         applicationContext = activity.applicationContext
-        permissionLauncher.launch(
+        // Ensure launcher is not called after parent fragment was destroyed [RFR-630]
+        permissionLauncher?.launch(
             arrayOf(
                 Manifest.permission.ACCESS_FINE_LOCATION,
                 Manifest.permission.ACCESS_COARSE_LOCATION
@@ -449,6 +450,11 @@ class Map(
         stopLocationUpdates()
     }
 
+    fun onDestroy() {
+        // Ensure launcher is not called after parent fragment was destroyed [RFR-630]
+        permissionLauncher = null
+    }
+
     override fun onLocationChanged(location: Location) {
         // This is used by `ui/cyface`, the `ui/r4r` uses `onLocationResult`
         if (isAutoCenterMapEnabled && !ignoreAutoZoom) {