Add CALCULATE_DISTANCE_RULE_EXECUTOR LocationLogOption to app config (#…

…3276) - Add check for LocationLogOptions entry to AppMainActivity's setupLocationServices Co-authored-by: Lentumunai Mark <[email protected]>
opensrp · May 28, 2024 · 1d82052 · 1d82052
1 parent 1fbb783
commit 1d82052
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/...main/java/org/smartregister/fhircore/engine/configuration/app/ApplicationConfiguration.kt b/...main/java/org/smartregister/fhircore/engine/configuration/app/ApplicationConfiguration.kt
@@ -59,4 +59,5 @@ enum class SyncStrategy {
 
 enum class LocationLogOptions {
   QUESTIONNAIRE,
+  CALCULATE_DISTANCE_RULE_EXECUTOR,
 }
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt
@@ -46,6 +46,7 @@ import org.hl7.fhir.r4.model.IdType
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.configuration.app.ConfigService
+import org.smartregister.fhircore.engine.configuration.app.LocationLogOptions
 import org.smartregister.fhircore.engine.configuration.app.SyncStrategy
 import org.smartregister.fhircore.engine.configuration.workflow.ActionTrigger
 import org.smartregister.fhircore.engine.datastore.ProtoDataStore
@@ -218,18 +219,24 @@ open class AppMainActivity : BaseMultiLanguageActivity(), QuestionnaireHandler,
   }
 
   private fun setupLocationServices() {
-    fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)
+    if (
+      appMainViewModel.applicationConfiguration.logGpsLocation.contains(
+        LocationLogOptions.CALCULATE_DISTANCE_RULE_EXECUTOR,
+      )
+    ) {
+      fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)
 
-    if (!LocationUtils.isLocationEnabled(this)) {
-      openLocationServicesSettings()
-    }
+      if (!LocationUtils.isLocationEnabled(this)) {
+        openLocationServicesSettings()
+      }
 
-    if (!hasLocationPermissions()) {
-      launchLocationPermissionsDialog()
-    }
+      if (!hasLocationPermissions()) {
+        launchLocationPermissionsDialog()
+      }
 
-    if (LocationUtils.isLocationEnabled(this) && hasLocationPermissions()) {
-      fetchLocation()
+      if (LocationUtils.isLocationEnabled(this) && hasLocationPermissions()) {
+        fetchLocation()
+      }
     }
   }
 

diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/main/AppMainActivityTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/main/AppMainActivityTest.kt
@@ -51,7 +51,6 @@ import org.smartregister.fhircore.engine.configuration.ConfigurationRegistry
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.task.FhirCarePlanGenerator
 import org.smartregister.fhircore.engine.util.SharedPreferenceKey
-import org.smartregister.fhircore.engine.util.extension.second
 import org.smartregister.fhircore.quest.app.fakes.Faker
 import org.smartregister.fhircore.quest.event.AppEvent
 import org.smartregister.fhircore.quest.event.EventBus
@@ -85,8 +84,8 @@ class AppMainActivityTest : ActivityRobolectricTest() {
   fun testActivityIsStartedCorrectly() {
     Assert.assertNotNull(appMainActivity)
     val fragments = appMainActivity.supportFragmentManager.fragments
-    Assert.assertEquals(2, fragments.size)
-    Assert.assertTrue(fragments.second() is NavHostFragment)
+    Assert.assertEquals(1, fragments.size)
+    Assert.assertTrue(fragments.first() is NavHostFragment)
   }
 
   override fun getActivity(): Activity {