Skip to content
Snippets Groups Projects
Unverified Commit 0d5657ed authored by Mohamed's avatar Mohamed Committed by GitHub
Browse files

Move hiding the dialog before nav events (#2508)

parent c2b94147
No related branches found
Tags v1.13.0-RC8
No related merge requests found
...@@ -42,43 +42,41 @@ class SubmissionTestResultAvailableViewModel @AssistedInject constructor( ...@@ -42,43 +42,41 @@ class SubmissionTestResultAvailableViewModel @AssistedInject constructor(
override fun onTEKAvailable(teks: List<TemporaryExposureKey>) { override fun onTEKAvailable(teks: List<TemporaryExposureKey>) {
Timber.d("onTEKAvailable(teks.size=%d)", teks.size) Timber.d("onTEKAvailable(teks.size=%d)", teks.size)
autoSubmission.updateMode(AutoSubmission.Mode.MONITOR) autoSubmission.updateMode(AutoSubmission.Mode.MONITOR)
showKeysRetrievalProgress.postValue(false)
routeToScreen.postValue( routeToScreen.postValue(
SubmissionTestResultAvailableFragmentDirections SubmissionTestResultAvailableFragmentDirections
.actionSubmissionTestResultAvailableFragmentToSubmissionTestResultConsentGivenFragment() .actionSubmissionTestResultAvailableFragmentToSubmissionTestResultConsentGivenFragment()
) )
showKeysRetrievalProgress.postValue(false)
} }
override fun onTEKPermissionDeclined() { override fun onTEKPermissionDeclined() {
Timber.d("onTEKPermissionDeclined") Timber.d("onTEKPermissionDeclined")
showKeysRetrievalProgress.postValue(false)
routeToScreen.postValue( routeToScreen.postValue(
SubmissionTestResultAvailableFragmentDirections SubmissionTestResultAvailableFragmentDirections
.actionSubmissionTestResultAvailableFragmentToSubmissionTestResultNoConsentFragment() .actionSubmissionTestResultAvailableFragmentToSubmissionTestResultNoConsentFragment()
) )
showKeysRetrievalProgress.postValue(false)
} }
override fun onTracingConsentRequired(onConsentResult: (given: Boolean) -> Unit) { override fun onTracingConsentRequired(onConsentResult: (given: Boolean) -> Unit) {
Timber.d("onTracingConsentRequired") Timber.d("onTracingConsentRequired")
showTracingConsentDialog.postValue(onConsentResult)
showKeysRetrievalProgress.postValue(false) showKeysRetrievalProgress.postValue(false)
showTracingConsentDialog.postValue(onConsentResult)
} }
override fun onPermissionRequired(permissionRequest: (Activity) -> Unit) { override fun onPermissionRequired(permissionRequest: (Activity) -> Unit) {
Timber.d("onPermissionRequired") Timber.d("onPermissionRequired")
showPermissionRequest.postValue(permissionRequest)
showKeysRetrievalProgress.postValue(false) showKeysRetrievalProgress.postValue(false)
showPermissionRequest.postValue(permissionRequest)
} }
override fun onError(error: Throwable) { override fun onError(error: Throwable) {
Timber.e(error, "Failed to update TEKs.") Timber.e(error, "Failed to update TEKs.")
showKeysRetrievalProgress.postValue(false)
error.report( error.report(
exceptionCategory = ExceptionCategory.EXPOSURENOTIFICATION, exceptionCategory = ExceptionCategory.EXPOSURENOTIFICATION,
prefix = "SubmissionTestResultAvailableViewModel" prefix = "SubmissionTestResultAvailableViewModel"
) )
showKeysRetrievalProgress.postValue(false)
} }
} }
) )
......
...@@ -100,8 +100,8 @@ class SubmissionResultPositiveOtherWarningNoConsentViewModel @AssistedInject con ...@@ -100,8 +100,8 @@ class SubmissionResultPositiveOtherWarningNoConsentViewModel @AssistedInject con
tekHistoryUpdater.updateTEKHistoryOrRequestPermission() tekHistoryUpdater.updateTEKHistoryOrRequestPermission()
} else { } else {
Timber.d("showEnableTracingEvent:Unit") Timber.d("showEnableTracingEvent:Unit")
showEnableTracingEvent.postValue(Unit)
showKeysRetrievalProgress.postValue(false) showKeysRetrievalProgress.postValue(false)
showEnableTracingEvent.postValue(Unit)
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment