URGENT FIX !! App closes when clicking directions buttons

-launching activity from model was a bad idea -replicate startActivityForResult pattern in activity model and activity -but in trip model and trip fragment
nackko · May 7, 2019 · 505ae28 · 505ae28
1 parent 29d955c
commit 505ae28
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/app/src/main/java/com/ludoscity/findmybikes/ui/trip/TripDetailsFragment.kt b/app/src/main/java/com/ludoscity/findmybikes/ui/trip/TripDetailsFragment.kt
@@ -105,6 +105,13 @@ class TripDetailsFragment : Fragment() {
             }
         })
 
+        fragmentModel.lastStartActivityIntent.observe(this, Observer {
+            it?.let { intent ->
+                fragmentModel.clearLastStartActivityRequest()
+                startActivity(intent)
+            }
+        })
+
         inflatedView.findViewById<View>(R.id.trip_details_directions_loc_to_a).setOnClickListener {
             fragmentModel.locToStationADirectionsFabClick()
         }

diff --git a/app/src/main/java/com/ludoscity/findmybikes/ui/trip/TripFragmentViewModel.kt b/app/src/main/java/com/ludoscity/findmybikes/ui/trip/TripFragmentViewModel.kt
@@ -43,6 +43,18 @@ class TripFragmentViewModel(app: Application,
     private val aToBGoogleMapDirectionsIntent = MutableLiveData<Intent>()
     private val bToDestGoogleMapDirectionsIntent = MutableLiveData<Intent>()
 
+    private val lastStartActData = MutableLiveData<Intent>()
+    val lastStartActivityIntent: LiveData<Intent>
+        get() = lastStartActData
+
+    fun requestStartActivity(intent: Intent) {
+        lastStartActData.value = intent
+    }
+
+    fun clearLastStartActivityRequest() {
+        lastStartActData.value = null
+    }
+
     val locToStationAText: LiveData<String>
         get() = locToStationADurationString
 
@@ -196,15 +208,15 @@ class TripFragmentViewModel(app: Application,
     }
 
     fun locToStationADirectionsFabClick() {
-        getApplication<Application>().startActivity(locToAGoogleMapDirectionsIntent.value)
+        lastStartActData.value = locToAGoogleMapDirectionsIntent.value
     }
 
     fun stationAToStationBDirectionsFabClick() {
-        getApplication<Application>().startActivity(aToBGoogleMapDirectionsIntent.value)
+        lastStartActData.value = aToBGoogleMapDirectionsIntent.value
     }
 
     fun stationBTofinalDestinationDirectionsFabClick() {
-        getApplication<Application>().startActivity(bToDestGoogleMapDirectionsIntent.value)
+        lastStartActData.value = bToDestGoogleMapDirectionsIntent.value
     }
 
     private fun recalculateTripTotal(statBToFinal: Int?, statAToStatB: Int?, locToA: Int?) {