@@ -80,7 +80,7 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
80
80
private var currentLocation: Location ? = null
81
81
private val locationPermissionLauncher: ActivityResultLauncher <Array <String >> =
82
82
registerForActivityResult(ActivityResultContracts .RequestMultiplePermissions ()) {
83
- permissions: Map <String , Boolean > ->
83
+ permissions: Map <String , Boolean > ->
84
84
PermissionUtils .getLocationPermissionLauncher(
85
85
permissions = permissions,
86
86
onFineLocationPermissionGranted = { fetchLocation() },
@@ -96,7 +96,7 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
96
96
97
97
private val activityResultLauncher: ActivityResultLauncher <Intent > =
98
98
registerForActivityResult(ActivityResultContracts .StartActivityForResult ()) {
99
- activityResult: ActivityResult ->
99
+ activityResult: ActivityResult ->
100
100
if (activityResult.resultCode == Activity .RESULT_OK ) {
101
101
fetchLocation()
102
102
}
@@ -174,8 +174,8 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
174
174
175
175
if (
176
176
currentLocation == null &&
177
- LocationUtils .isLocationEnabled(this ) &&
178
- PermissionUtils .hasLocationPermissions(this )
177
+ LocationUtils .isLocationEnabled(this ) &&
178
+ PermissionUtils .hasLocationPermissions(this )
179
179
) {
180
180
fetchLocation()
181
181
}
@@ -197,12 +197,12 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
197
197
try {
198
198
currentLocation =
199
199
async(dispatcherProvider.io()) {
200
- if (highAccuracy) {
201
- LocationUtils .getAccurateLocation(fusedLocationClient)
202
- } else {
203
- LocationUtils .getApproximateLocation(fusedLocationClient)
204
- }
200
+ if (highAccuracy) {
201
+ LocationUtils .getAccurateLocation(fusedLocationClient)
202
+ } else {
203
+ LocationUtils .getApproximateLocation(fusedLocationClient)
205
204
}
205
+ }
206
206
.await()
207
207
} catch (e: Exception ) {
208
208
Timber .e(e, " Failed to get GPS location for questionnaire: ${questionnaireConfig.id} " )
@@ -245,9 +245,9 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
245
245
246
246
val questionnaireFragment =
247
247
getQuestionnaireFragmentBuilder(
248
- questionnaire = questionnaire!! ,
249
- questionnaireConfig = questionnaireConfig,
250
- )
248
+ questionnaire = questionnaire!! ,
249
+ questionnaireConfig = questionnaireConfig,
250
+ )
251
251
.build()
252
252
viewBinding.clearAll.setOnClickListener { questionnaireFragment.clearAllAnswers() }
253
253
supportFragmentManager.commit {
@@ -360,7 +360,7 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
360
360
confirmButtonListener = {
361
361
lifecycleScope.launch {
362
362
retrieveQuestionnaireResponse()?.let { questionnaireResponse ->
363
- viewModel.saveDraftQuestionnaire(questionnaireResponse)
363
+ viewModel.saveDraftQuestionnaire(questionnaireResponse, questionnaireConfig )
364
364
finish()
365
365
}
366
366
}
@@ -409,4 +409,4 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
409
409
Pair (QUESTIONNAIRE_ACTION_PARAMETERS , actionParams),
410
410
)
411
411
}
412
- }
412
+ }
0 commit comments