diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableViewModel.kt index 89e79f6b9d6cf2ddfcb3d1dd0e091b7bf008d8b7..8773898fd2c16bd2a4022a7029a96c5ab6ea7f91 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableViewModel.kt @@ -42,43 +42,41 @@ class SubmissionTestResultAvailableViewModel @AssistedInject constructor( override fun onTEKAvailable(teks: List<TemporaryExposureKey>) { Timber.d("onTEKAvailable(teks.size=%d)", teks.size) autoSubmission.updateMode(AutoSubmission.Mode.MONITOR) - + showKeysRetrievalProgress.postValue(false) routeToScreen.postValue( SubmissionTestResultAvailableFragmentDirections .actionSubmissionTestResultAvailableFragmentToSubmissionTestResultConsentGivenFragment() ) - - showKeysRetrievalProgress.postValue(false) } override fun onTEKPermissionDeclined() { Timber.d("onTEKPermissionDeclined") + showKeysRetrievalProgress.postValue(false) routeToScreen.postValue( SubmissionTestResultAvailableFragmentDirections .actionSubmissionTestResultAvailableFragmentToSubmissionTestResultNoConsentFragment() ) - showKeysRetrievalProgress.postValue(false) } override fun onTracingConsentRequired(onConsentResult: (given: Boolean) -> Unit) { Timber.d("onTracingConsentRequired") - showTracingConsentDialog.postValue(onConsentResult) showKeysRetrievalProgress.postValue(false) + showTracingConsentDialog.postValue(onConsentResult) } override fun onPermissionRequired(permissionRequest: (Activity) -> Unit) { Timber.d("onPermissionRequired") - showPermissionRequest.postValue(permissionRequest) showKeysRetrievalProgress.postValue(false) + showPermissionRequest.postValue(permissionRequest) } override fun onError(error: Throwable) { Timber.e(error, "Failed to update TEKs.") + showKeysRetrievalProgress.postValue(false) error.report( exceptionCategory = ExceptionCategory.EXPOSURENOTIFICATION, prefix = "SubmissionTestResultAvailableViewModel" ) - showKeysRetrievalProgress.postValue(false) } } ) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentViewModel.kt index c02bbe34e37c171ee8e060def68fd83f9e4362d9..ef9b2862279d4622c0dc57ef19b09c98f162bddf 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentViewModel.kt @@ -100,8 +100,8 @@ class SubmissionResultPositiveOtherWarningNoConsentViewModel @AssistedInject con tekHistoryUpdater.updateTEKHistoryOrRequestPermission() } else { Timber.d("showEnableTracingEvent:Unit") - showEnableTracingEvent.postValue(Unit) showKeysRetrievalProgress.postValue(false) + showEnableTracingEvent.postValue(Unit) } } }