Improved observer management

1 files changed, 16 insertions, 1 deletions

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt
index cd8d7af..9d12608 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt
@@ -42,10 +42,21 @@ class UnitCommandsFragment: Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         binding.reportLoading.root.visibility = View.VISIBLE
-        setupObservers()
         setupEvents()
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        setupObservers()
+    }
+
+    override fun onStop() {
+        super.onStop()
+
+        removeObservers()
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
@@ -86,6 +97,10 @@ class UnitCommandsFragment: Fragment() {
         unitCommandsViewModel.fetchCommands(id)
     }
 
+    private fun removeObservers() {
+        unitCommandsViewModel.commands.removeObservers(viewLifecycleOwner)
+    }
+
     private fun setupEvents() {
         binding.commandsList.setOnItemClickListener { _, _, index, _ ->
             Log.d("UnitCommandsFragment", "Selected item at index - $index")