[Hot Fix] Initial commit (#3720)

* Initial commit * Update AppMainActivity.kt * Update AppMainActivity.kt
opensrp · Feb 26, 2025 · a683dfb · a683dfb
1 parent 316ccf2
commit a683dfb
Showing 1 changed file with 21 additions and 17 deletions.
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
@@ -89,7 +89,7 @@ open class AppMainActivity : BaseMultiLanguageActivity(), QuestionnaireHandler,
 
   private val locationPermissionLauncher: ActivityResultLauncher<Array<String>> =
     registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) {
-      permissions: Map<String, Boolean> ->
+        permissions: Map<String, Boolean> ->
       PermissionUtils.getLocationPermissionLauncher(
         permissions = permissions,
         onFineLocationPermissionGranted = { fetchLocation() },
@@ -107,12 +107,12 @@ open class AppMainActivity : BaseMultiLanguageActivity(), QuestionnaireHandler,
 
   override val startForResult =
     registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-      activityResult: ActivityResult ->
+        activityResult: ActivityResult ->
       val onResultType = activityResult.data?.extras?.getString(ON_RESULT_TYPE)
       if (
         activityResult.resultCode == Activity.RESULT_OK &&
-          !onResultType.isNullOrBlank() &&
-          ActivityOnResultType.valueOf(onResultType) == ActivityOnResultType.QUESTIONNAIRE
+        !onResultType.isNullOrBlank() &&
+        ActivityOnResultType.valueOf(onResultType) == ActivityOnResultType.QUESTIONNAIRE
       ) {
         lifecycleScope.launch { onSubmitQuestionnaire(activityResult) }
       }
@@ -147,6 +147,8 @@ open class AppMainActivity : BaseMultiLanguageActivity(), QuestionnaireHandler,
             setStartDestination(startDestination)
           }
         }
+      findViewById<View>(R.id.mainScreenProgressBar).apply { visibility = View.GONE }
+      findViewById<View>(R.id.mainScreenProgressBarText).apply { visibility = View.GONE }
 
       appMainViewModel.run {
         navController.setGraph(graph, getStartDestinationArgs())
@@ -156,9 +158,6 @@ open class AppMainActivity : BaseMultiLanguageActivity(), QuestionnaireHandler,
 
       setupLocationServices()
       overrideOnBackPressListener()
-
-      findViewById<View>(R.id.mainScreenProgressBar).apply { visibility = View.GONE }
-      findViewById<View>(R.id.mainScreenProgressBarText).apply { visibility = View.GONE }
     }
   }
 
@@ -184,14 +183,14 @@ open class AppMainActivity : BaseMultiLanguageActivity(), QuestionnaireHandler,
     if (activityResult.resultCode == RESULT_OK) {
       val questionnaireResponse: QuestionnaireResponse? =
         activityResult.data?.serializable(QuestionnaireActivity.QUESTIONNAIRE_RESPONSE)
-          as QuestionnaireResponse?
+                as QuestionnaireResponse?
       val extractedResourceIds =
         activityResult.data?.serializable(
           QuestionnaireActivity.QUESTIONNAIRE_SUBMISSION_EXTRACTED_RESOURCE_IDS,
         ) as List<IdType>? ?: emptyList()
       val questionnaireConfig =
         activityResult.data?.parcelable(QuestionnaireActivity.QUESTIONNAIRE_CONFIG)
-          as QuestionnaireConfig?
+                as QuestionnaireConfig?
 
       if (questionnaireConfig != null && questionnaireResponse != null) {
         eventBus.triggerEvent(
@@ -254,18 +253,23 @@ open class AppMainActivity : BaseMultiLanguageActivity(), QuestionnaireHandler,
     lifecycleScope.launch {
       val retrievedLocation =
         async(dispatcherProvider.io()) {
-            when {
-              PermissionUtils.hasFineLocationPermissions(context) ->
-                LocationUtils.getAccurateLocation(fusedLocationClient)
-              PermissionUtils.hasCoarseLocationPermissions(context) ->
-                LocationUtils.getApproximateLocation(fusedLocationClient)
-              else -> null
-            }
+          when {
+            PermissionUtils.hasFineLocationPermissions(context) ->
+              LocationUtils.getAccurateLocation(fusedLocationClient)
+            PermissionUtils.hasCoarseLocationPermissions(context) ->
+              LocationUtils.getApproximateLocation(fusedLocationClient)
+            else -> null
           }
+        }
           .await()
           ?.also {
             protoDataStore.writeLocationCoordinates(
-              LocationCoordinate(it.latitude, it.longitude, it.altitude, Instant.now()),
+              LocationCoordinate(
+                  latitude = it.latitude,
+                  longitude = it.longitude,
+                  altitude = it.altitude,
+                  timeStamp = Instant.now(),
+              ),
             )
           }