From 1ae88ebb15a8bc2f43953bae73cd3eab91574d18 Mon Sep 17 00:00:00 2001
From: Alex Paulescu <alex.paulescu@gmail.com>
Date: Wed, 19 May 2021 10:47:59 +0300
Subject: [PATCH] Fix Datenabruf dialog not dismissed when completing
 submission (EXPOSUREAPP-7105) (#3204)

* Removed coroutine scope as it wasn't being used.

* Failsafe to dismiss the "Datenabruf" dialog before navigating to a different screen.

* Tests were complaining.

Co-authored-by: Mohamed Metwalli <mohamed.metwalli@sap.com>
---
 .../symptoms/calendar/SubmissionSymptomCalendarFragment.kt       | 1 +
 .../introduction/SubmissionSymptomIntroductionFragment.kt        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarFragment.kt
index 5c2bac135..937971aba 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarFragment.kt
@@ -57,6 +57,7 @@ class SubmissionSymptomCalendarFragment :
         }
 
         viewModel.routeToScreen.observe2(this) {
+            uploadDialog.setState(show = false)
             doNavigate(it)
         }
 
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionFragment.kt
index 0a60e95c2..ebed31ec0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionFragment.kt
@@ -49,6 +49,7 @@ class SubmissionSymptomIntroductionFragment :
         uploadDialog = SubmissionBlockingDialog(requireContext())
 
         viewModel.navigation.observe2(this) {
+            uploadDialog.setState(show = false)
             doNavigate(it)
         }
 
-- 
GitLab