[android] Upgrade AGP, Kotlin plugin, JDK + StateFlow fixes

1 files changed, 4 insertions, 4 deletions

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt
index b537c0b..b5ed78d 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt
@@ -21,7 +21,7 @@ import android.util.Log
 import androidx.lifecycle.*
 import com.mousebird.maply.Point2d
 import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import mx.trackermap.TrackerMap.client.models.Geofence
 import mx.trackermap.TrackerMap.client.models.MapLayer
@@ -87,14 +87,14 @@ class UnitsViewModel(
     }
 
     private suspend fun setupUnitsObserver() {
-        unitsController.displayedUnitsFlow.collect { units ->
+        (unitsController.displayedUnitsFlow as StateFlow<List<UnitInformation>>).collect { units ->
             Log.d("UnitsViewModel", "Collecting units")
             this._displayedUnits.value = units
         }
     }
 
     private suspend fun setupDisplayedUnitsObserver() {
-        unitsController.unitsFlow.collect { units ->
+        (unitsController.unitsFlow as StateFlow<List<UnitInformation>>).collect { units ->
             Log.d("UnitsViewModel", "Collecting displayed units")
             this._units.value = units
             updateSelectedUnit()
@@ -102,7 +102,7 @@ class UnitsViewModel(
     }
 
     private suspend fun setupGeofenceObserver() {
-        geofenceController.geofencesFlow.collect {
+        (geofenceController.geofencesFlow as StateFlow<Map<Int, Geofence>>).collect {
             Log.d("UnitsViewModel", "Collecting geofences")
             this._geofences.postValue(it)
         }