Merge pull request #311 from corona-warn-app/dev

0.8.11

Corona-Warn-App/build.gradle

@@ -32,37 +32,15 @@ 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\""
         buildConfigField "String", "SUBMISSION_CDN_URL", "\"$SUBMISSION_CDN_URL\""
         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()]

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>

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>

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>

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=
+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