From 266d04384bb49092697eaceca8a70310ba3a5e28 Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Wed, 16 Jun 2021 13:11:56 +0200
Subject: [PATCH] Fix DCC request screen abort dialog actions. (#3466)

Canceling the dialog (negative action) stays on screen.
Confirming the dialog (positive action) aborts the registration and sends the user back to the home screen.
---
 .../covidcertificate/RequestCovidCertificateFragment.kt     | 2 +-
 .../src/main/res/values-de/green_certificate_strings.xml    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/covidcertificate/RequestCovidCertificateFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/covidcertificate/RequestCovidCertificateFragment.kt
index 40f21e02a..b3e85a787 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/covidcertificate/RequestCovidCertificateFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/covidcertificate/RequestCovidCertificateFragment.kt
@@ -118,7 +118,7 @@ class RequestCovidCertificateFragment : Fragment(R.layout.fragment_request_covid
     private fun showCloseDialog() = MaterialAlertDialogBuilder(requireContext())
         .setTitle(R.string.request_gc_dialog_title)
         .setMessage(R.string.request_gc_dialog_message)
-        .setNegativeButton(R.string.request_gc_dialog_negative_button) { _, _ -> viewModel.navigateBack() }
+        .setNegativeButton(R.string.request_gc_dialog_negative_button) { _, _ -> }
         .setPositiveButton(R.string.request_gc_dialog_positive_button) { _, _ -> viewModel.navigateToHomeScreen() }
         .create()
         .show()
diff --git a/Corona-Warn-App/src/main/res/values-de/green_certificate_strings.xml b/Corona-Warn-App/src/main/res/values-de/green_certificate_strings.xml
index 530381266..6c5711aae 100644
--- a/Corona-Warn-App/src/main/res/values-de/green_certificate_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/green_certificate_strings.xml
@@ -22,10 +22,10 @@
     <string name="request_gc_dialog_title">Registrierung abbrechen</string>
     <!-- XTXT: Request green certificate exit dialog message -->
     <string name="request_gc_dialog_message">Wenn Sie die Test-Registrierung abbrechen, können Sie Ihr Testergebnis nicht in der App erhalten.</string>
+    <!-- XBUT: Request green certificate exit dialog positive button -->
+    <string name="request_gc_dialog_positive_button">Registrierung abbrechen</string>
     <!-- XBUT: Request green certificate exit dialog negative button -->
-    <string name="request_gc_dialog_positive_button">OK</string>
-    <!-- XBUT: Request green certificate exit dialog negative button -->
-    <string name="request_gc_dialog_negative_button">Abbrechen</string>
+    <string name="request_gc_dialog_negative_button">Registrierung fortsetzen</string>
     <!-- XTXT: Detail green certificate title -->
     <string name="detail_green_certificate_title">EU Digitales COVID-Testzertifikat</string>
     <!-- XTXT: Detail green certificate test type -->
-- 
GitLab