From e5483adc94639a3e1d3e6c0ce3d4cf96c2f9af53 Mon Sep 17 00:00:00 2001
From: oemerb <66002424+oemerb@users.noreply.github.com>
Date: Tue, 9 Jun 2020 13:05:17 +0200
Subject: [PATCH 1/3] update to 0.8.11 (#309)

---
 Corona-Warn-App/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Corona-Warn-App/build.gradle b/Corona-Warn-App/build.gradle
index e257ecb71f7..ce5966c43c4 100644
--- a/Corona-Warn-App/build.gradle
+++ b/Corona-Warn-App/build.gradle
@@ -32,8 +32,8 @@ android {
         applicationId 'de.rki.coronawarnapp'
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 17
-        versionName "0.8.10"
+        versionCode 18
+        versionName "0.8.11"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField "String", "DOWNLOAD_CDN_URL", "\"$DOWNLOAD_CDN_URL\""

From 0629e45f398f8150079e1f503d4bd5e41e77b254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20M=C3=B6ller?= <jakob.moeller@sap.com>
Date: Tue, 9 Jun 2020 13:07:47 +0200
Subject: [PATCH 2/3] hard code prod urls (#310)

Signed-off-by: d067928 <jakob.moeller@sap.com>
---
 Corona-Warn-App/build.gradle | 22 ----------------------
 gradle.properties            |  7 +++----
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/Corona-Warn-App/build.gradle b/Corona-Warn-App/build.gradle
index ce5966c43c4..44a518a78df 100644
--- a/Corona-Warn-App/build.gradle
+++ b/Corona-Warn-App/build.gradle
@@ -41,28 +41,6 @@ android {
         buildConfigField "String", "VERIFICATION_CDN_URL", "\"$VERIFICATION_CDN_URL\""
         buildConfigField "String", "EXPORT_SIGNATURE_ID", "\"de.rki.coronawarnapp\""
 
-        //override URLs with local variables
-        Properties properties = new Properties()
-        def propertiesFile = project.rootProject.file('local.properties')
-        if (propertiesFile.exists()) {
-            properties.load(propertiesFile.newDataInputStream())
-            def secretFile = project.rootProject.file('secrets.properties')
-            if (secretFile.exists())
-                properties.load(secretFile.newDataInputStream())
-
-            def DOWNLOAD_CDN_URL = properties.getProperty('DOWNLOAD_CDN_URL')
-            if (DOWNLOAD_CDN_URL)
-                buildConfigField "String", "DOWNLOAD_CDN_URL", "\"$DOWNLOAD_CDN_URL\""
-
-            def SUBMISSION_CDN_URL = properties.getProperty('SUBMISSION_CDN_URL')
-            if (SUBMISSION_CDN_URL)
-                buildConfigField "String", "SUBMISSION_CDN_URL", "\"$SUBMISSION_CDN_URL\""
-
-            def VERIFICATION_CDN_URL = properties.getProperty('VERIFICATION_CDN_URL')
-            if (VERIFICATION_CDN_URL)
-                buildConfigField "String", "VERIFICATION_CDN_URL", "\"$VERIFICATION_CDN_URL\""
-        }
-
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments += ["room.schemaLocation": "$projectDir/schemas".toString()]
diff --git a/gradle.properties b/gradle.properties
index c7bc7c857a2..161b7084664 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,6 @@ android.useAndroidX=true
 org.gradle.parallel=true
 org.gradle.dependency.verification.console=verbose
 # Variables for Server URLs. The variables in local.properties will override these
-SUBMISSION_CDN_URL=
-DOWNLOAD_CDN_URL=
-VERIFICATION_CDN_URL=
-TRUSTED_CERTS_EXPORT_KEYSTORE_PW=
\ No newline at end of file
+SUBMISSION_CDN_URL=https://submission-cff4f7147260.coronawarn.app
+DOWNLOAD_CDN_URL=https://svc90.main.px.t-online.de
+VERIFICATION_CDN_URL=https://verification-ae90d11f.coronawarn.app
\ No newline at end of file

From eed97ff7e9bfa513df88e78812bb99f8b35965f8 Mon Sep 17 00:00:00 2001
From: Fabian-K <fabian.kajzar@sap.com>
Date: Tue, 9 Jun 2020 14:16:38 +0200
Subject: [PATCH 3/3] - missing translation tags for submission added (#302)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
---
 Corona-Warn-App/src/main/res/values-de/strings.xml | 10 ----------
 Corona-Warn-App/src/main/res/values-en/strings.xml | 10 ----------
 Corona-Warn-App/src/main/res/values/strings.xml    | 12 +-----------
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml
index e137eabc057..cfa05b1926b 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -518,12 +518,6 @@
     <string name="submission_qr_code_scan_permission_rationale_dialog_button_positive">"Erlauben"</string>
     <string name="submission_qr_code_scan_permission_rationale_dialog_button_negative">"Nicht erlauben"</string>
 
-    <!-- QR Code Scan Successful Dialog -->
-    <string name="submission_qr_code_scan_successful_dialog_headline">"Scan erfolgreich"</string>
-    <string name="submission_qr_code_scan_successful_dialog_body">"Der QR-Code wurde erfolgreich gescannt."</string>
-    <string name="submission_qr_code_scan_successful_dialog_button_positive">"Registrieren"</string>
-    <string name="submission_qr_code_scan_successful_dialog_button_negative">"Abbrechen"</string>
-
     <!-- QR Code Scan Invalid Dialog -->
     <string name="submission_qr_code_scan_invalid_dialog_headline">"Falscher QR-Code"</string>
     <string name="submission_qr_code_scan_invalid_dialog_body">"Es scheint, dass der falsche QR-Code gescannt wurde."</string>
@@ -534,10 +528,6 @@
     <!-- YTXT: instruction text for QR code scanning  -->
     <string name="submission_qr_code_scan_body">"Positionieren Sie den QR-Code in den Rahmen"</string>
 
-    <!-- Register Device Screen -->
-    <string name="submission_register_device_headline">"Gerät registrieren"</string>
-    <string name="submission_register_device_body">@string/lorem_ipsum</string>
-
     <!-- Submission Test Result -->
     <!-- XHED: Page headline for test result  -->
     <string name="submission_test_result_headline">"Test-Ergebnis"</string>
diff --git a/Corona-Warn-App/src/main/res/values-en/strings.xml b/Corona-Warn-App/src/main/res/values-en/strings.xml
index fb7ce006afe..dbf0fe5bd32 100644
--- a/Corona-Warn-App/src/main/res/values-en/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-en/strings.xml
@@ -520,12 +520,6 @@
     <string name="submission_qr_code_scan_permission_rationale_dialog_button_positive">"Allow"</string>
     <string name="submission_qr_code_scan_permission_rationale_dialog_button_negative">"Do Not Allow"</string>
 
-    <!-- QR Code Scan Successful Dialog -->
-    <string name="submission_qr_code_scan_successful_dialog_headline">"Scan successful"</string>
-    <string name="submission_qr_code_scan_successful_dialog_body">"The QR code has been scanned successfully."</string>
-    <string name="submission_qr_code_scan_successful_dialog_button_positive">"Register"</string>
-    <string name="submission_qr_code_scan_successful_dialog_button_negative">"Cancel"</string>
-
     <!-- QR Code Scan Invalid Dialog -->
     <string name="submission_qr_code_scan_invalid_dialog_headline">"Incorrect QR code"</string>
     <string name="submission_qr_code_scan_invalid_dialog_body">"It appears that an incorrect QR code was scanned."</string>
@@ -536,10 +530,6 @@
     <!-- YTXT: instruction text for QR code scanning  -->
     <string name="submission_qr_code_scan_body">"Position the QR code in the frame."</string>
 
-    <!-- Register Device Screen -->
-    <string name="submission_register_device_headline">"Register device"</string>
-    <string name="submission_register_device_body">@string/lorem_ipsum</string>
-
     <!-- Submission Test Result -->
     <!-- XHED: Page headline for test result  -->
     <string name="submission_test_result_headline">"Test result"</string>
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 14a9b1a7368..62f103e4287 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -680,12 +680,6 @@
     <!-- XBUT: Dialog(QR Scan permission rationale) - negative button (left) -->
     <string name="submission_qr_code_scan_permission_rationale_dialog_button_negative">Nicht erlauben</string>
 
-    <!-- QR Code Scan Successful Dialog -->
-    <string name="submission_qr_code_scan_successful_dialog_headline">Scan erfolgreich</string>
-    <string name="submission_qr_code_scan_successful_dialog_body">Der QR-Code wurde erfolgreich gescannt</string>
-    <string name="submission_qr_code_scan_successful_dialog_button_positive">Registrieren</string>
-    <string name="submission_qr_code_scan_successful_dialog_button_negative">Abbrechen</string>
-
     <!-- QR Code Scan Invalid Dialog -->
     <!-- XHED: Dialog headline for invalid QR code  -->
     <string name="submission_qr_code_scan_invalid_dialog_headline">QR-Code nicht korrekt</string>
@@ -700,11 +694,6 @@
     <!-- YTXT: instruction text for QR code scanning  -->
     <string name="submission_qr_code_scan_body">Positionieren Sie den QR Code in den Rahmen</string>
 
-    <!-- Register Device Screen -->
-    <!-- XHED: Text headline for test registration loading  -->
-    <string name="submission_register_device_headline">Test registrieren</string>
-    <string name="submission_register_device_body">@string/lorem_ipsum</string>
-
     <!-- Submission Test Result -->
     <!-- XHED: Page headline for test result  -->
     <string name="submission_test_result_headline">Test-Ergebnis</string>
@@ -817,6 +806,7 @@
     <string name="submission_dispatcher_qr_card_text">Registrieren Sie Ihren Test, indem Sie den QR-Code ihres Test-Dokument scannen</string>
     <!-- XHED: Dialog headline for dispatcher QR prviacy dialog  -->
     <string name="submission_dispatcher_qr_privacy_dialog_headline">Einwilligungserklärung</string>
+    <!-- YTXT: Dialog text for dispatcher QR prviacy dialog -->
     <string name="submission_dispatcher_qr_privacy_dialog_body">Durch Antippen von „Erlauben“ willigen Sie ein, dass die App den Status Ihres Corona-Virus-Tests abfragen und in der App anzeigen darf. Diese Funktion steht Ihnen zur Verfügung, wenn Sie einen QR-Code erhalten und eingewilligt haben, dass Ihr Testergebnis an das Serversystem der App übermittelt werden darf. Sobald das Testlabor Ihr Testergebnis auf dem Server hinterlegt hat, können Sie das Ergebnis in der App sehen. Falls Sie Mitteilungen aktiviert haben, werden Sie auch außerhalb der App über den Eingang des Testergebnis informiert. Das Testergebnis selbst wird aus Datenschutzgründen jedoch nur in der App angezeigt. Sie können diese Einwilligung jederzeit widerrufen, indem Sie die Testregistrierung in der App löschen. Durch den Widerruf der Einwilligung wird die Rechtmäßigkeit der bis zum Widerruf erfolgten Verarbeitung nicht berührt. Weitere Informationen finden Sie unter dem Menüpunkt „Datenschutzinformation“.</string>
     <!-- XBUT: submission(dispatcher QR Dialog) - positive button (right) -->
     <string name="submission_dispatcher_qr_privacy_dialog_button_positive">Erlauben</string>