From 269f3454d128237e82cbb57dac77c58ab7423aaf Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Tue, 18 Jan 2022 10:59:06 -0600 Subject: Fixed geofences retrieval in reports and lifecycle issue with unit details fragment --- .../android/details/information/UnitInformationFragment.kt | 12 +----------- .../mx/trackermap/TrackerMap/controllers/ReportController.kt | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt index f046ccc..7966c5b 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt @@ -48,22 +48,12 @@ class UnitInformationFragment : Fragment() { super.onViewCreated(view, savedInstanceState) fetchInformation() - } - - override fun onResume() { - super.onResume() - setupObservers() } - override fun onStop() { - super.onStop() - - removeObservers() - } - override fun onDestroyView() { super.onDestroyView() + removeObservers() _binding = null } diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/ReportController.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/ReportController.kt index 78f0173..fcde002 100644 --- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/ReportController.kt +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/ReportController.kt @@ -95,7 +95,7 @@ class ReportController( val eventsResult = reportsApi.reportsEventsGet( from, to, EventInformation.reportTypesToStrings(types), deviceId ) - val geofencesResult = geofencesApi.geofencesGet(all = true) + val geofencesResult = geofencesApi.geofencesGet() val result = mutableListOf() eventsResult.forEach { event -> -- cgit v1.2.3