Fixes issues

- Fixes the logout problem that don't let users sign in again
- Fixes the search bug

1 files changed, 20 insertions, 8 deletions

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt
index fc417a0..30e3cea 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt
@@ -1,29 +1,23 @@
 package mx.trackermap.TrackerMap.android.map
 
 import android.content.Intent
-import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import kotlinx.coroutines.DelicateCoroutinesApi
 import mx.trackermap.TrackerMap.android.R
 import mx.trackermap.TrackerMap.android.databinding.UnitMapFragmentBinding
 import mx.trackermap.TrackerMap.android.details.DetailsActivity
 import mx.trackermap.TrackerMap.android.devices.Action
 import mx.trackermap.TrackerMap.android.devices.UnitRenderData
+import mx.trackermap.TrackerMap.android.units.UnitFragment
 import mx.trackermap.TrackerMap.android.units.UnitsViewModel
 import mx.trackermap.TrackerMap.client.models.UnitInformation
-import mx.trackermap.TrackerMap.utils.Formatter
-import mx.trackermap.TrackerMap.utils.SpeedUnit
-import org.koin.androidx.viewmodel.ext.android.viewModel
 
 @DelicateCoroutinesApi
-class UnitMapFragment : Fragment() {
-
-    private val unitsViewModel: UnitsViewModel by viewModel()
+class UnitMapFragment(private val unitsViewModel: UnitsViewModel) : UnitFragment(unitsViewModel) {
 
     private var _binding: UnitMapFragmentBinding? = null
     private val binding get() = _binding!!
@@ -42,9 +36,20 @@ class UnitMapFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         initializeMap()
+    }
+
+    override fun onResume() {
+        super.onResume()
+
         setupObservers()
     }
 
+    override fun onPause() {
+        super.onPause()
+
+        removeObservers()
+    }
+
     private fun initializeMap() {
         unitsMapFragment = childFragmentManager.findFragmentById(R.id.unitsMap) as MapFragment
         unitsMapFragment.markerCallback = unitsViewModel::selectUnitWith
@@ -93,6 +98,13 @@ class UnitMapFragment : Fragment() {
         }
     }
 
+    private fun removeObservers() {
+        Log.d("MapFragment", "removeObservers()")
+        unitsViewModel.units.removeObservers(viewLifecycleOwner)
+        unitsViewModel.selectedUnit.removeObservers(viewLifecycleOwner)
+        unitsViewModel.geofences.removeObservers(viewLifecycleOwner)
+    }
+
     private fun itemAction(unit: UnitInformation, action: Action) {
         when (action) {
             Action.DETAILS, Action.REPORTS, Action.COMMANDS -> {