Merge branch 'release/1.14.x' into release/1.15.x

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableViewModel.kt

@@ -46,28 +46,28 @@ class SubmissionTestResultAvailableViewModel @AssistedInject constructor(
                         .actionSubmissionTestResultAvailableFragmentToSubmissionTestResultConsentGivenFragment()
                 )
 
-            showKeysRetrievalProgress.postValue(false)
+                showKeysRetrievalProgress.postValue(false)
             }
 
             override fun onTEKPermissionDeclined() {
-            Timber.d("onTEKPermissionDeclined")
+                Timber.d("onTEKPermissionDeclined")
                 routeToScreen.postValue(
                     SubmissionTestResultAvailableFragmentDirections
                         .actionSubmissionTestResultAvailableFragmentToSubmissionTestResultNoConsentFragment()
                 )
-            showKeysRetrievalProgress.postValue(false)
+                showKeysRetrievalProgress.postValue(false)
             }
 
             override fun onTracingConsentRequired(onConsentResult: (given: Boolean) -> Unit) {
-            Timber.d("onTracingConsentRequired")
+                Timber.d("onTracingConsentRequired")
                 showTracingConsentDialog.postValue(onConsentResult)
-            showKeysRetrievalProgress.postValue(false)
+                showKeysRetrievalProgress.postValue(false)
             }
 
             override fun onPermissionRequired(permissionRequest: (Activity) -> Unit) {
-            Timber.d("onPermissionRequired")
+                Timber.d("onPermissionRequired")
                 showPermissionRequest.postValue(permissionRequest)
-            showKeysRetrievalProgress.postValue(false)
+                showKeysRetrievalProgress.postValue(false)
             }
 
             override fun onError(error: Throwable) {
@@ -76,7 +76,7 @@ class SubmissionTestResultAvailableViewModel @AssistedInject constructor(
                     exceptionCategory = ExceptionCategory.EXPOSURENOTIFICATION,
                     prefix = "SubmissionTestResultAvailableViewModel"
                 )
-            showKeysRetrievalProgress.postValue(false)
+                showKeysRetrievalProgress.postValue(false)
             }
         }
     )

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentViewModel.kt

@@ -48,7 +48,7 @@ class SubmissionResultPositiveOtherWarningNoConsentViewModel @AssistedInject con
             override fun onTEKAvailable(teks: List<TemporaryExposureKey>) {
                 Timber.d("onTEKAvailable(tek.size=%d)", teks.size)
                 autoSubmission.updateMode(AutoSubmission.Mode.MONITOR)
-            showKeysRetrievalProgress.postValue(false)
+                showKeysRetrievalProgress.postValue(false)
                 routeToScreen.postValue(
                     SubmissionResultPositiveOtherWarningNoConsentFragmentDirections
                         .actionSubmissionResultPositiveOtherWarningNoConsentFragmentToSubmissionResultReadyFragment()
@@ -56,26 +56,26 @@ class SubmissionResultPositiveOtherWarningNoConsentViewModel @AssistedInject con
             }
 
             override fun onTEKPermissionDeclined() {
-            Timber.d("onTEKPermissionDeclined")
-            showKeysRetrievalProgress.postValue(false)
+                Timber.d("onTEKPermissionDeclined")
+                showKeysRetrievalProgress.postValue(false)
                 // stay on screen
             }
 
             override fun onTracingConsentRequired(onConsentResult: (given: Boolean) -> Unit) {
-            Timber.d("onTracingConsentRequired")
-            showKeysRetrievalProgress.postValue(false)
+                Timber.d("onTracingConsentRequired")
+                showKeysRetrievalProgress.postValue(false)
                 showTracingConsentDialog.postValue(onConsentResult)
             }
 
             override fun onPermissionRequired(permissionRequest: (Activity) -> Unit) {
-            Timber.d("onPermissionRequired")
-            showKeysRetrievalProgress.postValue(false)
+                Timber.d("onPermissionRequired")
+                showKeysRetrievalProgress.postValue(false)
                 showPermissionRequest.postValue(permissionRequest)
             }
 
             override fun onError(error: Throwable) {
                 Timber.e(error, "Couldn't access temporary exposure key history.")
-            showKeysRetrievalProgress.postValue(false)
+                showKeysRetrievalProgress.postValue(false)
                 error.report(ExceptionCategory.EXPOSURENOTIFICATION, "Failed to obtain TEKs.")
             }
         }