aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-01-18 10:59:06 -0600
committerIván Ávalos <avalos@disroot.org>2022-01-18 10:59:06 -0600
commitb03d791c7e89380134a68ca34724e9f02bdccfe4 (patch)
tree65e7d4afe4226f362c6832beb3919faf05b977e0
parent4b0e3482beca1af79cbc23001612574f052342f5 (diff)
downloadetbsa-trackermap-mobile-b03d791c7e89380134a68ca34724e9f02bdccfe4.tar.gz
etbsa-trackermap-mobile-b03d791c7e89380134a68ca34724e9f02bdccfe4.tar.bz2
etbsa-trackermap-mobile-b03d791c7e89380134a68ca34724e9f02bdccfe4.zip
Fixed geofences retrieval in reports and lifecycle issue with unit details fragment
-rw-r--r--androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt12
-rw-r--r--shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/ReportController.kt2
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<EventInformation>()
eventsResult.forEach { event ->