Translation branch update

.circleci/config.yml

@@ -16,7 +16,10 @@ jobs:
           ndk-version: "android-ndk-r21b"
       - restore-build-cache
       - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "Corona-Warn-App/build.gradle" }}
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "Corona-Warn-App/build.gradle" }}-{{ checksum  "Server-Protocol-Buffer/build.gradle" }}
+      - run:
+          name: Sudo GradleWrapper
+          command: chmod +x ./gradlew
       - run:
           command: ./gradlew quickBuild
           environment:
@@ -26,7 +29,7 @@ jobs:
       - save_cache:
           paths:
             - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "Corona-Warn-App/build.gradle" }}
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "Corona-Warn-App/build.gradle" }}-{{ checksum  "Server-Protocol-Buffer/build.gradle" }}
       - store_artifacts:
           path: Corona-Warn-App/build/reports
           destination: reports

.github/pull_request_template.md

@@ -7,11 +7,10 @@ Before submitting, please take the time to check the points below and provide so
 
 * [ ] Test your changes as thoroughly as possible before you commit them. Preferably, automate your test by unit/integration tests.
 * [ ] If this PR comes from a fork, please [Allow edits from maintainers](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)
-* [ ] Set a speaking title. Format: {task_name} (closes #{issue_number}). For example: Use logger (closes #41)
+* [ ] Set a speaking title. Format: {task_name} (closes #{issue_number}). For example: Use logger (closes # 41)
 * [ ] [Link your Pull Request to an issue](https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue) (if applicable)
 * [ ] Create Work In Progress [WIP] pull requests only if you need clarification or an explicit review before you can continue your work item.
-* [ ] Make sure that your PR is not introducing _unncessary_ reformatting (e.g., introduced by on-save hooks in your IDE)
-* [ ] Check our [Contribution Guidelines](https://github.com/corona-warn-app/cwa-app-android/blob/master/CONTRIBUTING.md)
+* [ ] Make sure that your PR is not introducing _unnecessary_ reformatting (e.g., introduced by on-save hooks in your IDE)
 
 ## Description
 <!-- Please be brief in describing which issue is solved by your PR or which enhancement it brings -->

CONTRIBUTING.md

@@ -46,7 +46,7 @@ The following rule governs documentation contributions:
 
 ## Pull Request Checklist
 
-* Branch from the master branch and, if needed, rebase to the current master branch before submitting your pull request. If it doesn't merge cleanly with master, you may be asked to rebase your changes.
+* Branch from the dev branch and ensure it is up to date with the current dev branch before submitting your pull request. If it doesn't merge cleanly with dev, you may be asked to resolve the conflicts. Pull requests to master will be closed.
 
 * Commits should be as small as possible while ensuring that each commit is correct independently (i.e., each commit should compile and pass tests).
 

Corona-Warn-App/build.gradle

@@ -32,8 +32,8 @@ android {
         applicationId 'de.rki.coronawarnapp'
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 4
-        versionName "0.5.4"
+        versionCode 7
+        versionName "0.8.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField "String", "DOWNLOAD_CDN_URL", "\"$DOWNLOAD_CDN_URL\""
@@ -135,11 +135,6 @@ android {
 
 }
 
-configurations.all {
-    resolutionStrategy.force "org.antlr:antlr4-runtime:4.7.1"
-    resolutionStrategy.force "org.antlr:antlr4-tool:4.7.1"
-}
-
 dependencies {
     api fileTree(dir: 'libs', include: ['play-services-nearby-18.0.2-eap.aar'])
     implementation project(":Server-Protocol-Buffer")

Corona-Warn-App/proguard-rules.pro

@@ -16,10 +16,15 @@
     private public protected *;
 }
 
+-keep class * extends com.google.crypto.tink.shaded.protobuf.GeneratedMessageLite { *; }
+-keep class net.sqlcipher.** { *; }
+-dontwarn net.sqlcipher.**
+
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
 
+#-dontobfuscate
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile

Corona-Warn-App/src/main/AndroidManifest.xml

@@ -65,13 +65,6 @@
             android:exported="false"
             android:screenOrientation="fullSensor"
             tools:replace="screenOrientation" />
-
-        <service
-            android:name=".notification.ExposureNotificationIntentService"
-            android:enabled="true"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
     </application>
 
 </manifest>

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt

@@ -1,18 +1,95 @@
 package de.rki.coronawarnapp
 
+import android.annotation.SuppressLint
+import android.app.Activity
 import android.app.Application
 import android.content.Context
+import android.content.pm.ActivityInfo
+import android.os.Bundle
+import android.util.Log
+import android.view.WindowManager
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.ProcessLifecycleOwner
+import de.rki.coronawarnapp.notification.NotificationHelper
 
-class CoronaWarnApplication : Application() {
+class CoronaWarnApplication : Application(), LifecycleObserver,
+    Application.ActivityLifecycleCallbacks {
 
     companion object {
+        val TAG: String? = CoronaWarnApplication::class.simpleName
         private lateinit var instance: CoronaWarnApplication
+
+        /* describes if the app is in foreground
+         * Initialized to false, because app could also be started by a background job.
+         * For the cases where the app is started via the launcher icon, the onAppForegrounded
+         * event will be called, setting it to true
+         */
+        var isAppInForeground = false
+
         fun getAppContext(): Context =
             instance.applicationContext
     }
 
     override fun onCreate() {
         instance = this
+        NotificationHelper.createNotificationChannel()
         super.onCreate()
+        ProcessLifecycleOwner.get().lifecycle.addObserver(this)
+        registerActivityLifecycleCallbacks(this)
+    }
+
+    /**
+     * Callback when the app is open but backgrounded
+     */
+    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
+    fun onAppBackgrounded() {
+        isAppInForeground = false
+        Log.v(TAG, "App backgrounded")
+    }
+
+    /**
+     * Callback when the app is foregrounded
+     */
+    @OnLifecycleEvent(Lifecycle.Event.ON_START)
+    fun onAppForegrounded() {
+        isAppInForeground = true
+        Log.v(TAG, "App foregrounded")
+    }
+
+    override fun onActivityPaused(activity: Activity) {
+        // does not override function. Empty on intention
+    }
+
+    override fun onActivityStarted(activity: Activity) {
+        // does not override function. Empty on intention
+    }
+
+    override fun onActivityDestroyed(activity: Activity) {
+        // does not override function. Empty on intention
+    }
+
+    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
+        // does not override function. Empty on intention
+    }
+
+    override fun onActivityStopped(activity: Activity) {
+        // does not override function. Empty on intention
+    }
+
+    @SuppressLint("SourceLockedOrientationActivity")
+    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+        // prevents screenshot of the app for all activities
+        activity.window.setFlags(
+            WindowManager.LayoutParams.FLAG_SECURE,
+            WindowManager.LayoutParams.FLAG_SECURE
+        )
+        // set screen orientation to portrait
+        activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
+    }
+
+    override fun onActivityResumed(activity: Activity) {
+        // does not override function. Empty on intention
     }
 }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/TestForAPIFragment.kt

@@ -35,6 +35,7 @@ import de.rki.coronawarnapp.server.protocols.AppleLegacyKeyExchange
 import de.rki.coronawarnapp.sharing.ExposureSharingService
 import de.rki.coronawarnapp.storage.AppDatabase
 import de.rki.coronawarnapp.storage.ExposureSummaryRepository
+import de.rki.coronawarnapp.storage.LocalData
 import de.rki.coronawarnapp.storage.tracing.TracingIntervalRepository
 import de.rki.coronawarnapp.transaction.RiskLevelTransaction
 import de.rki.coronawarnapp.transaction.SubmitDiagnosisKeysTransaction
@@ -76,6 +77,8 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
     companion object {
         val TAG: String? = TestForAPIFragment::class.simpleName
 
+        const val CONFIG_SCORE = 8
+
         fun keysToJson(keys: List<TemporaryExposureKey>): String {
             return Gson().toJson(keys).toString()
         }
@@ -308,6 +311,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             showToast("No other keys provided. Please fill the EditText with the JSON containing keys")
         } else {
             token = UUID.randomUUID().toString()
+            LocalData.googleApiToken(token)
 
             val appleKeyList = mutableListOf<AppleLegacyKeyExchange.Key>()
 
@@ -344,7 +348,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
                     // only testing implementation: this is used to wait for the broadcastreceiver of the OS / EN API
                     InternalExposureNotificationClient.asyncProvideDiagnosisKeys(
                         googleFileList,
-                        ExposureConfiguration.ExposureConfigurationBuilder().build(),
+                        getCustomConfig(),
                         token!!
                     )
                     showToast("Provided ${appleKeyList.size} keys to Google API with token $token")
@@ -442,4 +446,48 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             keysToJson(keys)
         updateKeysDisplay()
     }
+
+    private fun getCustomConfig(): ExposureConfiguration = ExposureConfiguration
+        .ExposureConfigurationBuilder()
+        .setAttenuationScores(
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE
+        )
+        .setDaysSinceLastExposureScores(
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE
+        )
+        .setDurationScores(
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE
+        )
+        .setTransmissionRiskScores(
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE,
+            CONFIG_SCORE
+        )
+        .build()
 }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/RiskLevelCalculationException.kt

@@ -1,4 +1,4 @@
 package de.rki.coronawarnapp.exception
 
 class RiskLevelCalculationException(cause: Throwable) :
-    Exception("an exception occured during risk level calculation", cause)
+    Exception("an exception occurred during risk level calculation", cause)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt

@@ -192,7 +192,7 @@ object WebRequestBuilder {
     ) =
         suspendCoroutine<String> { cont ->
             val requestID = UUID.randomUUID()
-            val getTestResultRequest =
+            val getTANRequest =
                 TanRequest(
                     url,
                     requestID,
@@ -203,13 +203,13 @@ object WebRequestBuilder {
                     Response.Listener { response ->
                         Log.d(
                             TAG,
-                            "$requestID: Test Result Request successful"
+                            "$requestID: TAN Request successful"
                         )
                         cont.resume(response)
                     },
                     RequestErrorListener(requestID, cont)
                 )
-            RequestQueueHolder.addToRequestQueue(getTestResultRequest)
+            RequestQueueHolder.addToRequestQueue(getTANRequest)
             Log.d(TAG, "$requestID: Added $url to queue.")
         }
 
@@ -254,7 +254,7 @@ object WebRequestBuilder {
         Response.ErrorListener {
         override fun onErrorResponse(error: VolleyError?) {
             if (error != null) {
-                val webRequestException = WebRequestException("an error occured during a webrequest", error)
+                val webRequestException = WebRequestException("an error occurred during a webrequest", error)
                 webRequestException.report(de.rki.coronawarnapp.exception.ExceptionCategory.HTTP)
                 cont.resumeWithException(webRequestException)
             } else {

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/request/KeySubmissionRequest.kt

@@ -44,7 +44,7 @@ class KeySubmissionRequest(
         val headers = HashMap<String, String>(super.getHeaders())
         if (faked) headers["cwa-fake"] = Math.random().toInt().toString()
         else headers["cwa-fake"] = "0"
-        headers["cwa-authorization"] = "TAN 123456"
+        headers["cwa-authorization"] = authCode
         this.addMarker("headers:$headers")
         return headers
     }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/request/RegistrationTokenRequest.kt

@@ -10,6 +10,7 @@ import com.android.volley.RetryPolicy
 import com.android.volley.toolbox.HttpHeaderParser
 import de.rki.coronawarnapp.exception.ExceptionCategory.HTTP
 import de.rki.coronawarnapp.exception.report
+import de.rki.coronawarnapp.service.submission.SubmissionConstants
 import org.json.JSONException
 import org.json.JSONObject
 import java.io.UnsupportedEncodingException
@@ -37,12 +38,17 @@ class RegistrationTokenRequest(
 
     override fun getBody(): ByteArray {
         val body = JSONObject()
-        val md = MessageDigest.getInstance("SHA-256")
-        val keyDigest = md.digest(key.toByteArray())
 
         var keyStr = ""
-        for (b in keyDigest) {
-            keyStr += String.format("%02x", b)
+        if (keyType == SubmissionConstants.QR_CODE_KEY_TYPE) {
+            val md = MessageDigest.getInstance("SHA-256")
+            val keyDigest = md.digest(key.toByteArray())
+
+            for (b in keyDigest) {
+                keyStr += String.format("%02x", b)
+            }
+        } else {
+            keyStr = key
         }
 
         body.put("keyType", keyType)