From f627704a99cbbeb2962e3e5d29896c9b5e34105a Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Tue, 25 Aug 2020 15:43:18 +0200
Subject: [PATCH 01/24] Implement country filter (#2229)

---
 .../TestForAPIFragment.kt                     |  70 ++++++----
 .../res/layout/fragment_test_for_a_p_i.xml    |  47 ++++++-
 .../coronawarnapp/http/WebRequestBuilder.kt   |  32 ++++-
 .../diagnosiskey/DiagnosisKeyConstants.kt     |  13 +-
 .../storage/FileStorageHelper.kt              |   2 +-
 .../coronawarnapp/util/CachedKeyFileHolder.kt | 123 +++++++++++++-----
 .../src/main/res/values-bg/strings.xml        |   1 +
 .../src/main/res/values-de/strings.xml        |   1 +
 .../src/main/res/values-en/strings.xml        |   2 +
 .../src/main/res/values-pl/strings.xml        |   1 +
 .../src/main/res/values-ro/strings.xml        |   1 +
 .../src/main/res/values-tr/strings.xml        |   1 +
 .../src/main/res/values/strings.xml           |   2 +
 13 files changed, 226 insertions(+), 70 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
index 85f21bbb4c4..3c5f4ad7af4 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
@@ -8,6 +8,7 @@ import android.util.Base64
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.EditText
 import android.widget.ImageView
 import android.widget.Switch
 import android.widget.Toast
@@ -41,6 +42,7 @@ import de.rki.coronawarnapp.receiver.ExposureStateUpdateReceiver
 import de.rki.coronawarnapp.risk.TimeVariables
 import de.rki.coronawarnapp.server.protocols.AppleLegacyKeyExchange
 import de.rki.coronawarnapp.service.applicationconfiguration.ApplicationConfigurationService
+import de.rki.coronawarnapp.service.diagnosiskey.DiagnosisKeyConstants
 import de.rki.coronawarnapp.sharing.ExposureSharingService
 import de.rki.coronawarnapp.storage.AppDatabase
 import de.rki.coronawarnapp.storage.ExposureSummaryRepository
@@ -48,33 +50,9 @@ import de.rki.coronawarnapp.storage.LocalData
 import de.rki.coronawarnapp.storage.tracing.TracingIntervalRepository
 import de.rki.coronawarnapp.transaction.RiskLevelTransaction
 import de.rki.coronawarnapp.ui.viewmodel.TracingViewModel
+import de.rki.coronawarnapp.util.CachedKeyFileHolder
 import de.rki.coronawarnapp.util.KeyFileHelper
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.button_api_enter_other_keys
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.button_api_get_check_exposure
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.button_api_get_exposure_keys
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.button_api_scan_qr_code
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.button_api_share_my_keys
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.button_api_submit_keys
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.button_api_test_start
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.button_calculate_risk_level
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.button_clear_db
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.button_insert_exposure_summary
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.button_retrieve_exposure_summary
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.button_tracing_duration_in_retention_period
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.button_tracing_intervals
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.label_exposure_summary_attenuation
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.label_exposure_summary_daysSinceLastExposure
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.label_exposure_summary_matchedKeyCount
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.label_exposure_summary_maximumRiskScore
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.label_exposure_summary_summationRiskScore
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.label_googlePlayServices_version
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.label_latest_key_date
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.label_my_keys
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.qr_code_viewpager
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.test_api_switch_last_three_hours_from_server
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.test_api_switch_background_notifications
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.text_my_keys
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.text_scanned_key
+import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -83,7 +61,7 @@ import org.joda.time.DateTimeZone
 import timber.log.Timber
 import java.io.File
 import java.lang.reflect.Type
-import java.util.UUID
+import java.util.*
 
 @SuppressWarnings("TooManyFunctions", "MagicNumber", "LongMethod")
 class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHelper.Callback {
@@ -166,6 +144,15 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
         qrPagerAdapter = QRPagerAdapter()
         qrPager.adapter = qrPagerAdapter
 
+
+        // Update Country UI element states
+        (input_country_codes_editText as EditText).setText(
+            DiagnosisKeyConstants.COUNTRIES.joinToString(
+                ","
+            )
+        )
+        updateCountryStatusLabel()
+
         button_api_test_start.setOnClickListener {
             start()
         }
@@ -275,6 +262,26 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
                 showToast(TimeVariables.getActiveTracingDaysInRetentionPeriod().toString())
             }
         }
+
+        button_filter_country_codes.setOnClickListener {
+            // Get user input country codes
+            val rawCountryCodes = (input_country_codes_editText as EditText).text.toString()
+
+            // Country codes can be seperated by space or ,
+            val countryCodes = rawCountryCodes.split(',', ' ')
+
+            // DiagnosisKeyConstants.COUNTRIES is used in @see WebRequestBuilder to filter
+            // countries out of the full countries index of the server (response)
+            DiagnosisKeyConstants.COUNTRIES = countryCodes.filter { it.isNotEmpty() }
+
+            // Trigger asyncFetchFiles which will use all Countries defined in
+            // DiagnosisKeyConstants.COUNTRIES
+            val currentDate = Date(System.currentTimeMillis())
+            lifecycleScope.launch {
+                CachedKeyFileHolder.asyncFetchFiles(currentDate)
+                updateCountryStatusLabel()
+            }
+        }
     }
 
     override fun onResume() {
@@ -283,6 +290,15 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
         updateExposureSummaryDisplay(null)
     }
 
+    /**
+     * Updates the Label for country filter
+     */
+    private fun updateCountryStatusLabel() {
+        label_country_code_filter_status.text =
+            getString(R.string.test_api_country_filter_status,
+                DiagnosisKeyConstants.COUNTRIES.joinToString(", "))
+    }
+
     private val prettyKey = { key: AppleLegacyKeyExchange.Key ->
         StringBuilder()
             .append("\nKey data: ${key.keyData}")
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
index 9b13b7db1d6..ef6961734df 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
@@ -44,9 +44,9 @@
             <TextView
                 android:id="@+id/label_exposure_summary"
                 style="@style/headline6"
-                android:accessibilityHeading="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:accessibilityHeading="true"
                 android:text="@string/test_api_exposure_summary_headline" />
 
             <TextView
@@ -106,10 +106,10 @@
             <TextView
                 android:id="@+id/label_my_keys"
                 style="@style/headline6"
-                android:accessibilityHeading="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacing_normal"
+                android:accessibilityHeading="true"
                 android:text="@string/test_api_body_my_keys" />
 
             <TextView
@@ -134,9 +134,9 @@
             <TextView
                 android:id="@+id/label_other_keys"
                 style="@style/headline6"
-                android:accessibilityHeading="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:accessibilityHeading="true"
                 android:text="@string/test_api_body_other_keys" />
 
             <TextView
@@ -225,24 +225,59 @@
                 android:text="Get Active Tracing Duration in Retention Period" />
 
             <TextView
-                style="@style/headline4"
+                android:id="@+id/label_country_filter"
+                style="@style/headline6"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacing_normal"
                 android:accessibilityHeading="true"
+                android:text="@string/test_api_country_settings_heading" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <EditText
+                    android:id="@+id/input_country_codes_editText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.9" />
+
+                <Button
+                    android:id="@+id/button_filter_country_codes"
+                    style="@style/buttonPrimary"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.1"
+                    android:text="Apply"/>
+            </LinearLayout>
+            <TextView
+                android:id="@+id/label_country_code_filter_status"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:text="@string/test_api_country_filter_status">
+
+            </TextView>
+
+            <TextView
+                style="@style/headline4"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:accessibilityHeading="true"
                 android:text="headline4" />
 
             <TextView
                 style="@style/headline5"
-                android:accessibilityHeading="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:accessibilityHeading="true"
                 android:text="headline5" />
 
             <TextView
                 style="@style/headline6"
-                android:accessibilityHeading="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:accessibilityHeading="true"
                 android:text="headline6" />
 
             <TextView
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt
index b6dc003eb62..76c3ce5878a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt
@@ -78,10 +78,24 @@ class WebRequestBuilder(
         }
     }
 
-    suspend fun asyncGetDateIndex(): List<String> = withContext(Dispatchers.IO) {
-        return@withContext distributionService
-            .getDateIndex(DiagnosisKeyConstants.AVAILABLE_DATES_URL).toList()
-    }
+    /**
+     * Gets the country index which is then filtered by given filter param or if param not set
+     * DiagnosisKeyConstants.COUNTRIES will be used for filtering
+     * @param filter (array of country codes) used to filter
+     * only wanted countries of the country index (case insensitive)
+     */
+    suspend fun asyncGetCountryIndex(
+        filter: List<String> = DiagnosisKeyConstants.COUNTRIES
+    ): List<String> =
+        withContext(Dispatchers.IO) {
+            return@withContext distributionService
+                .getDateIndex(DiagnosisKeyConstants.AVAILABLE_COUNTRIES_URL)
+                .filter {
+                    filter.map { c -> c.toUpperCase() }
+                        .contains(it.toUpperCase())
+                }
+                .toList()
+        }
 
     suspend fun asyncGetHourIndex(day: Date): List<String> = withContext(Dispatchers.IO) {
         return@withContext distributionService
@@ -92,6 +106,16 @@ class WebRequestBuilder(
             .toList()
     }
 
+    /**
+     * Get the date index based on the given country
+     * @param country the country where the date index should be requested
+     */
+    suspend fun asyncGetDateIndex(country: String): List<String> = withContext(Dispatchers.IO) {
+        return@withContext distributionService
+            .getDateIndex("${DiagnosisKeyConstants.AVAILABLE_COUNTRIES_URL}/$country/${DiagnosisKeyConstants.DATE}")
+            .toList()
+    }
+
     /**
      * Retrieves Key Files from the Server based on a URL
      *
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt
index c9010f1086d..4983b168904 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt
@@ -37,7 +37,7 @@ object DiagnosisKeyConstants {
     private const val COUNTRY = "country"
 
     /** date resource variable for REST-like Service Calls */
-    private const val DATE = "date"
+    const val DATE = "date"
 
     /** hour resource variable for REST-like Service Calls */
     const val HOUR = "hour"
@@ -46,7 +46,8 @@ object DiagnosisKeyConstants {
 
     /** resource variables but non-static context */
     private var CURRENT_VERSION = "v1"
-    private var CURRENT_COUNTRY = "DE"
+    var CURRENT_COUNTRY = "DE"
+    var COUNTRIES = listOf<String>("DE")
 
     /** Distribution URL built from CDN URL's and REST resources */
     private var VERSIONED_DISTRIBUTION_CDN_URL = "$VERSION/$CURRENT_VERSION"
@@ -74,8 +75,14 @@ object DiagnosisKeyConstants {
     val COUNTRY_APPCONFIG_DOWNLOAD_URL =
         "$APPCONFIG_COUNTRY_DOWNLOAD_URL/$CURRENT_COUNTRY/app_config"
 
+
+    /** Dynamic URL to be able to specify which country should be used
+     * instead of $CURRENT_COUNTRY
+     **/
+    val AVAILABLE_COUNTRIES_URL = "$DIAGNOSIS_KEYS_DOWNLOAD_URL/$COUNTRY"
+
     /** Available Dates URL built from CDN URL's and REST resources */
-    val AVAILABLE_DATES_URL = "$DIAGNOSIS_KEYS_DOWNLOAD_URL/$COUNTRY/$CURRENT_COUNTRY/$DATE"
+    val AVAILABLE_DATES_URL = "$AVAILABLE_COUNTRIES_URL/$CURRENT_COUNTRY/$DATE"
 
     const val SERVER_ERROR_CODE_403 = 403
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/FileStorageHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/FileStorageHelper.kt
index 44442e9e61d..536d4e53150 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/FileStorageHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/FileStorageHelper.kt
@@ -36,7 +36,7 @@ object FileStorageHelper {
      */
     val keyExportDirectory = File(
         CoronaWarnApplication.getAppContext().cacheDir,
-        FileStorageConstants.KEY_EXPORT_DIRECTORY_NAME
+        "${FileStorageConstants.KEY_EXPORT_DIRECTORY_NAME}/"
     )
 
     /**
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
index 15437cf4758..361380395bf 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
@@ -68,22 +68,47 @@ object CachedKeyFileHolder {
      * @return list of all files from both the cache and the diff query
      */
     suspend fun asyncFetchFiles(currentDate: Date): List<File> = withContext(Dispatchers.IO) {
+        // Initiate key-cache folder needed for saving downloaded key files
+        FileStorageHelper.initializeExportSubDirectory()
+
         checkForFreeSpace()
-        val serverDates = getDatesFromServer()
+
+        // Build pair of country to date <Country, Date[]>
+        val serverDates = getCountriesFromServer().map { Pair(it, getDatesFromServer(it)) }
+
         // TODO remove last3HourFetch before Release
         if (BuildConfig.FLAVOR != "device" && isLast3HourFetchEnabled()) {
             Timber.v("Last 3 Hours will be Fetched. Only use for Debugging!")
             val currentDateServerFormat = currentDate.toServerFormat()
+
             // just fetch the hours if the date is available
-            if (serverDates.contains(currentDateServerFormat)) {
-                return@withContext getLast3Hours(currentDate)
-                    .map { getURLForHour(currentDate.toServerFormat(), it) }
-                    .map { url ->
-                        async {
-                            return@async WebRequestBuilder.getInstance()
-                                .asyncGetKeyFilesFromServer(url)
-                        }
-                    }.awaitAll()
+            // extend fetch for all dates in all countries provided in serverDates
+            val packagesWithCurrentDate = serverDates
+                .filter { countryWithDates ->
+                    countryWithDates.second.contains(
+                        currentDateServerFormat
+                    )
+                }
+
+            if (packagesWithCurrentDate.isNotEmpty()) {
+                return@withContext serverDates
+                    .flatMap { countryWithDates ->
+                        getLast3Hours(currentDate)
+                            .map {
+                                getURLForHour(
+                                    countryWithDates.first,
+                                    currentDate.toServerFormat(),
+                                    it
+                                )
+                            }
+                            .map { url ->
+                                async {
+                                    return@async WebRequestBuilder.getInstance()
+                                        .asyncGetKeyFilesFromServer(url)
+                                }
+                            }
+                    }
+                    .awaitAll()
             } else {
                 throw IllegalStateException(
                     "you cannot use the last 3 hour mode if the date index " +
@@ -91,20 +116,40 @@ object CachedKeyFileHolder {
                 )
             }
         } else {
-            val uuidListFromServer = serverDates
-                .map { getURLForDay(it).generateCacheKeyFromString() }
+
+            // Build flat map of uuids from dates of countries
+            val uuidListFromServer = serverDates.flatMap { pair ->
+                pair.second
+                    .map { date ->
+                        getURLForDay(pair.first, date).generateCacheKeyFromString()
+                    }
+            }
+
+            Timber.v("${uuidListFromServer.size} available dates from server for ${serverDates.size} countries")
+
             // queries will be executed after the "query plan" was set
             val deferredQueries: MutableCollection<Deferred<Any>> = mutableListOf()
             keyCache.deleteOutdatedEntries(uuidListFromServer)
+
             val missingDays = getMissingDaysFromDiff(serverDates)
             if (missingDays.isNotEmpty()) {
                 // we have a date difference
                 deferredQueries.addAll(
                     missingDays
-                        .map { getURLForDay(it) }
-                        .map { url -> async { url.createDayEntryForUrl() } }
+                        .flatMap { daysFromServer ->
+                            daysFromServer.second.map {
+                                getURLForDay(
+                                    daysFromServer.first,
+                                    it
+                                )
+                            }
+                        }
+                        .map { url -> async {
+                            url.createDayEntryForUrl()
+                        } }
                 )
             }
+
             // execute the query plan
             try {
                 deferredQueries.awaitAll()
@@ -113,6 +158,7 @@ object CachedKeyFileHolder {
                 keyCache.clear()
                 throw e
             }
+
             keyCache.getFilesFromEntries()
                 .also { it.forEach { file -> Timber.v("cached file:${file.path}") } }
         }
@@ -122,14 +168,22 @@ object CachedKeyFileHolder {
 
     /**
      * Calculates the missing days based on current missing entries in the cache
+     * with respect to all countries defined
      */
-    private suspend fun getMissingDaysFromDiff(datesFromServer: Collection<String>): List<String> {
+    private suspend fun getMissingDaysFromDiff(
+        datesFromServer: Collection<Pair<String, Collection<String>>>
+    ): List<Pair<String, List<String>>> {
         val cacheEntries = keyCache.getDates()
-        return datesFromServer
-            .also { Timber.d("${it.size} days from server") }
-            .filter { it.dateEntryCacheMiss(cacheEntries) }
-            .toList()
-            .also { Timber.d("${it.size} missing days") }
+        return datesFromServer.map { countryDates ->
+            Pair(
+                countryDates.first,
+                countryDates.second
+                    .also { Timber.d("Country: ${countryDates.first}: ${it.size} Days") }
+                    .filter { it.dateEntryCacheMiss(countryDates.first, cacheEntries) }
+                    .toList()
+                    .also { Timber.d("Country: ${countryDates.first}, Missing Days: ${it.size}") }
+            )
+        }
     }
 
     /**
@@ -151,11 +205,12 @@ object CachedKeyFileHolder {
      * Determines whether a given String has an existing date cache entry under a unique name
      * given from the URL that is based on this String
      *
+     * @param country the country of the date
      * @param cache the given cache entries
      */
-    private fun String.dateEntryCacheMiss(cache: List<KeyCacheEntity>) = !cache
+    private fun String.dateEntryCacheMiss(country: String, cache: List<KeyCacheEntity>) = !cache
         .map { date -> date.id }
-        .contains(getURLForDay(this).generateCacheKeyFromString())
+        .contains(getURLForDay(country, this).generateCacheKeyFromString())
 
     /**
      * Creates a date entry in the Key Cache for a given String with a unique Key Name derived from the URL
@@ -178,25 +233,29 @@ object CachedKeyFileHolder {
     /**
      * Gets the correct URL String for querying an hour bucket
      *
+     * @param country the country of the date and hour
      * @param formattedDate the formatted date for the hour bucket request
      * @param formattedHour the formatted hour
      */
-    private fun getURLForHour(formattedDate: String, formattedHour: String) =
-        "${getURLForDay(formattedDate)}/${DiagnosisKeyConstants.HOUR}/$formattedHour"
+    private fun getURLForHour(country: String, formattedDate: String, formattedHour: String) =
+        "${getURLForDay(country, formattedDate)}/${DiagnosisKeyConstants.HOUR}/$formattedHour"
 
     /**
      * Gets the correct URL String for querying a day bucket
      *
+     * @param country the country of the formattedDate
      * @param formattedDate the formatted date
      */
-    private fun getURLForDay(formattedDate: String) =
-        "${DiagnosisKeyConstants.AVAILABLE_DATES_URL}/$formattedDate"
+    private fun getURLForDay(country: String, formattedDate: String) =
+        "${DiagnosisKeyConstants.AVAILABLE_COUNTRIES_URL}/$country/${DiagnosisKeyConstants.DATE}/$formattedDate"
 
     /**
-     * Get all dates from server based as formatted dates
+     * Get all dates of a country from server based as formatted dates
+     *
+     * @param country the country where the dates are got from
      */
-    private suspend fun getDatesFromServer() =
-        WebRequestBuilder.getInstance().asyncGetDateIndex()
+    private suspend fun getDatesFromServer(country: String) =
+        WebRequestBuilder.getInstance().asyncGetDateIndex(country)
 
     /**
      * Get all hours from server based as formatted dates
@@ -204,6 +263,12 @@ object CachedKeyFileHolder {
     private suspend fun getHoursFromServer(day: Date) =
         WebRequestBuilder.getInstance().asyncGetHourIndex(day)
 
+    /**
+     * Get all countries from the server
+     */
+    private suspend fun getCountriesFromServer() =
+        WebRequestBuilder.getInstance().asyncGetCountryIndex()
+
     /**
      * TODO remove before release
      */
diff --git a/Corona-Warn-App/src/main/res/values-bg/strings.xml b/Corona-Warn-App/src/main/res/values-bg/strings.xml
index f1f3d6c5278..5c79b067486 100644
--- a/Corona-Warn-App/src/main/res/values-bg/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-bg/strings.xml
@@ -1125,5 +1125,6 @@
     <string name="test_api_body_other_keys">"Other key"</string>
     <!-- NOTR -->
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
+    <string name="test_api_country_filter_status">Country filter applied for: \n%1$s</string>
 
 </resources>
\ No newline at end of file
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 0f785eaa02b..6de05aeec03 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -1140,5 +1140,6 @@
     <string name="test_api_body_other_keys">"Other key"</string>
     <!-- NOTR -->
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
+    <string name="test_api_country_filter_status">Country filter applied for: \n%1$s</string>
 
 </resources>
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 2f6cc3b9e6a..af4b2f3577d 100644
--- a/Corona-Warn-App/src/main/res/values-en/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-en/strings.xml
@@ -1125,5 +1125,7 @@
     <string name="test_api_body_other_keys">"Other key"</string>
     <!-- NOTR -->
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
+    <string name="test_api_country_filter_status">Country filter applied for: \n%1$s</string>
+    <string name="test_api_country_settings_heading">Country Settings</string>
 
 </resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values-pl/strings.xml b/Corona-Warn-App/src/main/res/values-pl/strings.xml
index 285f9ecce06..a0e9a46279e 100644
--- a/Corona-Warn-App/src/main/res/values-pl/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-pl/strings.xml
@@ -1125,5 +1125,6 @@
     <string name="test_api_body_other_keys">"Other key"</string>
     <!-- NOTR -->
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
+    <string name="test_api_country_filter_status">Country filter applied for: \n%1$s</string>
 
 </resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values-ro/strings.xml b/Corona-Warn-App/src/main/res/values-ro/strings.xml
index b7575383faf..60299980f0f 100644
--- a/Corona-Warn-App/src/main/res/values-ro/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-ro/strings.xml
@@ -1125,5 +1125,6 @@
     <string name="test_api_body_other_keys">"Other key"</string>
     <!-- NOTR -->
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
+    <string name="test_api_country_filter_status">Country filter applied for: \n%1$s</string>
 
 </resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values-tr/strings.xml b/Corona-Warn-App/src/main/res/values-tr/strings.xml
index 426f593e57a..3dad26c0e0c 100644
--- a/Corona-Warn-App/src/main/res/values-tr/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-tr/strings.xml
@@ -1125,5 +1125,6 @@
     <string name="test_api_body_other_keys">"Other key"</string>
     <!-- NOTR -->
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
+    <string name="test_api_country_filter_status">Country filter applied for: \n%1$s</string>
 
 </resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 8e095879415..e8125ce1ea8 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -1143,5 +1143,7 @@
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
     <!-- NOTR -->
     <string name="test_api_switch_background_notifications">"Background Notifications"</string>
+    <string name="test_api_country_filter_status">Country filter applied for: \n%1$s</string>
+    <string name="test_api_country_settings_heading">Country Settings</string>
 
 </resources>
\ No newline at end of file

From 7d432261abfea7ba804e53a239a58c3ee88e573c Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Wed, 26 Aug 2020 16:49:54 +0200
Subject: [PATCH 02/24] Implement measure for Risk calculation and Key
 Retrieval (#2229)

---
 .../TestForAPIFragment.kt                     | 62 ++++++++++++++++++-
 .../res/layout/fragment_test_for_a_p_i.xml    | 47 +++++++++++++-
 .../RetrieveDiagnosisKeysTransaction.kt       | 23 ++++++-
 3 files changed, 127 insertions(+), 5 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
index 3c5f4ad7af4..03e4499378d 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
@@ -36,6 +36,7 @@ import de.rki.coronawarnapp.exception.ExceptionCategory
 import de.rki.coronawarnapp.exception.ExceptionCategory.INTERNAL
 import de.rki.coronawarnapp.exception.TransactionException
 import de.rki.coronawarnapp.exception.reporting.report
+import de.rki.coronawarnapp.http.WebRequestBuilder
 import de.rki.coronawarnapp.nearby.InternalExposureNotificationClient
 import de.rki.coronawarnapp.nearby.InternalExposureNotificationPermissionHelper
 import de.rki.coronawarnapp.receiver.ExposureStateUpdateReceiver
@@ -48,6 +49,7 @@ 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.RetrieveDiagnosisKeysTransaction
 import de.rki.coronawarnapp.transaction.RiskLevelTransaction
 import de.rki.coronawarnapp.ui.viewmodel.TracingViewModel
 import de.rki.coronawarnapp.util.CachedKeyFileHolder
@@ -282,6 +284,14 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
                 updateCountryStatusLabel()
             }
         }
+
+        button_retrieve_diagnosis_keys_and_calc_risk_level.setOnClickListener {
+            lifecycleScope.launch {
+                val repeatCount =
+                    (input_measure_risk_key_repeat_count as EditText).text.toString().toInt()
+                measureRiskLevelAndKeyRetrieval(repeatCount)
+            }
+        }
     }
 
     override fun onResume() {
@@ -290,13 +300,61 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
         updateExposureSummaryDisplay(null)
     }
 
+    private suspend fun measureRiskLevelAndKeyRetrieval(times: Int) {
+        var result = StringBuilder()
+            .append("Result: \n")
+            .append("#\t Download \t Key Calc \t File # \t Key #\n")
+
+        repeat(times) { index ->
+            try {
+                // get count of country dates
+                var fileCount = WebRequestBuilder.getInstance().asyncGetCountryIndex().flatMap {
+                    WebRequestBuilder.getInstance().asyncGetDateIndex(it)
+                }.size
+
+                var keyFileDownloadStart: Long = -1
+                var keyFileCount: Int = -1
+                var keyFileDownloadDuration: Long = -1
+
+                // start diagnostic key transaction with callback to get duration of Download
+                RetrieveDiagnosisKeysTransaction.start(
+                    onKeyFilesStarted = {
+                        Timber.v("MEASURE [Diagnostic Key Files] #${index} started")
+                        keyFileDownloadStart = System.currentTimeMillis()
+                    },
+                    onKeyFilesFinished = {
+                        Timber.v("MEASURE [Diagnostic Key Files] #${index} finished.")
+                        keyFileDownloadDuration = System.currentTimeMillis() - keyFileDownloadStart
+                        keyFileCount = it
+                    })
+
+                // start risk level calculation and get duration
+                val calculationStart = System.currentTimeMillis()
+                RiskLevelTransaction.start()
+                val calculationDuration = System.currentTimeMillis() - calculationStart
+
+                // build result entry for current iteration with all gathered data
+                result.append(
+                    "${index + 1}. \t $keyFileDownloadDuration ms " +
+                            "\t\t $calculationDuration ms \t\t $fileCount \t\t $keyFileCount\n"
+                )
+                
+                label_test_api_measure_calc_key_status.text = result.toString()
+            } catch (e: TransactionException) {
+                e.report(ExceptionCategory.INTERNAL)
+            }
+        }
+    }
+
     /**
      * Updates the Label for country filter
      */
     private fun updateCountryStatusLabel() {
         label_country_code_filter_status.text =
-            getString(R.string.test_api_country_filter_status,
-                DiagnosisKeyConstants.COUNTRIES.joinToString(", "))
+            getString(
+                R.string.test_api_country_filter_status,
+                DiagnosisKeyConstants.COUNTRIES.joinToString(", ")
+            )
     }
 
     private val prettyKey = { key: AppleLegacyKeyExchange.Key ->
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
index ef6961734df..7a0168d58c5 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
@@ -235,7 +235,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:padding="10dp">
 
                 <EditText
                     android:id="@+id/input_country_codes_editText"
@@ -249,8 +250,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.1"
-                    android:text="Apply"/>
+                    android:text="Apply" />
             </LinearLayout>
+
             <TextView
                 android:id="@+id/label_country_code_filter_status"
                 android:layout_width="match_parent"
@@ -259,6 +261,47 @@
 
             </TextView>
 
+            <TextView
+                android:id="@+id/label_test_api_measure"
+                style="@style/headline6"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacing_normal"
+                android:accessibilityHeading="true"
+                android:text="Statistics" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/button_retrieve_diagnosis_keys_and_calc_risk_level"
+                    style="@style/buttonPrimary"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/spacing_normal"
+                    android:layout_marginBottom="@dimen/spacing_normal"
+                    android:layout_weight="1"
+                    android:text="Measure: Calculate Risk Level / Key Retrieval" />
+
+                <EditText
+                    android:id="@+id/input_measure_risk_key_repeat_count"
+                    android:layout_width="98dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:inputType="number"
+                    android:text="1" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/label_test_api_measure_calc_key_status"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Result: "/>
+
             <TextView
                 style="@style/headline4"
                 android:layout_width="match_parent"
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
index a770f1ed174..473b08b0c49 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
@@ -20,6 +20,7 @@
 package de.rki.coronawarnapp.transaction
 
 import com.google.android.gms.nearby.exposurenotification.ExposureConfiguration
+import de.rki.coronawarnapp.BuildConfig
 import de.rki.coronawarnapp.CoronaWarnApplication
 import de.rki.coronawarnapp.nearby.InternalExposureNotificationClient
 import de.rki.coronawarnapp.service.applicationconfiguration.ApplicationConfigurationService
@@ -136,7 +137,13 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
     }
 
     /** initiates the transaction. This suspend function guarantees a successful transaction once completed. */
-    suspend fun start() = lockAndExecuteUnique {
+    suspend fun start(
+        onKeyFilesStarted: (() -> Unit)? = null,
+        onKeyFilesFinished: ((keyFiles: Int) -> Unit)? = null
+    ) = lockAndExecuteUnique {
+
+        val fireEvent = BuildConfig.FLAVOR != "device"
+
         /**
          * Handles the case when the ENClient got disabled but the Transaction is still scheduled
          * in a background job. Also it acts as a failure catch in case the orchestration code did
@@ -165,6 +172,12 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
         /****************************************************
          * FILES FROM WEB REQUESTS
          ****************************************************/
+        if (fireEvent) {
+            if (onKeyFilesStarted != null) {
+                onKeyFilesStarted()
+            }
+        }
+
         val keyFiles = executeFetchKeyFilesFromServer(currentDate)
 
         if (keyFiles.isNotEmpty()) {
@@ -175,10 +188,18 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
         } else {
             Timber.tag(TAG).w("no key files, skipping submission to internal API.")
         }
+
+        if (fireEvent) {
+            if (onKeyFilesFinished != null) {
+                onKeyFilesFinished(keyFiles.size)
+            }
+        }
+
         /****************************************************
          * Fetch Date Update
          ****************************************************/
         executeFetchDateUpdate(currentDate)
+
         /****************************************************
          * CLOSE TRANSACTION
          ****************************************************/

From a3d52631e680346b55c9faa0862ffc2c7de041ac Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Thu, 27 Aug 2020 12:39:27 +0200
Subject: [PATCH 03/24] Some code cleanup for measureRiskLevelAndKeyRetrieval

---
 .../TestForAPIFragment.kt                     | 62 ++++++++++++-------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
index 03e4499378d..b26a4210daa 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
@@ -300,22 +300,34 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
         updateExposureSummaryDisplay(null)
     }
 
-    private suspend fun measureRiskLevelAndKeyRetrieval(times: Int) {
-        var result = StringBuilder()
+    /**
+     * Calls the RetrieveDiagnosisKeysTransaction and RiskLevelTransaction and measures them.
+     * Results are displayed using a label
+     * @param callCount defines how often the transactions should be called (each call will be
+     * measured separately)
+     */
+    private suspend fun measureRiskLevelAndKeyRetrieval(callCount: Int) {
+        val countries = DiagnosisKeyConstants.COUNTRIES
+        var resultInfo = StringBuilder()
             .append("Result: \n")
+            .append("Using countries: ${countries.joinToString(",")}\n")
             .append("#\t Download \t Key Calc \t File # \t Key #\n")
 
-        repeat(times) { index ->
-            try {
-                // get count of country dates
-                var fileCount = WebRequestBuilder.getInstance().asyncGetCountryIndex().flatMap {
-                    WebRequestBuilder.getInstance().asyncGetDateIndex(it)
-                }.size
+        repeat(callCount) { index ->
+
+            // get count of all country dates
+            var fileCount =
+                WebRequestBuilder.getInstance()
+                    .asyncGetCountryIndex(countries)
+                    .flatMap {
+                        WebRequestBuilder.getInstance().asyncGetDateIndex(it)
+                    }.size
 
-                var keyFileDownloadStart: Long = -1
-                var keyFileCount: Int = -1
-                var keyFileDownloadDuration: Long = -1
+            var keyFileDownloadStart: Long = -1
+            var keyFileCount: Int = -1
+            var keyFileDownloadDuration: Long = -1
 
+            try {
                 // start diagnostic key transaction with callback to get duration of Download
                 RetrieveDiagnosisKeysTransaction.start(
                     onKeyFilesStarted = {
@@ -326,23 +338,29 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
                         Timber.v("MEASURE [Diagnostic Key Files] #${index} finished.")
                         keyFileDownloadDuration = System.currentTimeMillis() - keyFileDownloadStart
                         keyFileCount = it
-                    })
+                    }
+                )
+            } catch (e: TransactionException) {
+                e.report(ExceptionCategory.INTERNAL)
+            }
 
+            val calculationStart = System.currentTimeMillis()
+            var calculationDuration: Long = -1
+            try {
                 // start risk level calculation and get duration
-                val calculationStart = System.currentTimeMillis()
                 RiskLevelTransaction.start()
-                val calculationDuration = System.currentTimeMillis() - calculationStart
-
-                // build result entry for current iteration with all gathered data
-                result.append(
-                    "${index + 1}. \t $keyFileDownloadDuration ms " +
-                            "\t\t $calculationDuration ms \t\t $fileCount \t\t $keyFileCount\n"
-                )
-                
-                label_test_api_measure_calc_key_status.text = result.toString()
+                calculationDuration = System.currentTimeMillis() - calculationStart
             } catch (e: TransactionException) {
                 e.report(ExceptionCategory.INTERNAL)
             }
+
+            // build result entry for current iteration with all gathered data
+            resultInfo.append(
+                "${index + 1}. \t $keyFileDownloadDuration ms " +
+                        "\t\t $calculationDuration ms \t\t $fileCount \t\t $keyFileCount\n"
+            )
+
+            label_test_api_measure_calc_key_status.text = resultInfo.toString()
         }
     }
 

From d7cae292895042583791f18d449f52cf48ae10b4 Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Fri, 28 Aug 2020 09:32:00 +0200
Subject: [PATCH 04/24] Some code cleanup (#2229)

---
 .../TestForAPIFragment.kt                     | 55 ++++++++++++++-----
 .../res/layout/fragment_test_for_a_p_i.xml    |  3 +-
 .../coronawarnapp/http/WebRequestBuilder.kt   |  5 +-
 .../RetrieveDiagnosisKeysTransaction.kt       | 12 ++--
 4 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
index b26a4210daa..c601825e64a 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
@@ -64,6 +64,7 @@ import timber.log.Timber
 import java.io.File
 import java.lang.reflect.Type
 import java.util.*
+import kotlin.system.measureTimeMillis
 
 @SuppressWarnings("TooManyFunctions", "MagicNumber", "LongMethod")
 class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHelper.Callback {
@@ -308,25 +309,33 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
      */
     private suspend fun measureRiskLevelAndKeyRetrieval(callCount: Int) {
         val countries = DiagnosisKeyConstants.COUNTRIES
+
         var resultInfo = StringBuilder()
-            .append("Result: \n")
-            .append("Using countries: ${countries.joinToString(",")}\n")
+            .append(
+                "MEASUREMENT Running for Countries:\n " +
+                        "${countries.joinToString(", ")}\n\n"
+            )
+            .append("Result: \n\n")
             .append("#\t Download \t Key Calc \t File # \t Key #\n")
 
+        label_test_api_measure_calc_key_status.text = resultInfo.toString()
+
+        val webRequestBuilder = WebRequestBuilder.getInstance()
         repeat(callCount) { index ->
 
             // get count of all country dates
-            var fileCount =
-                WebRequestBuilder.getInstance()
-                    .asyncGetCountryIndex(countries)
-                    .flatMap {
-                        WebRequestBuilder.getInstance().asyncGetDateIndex(it)
-                    }.size
-
+            var fileCount = webRequestBuilder.asyncGetCountryIndex(countries)
+                .flatMap {
+                    webRequestBuilder.asyncGetDateIndex(it)
+                }.size
+
+            /**
+             * MEASUREMENT OF DIAGNOSTIC KEY RETRIEVAL
+             */
             var keyFileDownloadStart: Long = -1
             var keyFileCount: Int = -1
             var keyFileDownloadDuration: Long = -1
-
+            var keyRetrievalError = ""
             try {
                 // start diagnostic key transaction with callback to get duration of Download
                 RetrieveDiagnosisKeysTransaction.start(
@@ -335,21 +344,30 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
                         keyFileDownloadStart = System.currentTimeMillis()
                     },
                     onKeyFilesFinished = {
-                        Timber.v("MEASURE [Diagnostic Key Files] #${index} finished.")
+                        Timber.v("MEASURE [Diagnostic Key Files] #${index} finished")
                         keyFileDownloadDuration = System.currentTimeMillis() - keyFileDownloadStart
                         keyFileCount = it
                     }
                 )
             } catch (e: TransactionException) {
                 e.report(ExceptionCategory.INTERNAL)
+                keyRetrievalError = e.message.toString()
             }
 
-            val calculationStart = System.currentTimeMillis()
+            /**
+             * MEASUREMENT OF RISK CALCULATION
+             */
             var calculationDuration: Long = -1
+            val calculationError = ""
             try {
+                Timber.v("MEASURE [Risk Level Calculation] #${index} started")
                 // start risk level calculation and get duration
-                RiskLevelTransaction.start()
-                calculationDuration = System.currentTimeMillis() - calculationStart
+                measureTimeMillis {
+                    RiskLevelTransaction.start()
+                }.also {
+                    Timber.v("MEASURE [Risk Level Calculation] #${index} finished")
+                    calculationDuration = it
+                }
             } catch (e: TransactionException) {
                 e.report(ExceptionCategory.INTERNAL)
             }
@@ -360,6 +378,15 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
                         "\t\t $calculationDuration ms \t\t $fileCount \t\t $keyFileCount\n"
             )
 
+            if (keyRetrievalError.isNotEmpty()) {
+                resultInfo.append("Key Retrieval Error: $keyRetrievalError\n")
+            }
+
+            if (calculationError.isNotEmpty()) {
+                resultInfo.append("Calculation Error: $calculationError\n")
+            }
+
+
             label_test_api_measure_calc_key_status.text = resultInfo.toString()
         }
     }
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
index 7a0168d58c5..70cbe8d7671 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
@@ -235,8 +235,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="10dp">
+                android:layout_height="wrap_content">
 
                 <EditText
                     android:id="@+id/input_country_codes_editText"
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt
index 76c3ce5878a..30422370fdf 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt
@@ -44,6 +44,7 @@ import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.io.File
 import java.util.Date
+import java.util.Locale
 import java.util.UUID
 import kotlin.math.max
 
@@ -91,8 +92,8 @@ class WebRequestBuilder(
             return@withContext distributionService
                 .getDateIndex(DiagnosisKeyConstants.AVAILABLE_COUNTRIES_URL)
                 .filter {
-                    filter.map { c -> c.toUpperCase() }
-                        .contains(it.toUpperCase())
+                    filter.map { c -> c.toUpperCase(Locale.ROOT) }
+                        .contains(it.toUpperCase(Locale.ROOT))
                 }
                 .toList()
         }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
index 473b08b0c49..c909bdc8e7c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
@@ -136,6 +136,10 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
         }
     }
 
+    //TODO: Refactoring -> Make debugging callbacks part of class, not method
+    //onKeyFilesStarted: (() -> Unit)? = null,
+    //        onKeyFilesFinished: ((keyFiles: Int) -> Unit)? = null
+
     /** initiates the transaction. This suspend function guarantees a successful transaction once completed. */
     suspend fun start(
         onKeyFilesStarted: (() -> Unit)? = null,
@@ -173,9 +177,7 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
          * FILES FROM WEB REQUESTS
          ****************************************************/
         if (fireEvent) {
-            if (onKeyFilesStarted != null) {
-                onKeyFilesStarted()
-            }
+            onKeyFilesStarted?.invoke()
         }
 
         val keyFiles = executeFetchKeyFilesFromServer(currentDate)
@@ -190,9 +192,7 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
         }
 
         if (fireEvent) {
-            if (onKeyFilesFinished != null) {
-                onKeyFilesFinished(keyFiles.size)
-            }
+            onKeyFilesFinished?.invoke(keyFiles.size)
         }
 
         /****************************************************

From 249afc5440a77aaae98c2066a56b9d93202170ff Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Fri, 28 Aug 2020 15:47:06 +0200
Subject: [PATCH 05/24] Implement usage of AppConfig usage for country codes
 (#2229)

---
 .../TestForAPIFragment.kt                     | 138 ++++++++++--------
 .../coronawarnapp/http/WebRequestBuilder.kt   |   3 +-
 .../ApplicationConfigurationService.kt        |  19 ++-
 .../diagnosiskey/DiagnosisKeyConstants.kt     |   3 +-
 .../RetrieveDiagnosisKeysTransaction.kt       |  39 +++--
 .../coronawarnapp/util/CachedKeyFileHolder.kt |  19 ++-
 .../http/WebRequestBuilderTest.kt             |   2 +-
 .../ApplicationConfigurationServiceTest.kt    |  55 +++++++
 .../util/CachedKeyFileHolderTest.kt           |   4 +-
 .../main/proto/applicationConfiguration.proto |   2 +
 10 files changed, 194 insertions(+), 90 deletions(-)
 create mode 100644 Corona-Warn-App/src/test/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationServiceTest.kt

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
index c601825e64a..45cb3eb96f1 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
@@ -36,14 +36,12 @@ import de.rki.coronawarnapp.exception.ExceptionCategory
 import de.rki.coronawarnapp.exception.ExceptionCategory.INTERNAL
 import de.rki.coronawarnapp.exception.TransactionException
 import de.rki.coronawarnapp.exception.reporting.report
-import de.rki.coronawarnapp.http.WebRequestBuilder
 import de.rki.coronawarnapp.nearby.InternalExposureNotificationClient
 import de.rki.coronawarnapp.nearby.InternalExposureNotificationPermissionHelper
 import de.rki.coronawarnapp.receiver.ExposureStateUpdateReceiver
 import de.rki.coronawarnapp.risk.TimeVariables
 import de.rki.coronawarnapp.server.protocols.AppleLegacyKeyExchange
 import de.rki.coronawarnapp.service.applicationconfiguration.ApplicationConfigurationService
-import de.rki.coronawarnapp.service.diagnosiskey.DiagnosisKeyConstants
 import de.rki.coronawarnapp.sharing.ExposureSharingService
 import de.rki.coronawarnapp.storage.AppDatabase
 import de.rki.coronawarnapp.storage.ExposureSummaryRepository
@@ -101,6 +99,8 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
     private var _binding: FragmentTestForAPIBinding? = null
     private val binding: FragmentTestForAPIBinding get() = _binding!!
 
+    private var lastSetCountries: List<String>? = null
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -148,13 +148,20 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
         qrPager.adapter = qrPagerAdapter
 
 
-        // Update Country UI element states
-        (input_country_codes_editText as EditText).setText(
-            DiagnosisKeyConstants.COUNTRIES.joinToString(
-                ","
+        // Load countries from App config and update Country UI element states
+        lifecycleScope.launch {
+            lastSetCountries =
+                ApplicationConfigurationService.asyncRetrieveApplicationConfiguration()
+                    .countryCodesList
+
+            (input_country_codes_editText as EditText).setText(
+                lastSetCountries?.joinToString(
+                    ","
+                )
             )
-        )
-        updateCountryStatusLabel()
+
+            updateCountryStatusLabel()
+        }
 
         button_api_test_start.setOnClickListener {
             start()
@@ -270,18 +277,15 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             // Get user input country codes
             val rawCountryCodes = (input_country_codes_editText as EditText).text.toString()
 
-            // Country codes can be seperated by space or ,
-            val countryCodes = rawCountryCodes.split(',', ' ')
+            // Country codes can be separated by space or ,
+            var countryCodes = rawCountryCodes.split(',', ' ').filter { it.isNotEmpty() }
 
-            // DiagnosisKeyConstants.COUNTRIES is used in @see WebRequestBuilder to filter
-            // countries out of the full countries index of the server (response)
-            DiagnosisKeyConstants.COUNTRIES = countryCodes.filter { it.isNotEmpty() }
+            lastSetCountries = countryCodes
 
-            // Trigger asyncFetchFiles which will use all Countries defined in
-            // DiagnosisKeyConstants.COUNTRIES
+            // Trigger asyncFetchFiles which will use all Countries passed as parameter
             val currentDate = Date(System.currentTimeMillis())
             lifecycleScope.launch {
-                CachedKeyFileHolder.asyncFetchFiles(currentDate)
+                CachedKeyFileHolder.asyncFetchFiles(currentDate, countryCodes)
                 updateCountryStatusLabel()
             }
         }
@@ -308,74 +312,48 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
      * measured separately)
      */
     private suspend fun measureRiskLevelAndKeyRetrieval(callCount: Int) {
-        val countries = DiagnosisKeyConstants.COUNTRIES
+        val countries = lastSetCountries
 
         var resultInfo = StringBuilder()
             .append(
                 "MEASUREMENT Running for Countries:\n " +
-                        "${countries.joinToString(", ")}\n\n"
+                        "${countries?.joinToString(", ")}\n\n"
             )
             .append("Result: \n\n")
-            .append("#\t Download \t Key Calc \t File # \t Key #\n")
+            .append("#\t Combined \t Download \t Key Calc \t File #\n")
 
         label_test_api_measure_calc_key_status.text = resultInfo.toString()
 
-        val webRequestBuilder = WebRequestBuilder.getInstance()
         repeat(callCount) { index ->
-
-            // get count of all country dates
-            var fileCount = webRequestBuilder.asyncGetCountryIndex(countries)
-                .flatMap {
-                    webRequestBuilder.asyncGetDateIndex(it)
-                }.size
-
-            /**
-             * MEASUREMENT OF DIAGNOSTIC KEY RETRIEVAL
-             */
-            var keyFileDownloadStart: Long = -1
+            var keyRetrievalError = ""
             var keyFileCount: Int = -1
             var keyFileDownloadDuration: Long = -1
-            var keyRetrievalError = ""
+
             try {
-                // start diagnostic key transaction with callback to get duration of Download
-                RetrieveDiagnosisKeysTransaction.start(
-                    onKeyFilesStarted = {
-                        Timber.v("MEASURE [Diagnostic Key Files] #${index} started")
-                        keyFileDownloadStart = System.currentTimeMillis()
-                    },
-                    onKeyFilesFinished = {
-                        Timber.v("MEASURE [Diagnostic Key Files] #${index} finished")
-                        keyFileDownloadDuration = System.currentTimeMillis() - keyFileDownloadStart
-                        keyFileCount = it
-                    }
-                )
+                measureDiagnosticKeyRetrieval("#$index") { duration, keyCount ->
+                    keyFileCount = keyCount
+                    keyFileDownloadDuration = duration
+                }
             } catch (e: TransactionException) {
-                e.report(ExceptionCategory.INTERNAL)
                 keyRetrievalError = e.message.toString()
             }
 
-            /**
-             * MEASUREMENT OF RISK CALCULATION
-             */
             var calculationDuration: Long = -1
-            val calculationError = ""
+            var calculationError = ""
+
             try {
-                Timber.v("MEASURE [Risk Level Calculation] #${index} started")
-                // start risk level calculation and get duration
-                measureTimeMillis {
-                    RiskLevelTransaction.start()
-                }.also {
-                    Timber.v("MEASURE [Risk Level Calculation] #${index} finished")
+                measureKeyCalculation("#$index") {
                     calculationDuration = it
                 }
             } catch (e: TransactionException) {
-                e.report(ExceptionCategory.INTERNAL)
+                calculationError = e.message.toString()
             }
 
             // build result entry for current iteration with all gathered data
             resultInfo.append(
-                "${index + 1}. \t $keyFileDownloadDuration ms " +
-                        "\t\t $calculationDuration ms \t\t $fileCount \t\t $keyFileCount\n"
+                "${index + 1}. \t ${calculationDuration + keyFileDownloadDuration} ms \t\t " +
+                        "$keyFileDownloadDuration ms " +
+                        "\t\t $calculationDuration ms \t\t $keyFileCount\n"
             )
 
             if (keyRetrievalError.isNotEmpty()) {
@@ -386,11 +364,51 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
                 resultInfo.append("Calculation Error: $calculationError\n")
             }
 
-
             label_test_api_measure_calc_key_status.text = resultInfo.toString()
         }
     }
 
+    private suspend fun measureKeyCalculation(label: String, finished: (duration: Long) -> Unit) {
+        try {
+            Timber.v("MEASURE [Risk Level Calculation] $label started")
+            // start risk level calculation and get duration
+            measureTimeMillis {
+                RiskLevelTransaction.start()
+            }.also {
+                Timber.v("MEASURE [Risk Level Calculation] $label finished")
+                finished(it)
+            }
+        } catch (e: TransactionException) {
+            e.report(ExceptionCategory.INTERNAL)
+            throw e
+        }
+    }
+
+    private suspend fun measureDiagnosticKeyRetrieval(
+        label: String,
+        finished: (duration: Long, keyCount: Int) -> Unit
+    ) {
+        var keyFileDownloadStart: Long = -1
+
+        try {
+            RetrieveDiagnosisKeysTransaction.onKeyFilesStarted = {
+                Timber.v("MEASURE [Diagnostic Key Files] $label started")
+                keyFileDownloadStart = System.currentTimeMillis()
+            }
+
+            RetrieveDiagnosisKeysTransaction.onKeyFilesFinished = {
+                Timber.v("MEASURE [Diagnostic Key Files] $label finished")
+                val duration = System.currentTimeMillis() - keyFileDownloadStart
+                finished(duration, it)
+            }
+            // start diagnostic key transaction
+            RetrieveDiagnosisKeysTransaction.start(lastSetCountries)
+        } catch (e: TransactionException) {
+            e.report(ExceptionCategory.INTERNAL)
+            throw e
+        }
+    }
+
     /**
      * Updates the Label for country filter
      */
@@ -398,7 +416,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
         label_country_code_filter_status.text =
             getString(
                 R.string.test_api_country_filter_status,
-                DiagnosisKeyConstants.COUNTRIES.joinToString(", ")
+                lastSetCountries?.joinToString(", ")
             )
     }
 
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt
index 30422370fdf..34e4e7e101f 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt
@@ -81,12 +81,11 @@ class WebRequestBuilder(
 
     /**
      * Gets the country index which is then filtered by given filter param or if param not set
-     * DiagnosisKeyConstants.COUNTRIES will be used for filtering
      * @param filter (array of country codes) used to filter
      * only wanted countries of the country index (case insensitive)
      */
     suspend fun asyncGetCountryIndex(
-        filter: List<String> = DiagnosisKeyConstants.COUNTRIES
+        filter: List<String>
     ): List<String> =
         withContext(Dispatchers.IO) {
             return@withContext distributionService
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationService.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationService.kt
index 790beb9c0da..9b003860e5d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationService.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationService.kt
@@ -3,10 +3,27 @@ package de.rki.coronawarnapp.service.applicationconfiguration
 import com.google.android.gms.nearby.exposurenotification.ExposureConfiguration
 import de.rki.coronawarnapp.http.WebRequestBuilder
 import de.rki.coronawarnapp.server.protocols.ApplicationConfigurationOuterClass.ApplicationConfiguration
+import de.rki.coronawarnapp.util.CWADebug
 
 object ApplicationConfigurationService {
     suspend fun asyncRetrieveApplicationConfiguration(): ApplicationConfiguration {
-        return WebRequestBuilder.getInstance().asyncGetApplicationConfigurationFromServer()
+        return WebRequestBuilder.getInstance().asyncGetApplicationConfigurationFromServer().let {
+            return if (CWADebug.isDebugBuildOrMode) {
+                // TODO: THIS IS A MOCK -> Remove after Backend is providing this information.
+                it.toBuilder()
+                    .clearCountryCodes()
+                    .addAllCountryCodes(
+                        listOf(
+                            "DE", "UK", "FR", "IT", "SP", "PL", "RO", "NL",
+                            "BE", "CZ", "EL", "SE", "PT", "HU", "AT", "CH", "BG", "DK", "FI", "SK",
+                            "NO", "IE", "HR", "SI", "LT", "LV", "EE", "CY", "LU", "MT", "IS"
+                        )
+                    )
+                    .build()
+            } else {
+                it
+            }
+        }
     }
 
     suspend fun asyncRetrieveExposureConfiguration(): ExposureConfiguration =
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt
index 4983b168904..7b02d484d13 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt
@@ -46,8 +46,7 @@ object DiagnosisKeyConstants {
 
     /** resource variables but non-static context */
     private var CURRENT_VERSION = "v1"
-    var CURRENT_COUNTRY = "DE"
-    var COUNTRIES = listOf<String>("DE")
+    val CURRENT_COUNTRY = "DE"
 
     /** Distribution URL built from CDN URL's and REST resources */
     private var VERSIONED_DISTRIBUTION_CDN_URL = "$VERSION/$CURRENT_VERSION"
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
index c909bdc8e7c..7534baa9c71 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
@@ -20,7 +20,6 @@
 package de.rki.coronawarnapp.transaction
 
 import com.google.android.gms.nearby.exposurenotification.ExposureConfiguration
-import de.rki.coronawarnapp.BuildConfig
 import de.rki.coronawarnapp.CoronaWarnApplication
 import de.rki.coronawarnapp.nearby.InternalExposureNotificationClient
 import de.rki.coronawarnapp.service.applicationconfiguration.ApplicationConfigurationService
@@ -36,6 +35,7 @@ import de.rki.coronawarnapp.transaction.RetrieveDiagnosisKeysTransaction.Retriev
 import de.rki.coronawarnapp.transaction.RetrieveDiagnosisKeysTransaction.RetrieveDiagnosisKeysTransactionState.TOKEN
 import de.rki.coronawarnapp.transaction.RetrieveDiagnosisKeysTransaction.rollback
 import de.rki.coronawarnapp.transaction.RetrieveDiagnosisKeysTransaction.start
+import de.rki.coronawarnapp.util.CWADebug
 import de.rki.coronawarnapp.util.CachedKeyFileHolder
 import de.rki.coronawarnapp.worker.BackgroundWorkHelper
 import org.joda.time.DateTime
@@ -119,6 +119,9 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
     /** atomic reference for the rollback value for created files during the transaction */
     private val exportFilesForRollback = AtomicReference<List<File>>()
 
+    var onKeyFilesStarted: (() -> Unit)? = null
+    var onKeyFilesFinished: ((keyCount: Int) -> Unit)? = null
+
     suspend fun startWithConstraints() {
         val currentDate = DateTime(Instant.now(), DateTimeZone.UTC)
         val lastFetch = DateTime(
@@ -136,18 +139,14 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
         }
     }
 
-    //TODO: Refactoring -> Make debugging callbacks part of class, not method
-    //onKeyFilesStarted: (() -> Unit)? = null,
-    //        onKeyFilesFinished: ((keyFiles: Int) -> Unit)? = null
-
-    /** initiates the transaction. This suspend function guarantees a successful transaction once completed. */
+    /** initiates the transaction. This suspend function guarantees a successful transaction once completed.
+     * @param countries defines which countries (country codes) should be used. If not filled the
+     * country codes will be loaded from the ApplicationConfigurationService
+     */
     suspend fun start(
-        onKeyFilesStarted: (() -> Unit)? = null,
-        onKeyFilesFinished: ((keyFiles: Int) -> Unit)? = null
+        requestedCountries: List<String>? = null
     ) = lockAndExecuteUnique {
 
-        val fireEvent = BuildConfig.FLAVOR != "device"
-
         /**
          * Handles the case when the ENClient got disabled but the Transaction is still scheduled
          * in a background job. Also it acts as a failure catch in case the orchestration code did
@@ -176,11 +175,19 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
         /****************************************************
          * FILES FROM WEB REQUESTS
          ****************************************************/
-        if (fireEvent) {
+        if (CWADebug.isDebugBuildOrMode) {
             onKeyFilesStarted?.invoke()
+            onKeyFilesStarted = null
         }
 
-        val keyFiles = executeFetchKeyFilesFromServer(currentDate)
+        val countries = requestedCountries ?: ApplicationConfigurationService
+            .asyncRetrieveApplicationConfiguration()
+            .countryCodesList
+
+        val keyFiles = executeFetchKeyFilesFromServer(
+            currentDate,
+            countries
+        )
 
         if (keyFiles.isNotEmpty()) {
             /****************************************************
@@ -191,8 +198,9 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
             Timber.tag(TAG).w("no key files, skipping submission to internal API.")
         }
 
-        if (fireEvent) {
+        if (CWADebug.isDebugBuildOrMode) {
             onKeyFilesFinished?.invoke(keyFiles.size)
+            onKeyFilesFinished = null
         }
 
         /****************************************************
@@ -273,10 +281,11 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
      * Executes the WEB_REQUESTS Transaction State
      */
     private suspend fun executeFetchKeyFilesFromServer(
-        currentDate: Date
+        currentDate: Date,
+        countries: List<String>
     ) = executeState(FILES_FROM_WEB_REQUESTS) {
         FileStorageHelper.initializeExportSubDirectory()
-        CachedKeyFileHolder.asyncFetchFiles(currentDate)
+        CachedKeyFileHolder.asyncFetchFiles(currentDate, countries)
     }
 
     /**
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
index 361380395bf..39f92230a58 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
@@ -67,14 +67,17 @@ object CachedKeyFileHolder {
      * @param currentDate the current date - if this is adjusted by the calendar, the cache is affected.
      * @return list of all files from both the cache and the diff query
      */
-    suspend fun asyncFetchFiles(currentDate: Date): List<File> = withContext(Dispatchers.IO) {
+    suspend fun asyncFetchFiles(
+        currentDate: Date,
+        countries: List<String>
+    ): List<File> = withContext(Dispatchers.IO) {
         // Initiate key-cache folder needed for saving downloaded key files
         FileStorageHelper.initializeExportSubDirectory()
 
         checkForFreeSpace()
 
         // Build pair of country to date <Country, Date[]>
-        val serverDates = getCountriesFromServer().map { Pair(it, getDatesFromServer(it)) }
+        val serverDates = getCountriesFromServer(countries).map { Pair(it, getDatesFromServer(it)) }
 
         // TODO remove last3HourFetch before Release
         if (BuildConfig.FLAVOR != "device" && isLast3HourFetchEnabled()) {
@@ -144,9 +147,11 @@ object CachedKeyFileHolder {
                                 )
                             }
                         }
-                        .map { url -> async {
-                            url.createDayEntryForUrl()
-                        } }
+                        .map { url ->
+                            async {
+                                url.createDayEntryForUrl()
+                            }
+                        }
                 )
             }
 
@@ -266,8 +271,8 @@ object CachedKeyFileHolder {
     /**
      * Get all countries from the server
      */
-    private suspend fun getCountriesFromServer() =
-        WebRequestBuilder.getInstance().asyncGetCountryIndex()
+    private suspend fun getCountriesFromServer(countries: List<String>) =
+        WebRequestBuilder.getInstance().asyncGetCountryIndex(countries)
 
     /**
      * TODO remove before release
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/http/WebRequestBuilderTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/http/WebRequestBuilderTest.kt
index 1b931b2dac8..0f63f670412 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/http/WebRequestBuilderTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/http/WebRequestBuilderTest.kt
@@ -55,7 +55,7 @@ class WebRequestBuilderTest {
 
         runBlocking {
             val expectedResult = listOf("1900-01-01", "2000-01-01")
-            Assert.assertEquals(webRequestBuilder.asyncGetDateIndex(), expectedResult)
+            Assert.assertEquals(webRequestBuilder.asyncGetDateIndex("DE"), expectedResult)
             coVerify {
                 distributionService.getDateIndex(urlString)
             }
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationServiceTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationServiceTest.kt
new file mode 100644
index 00000000000..4d361253791
--- /dev/null
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationServiceTest.kt
@@ -0,0 +1,55 @@
+package de.rki.coronawarnapp.service.applicationconfiguration
+
+import de.rki.coronawarnapp.http.WebRequestBuilder
+import de.rki.coronawarnapp.server.protocols.ApplicationConfigurationOuterClass
+import de.rki.coronawarnapp.util.CWADebug
+import io.kotest.matchers.shouldBe
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkObject
+import io.mockk.verify
+import kotlinx.coroutines.runBlocking
+import org.junit.Test
+import testhelpers.BaseTest
+
+class ApplicationConfigurationServiceTest : BaseTest() {
+
+    @Test
+    fun `mock country codes only in debug`() {
+        mockkObject(CWADebug)
+        every { CWADebug.isDebugBuildOrMode } returns true
+
+        CWADebug.isDebugBuildOrMode shouldBe true
+
+        mockkObject(WebRequestBuilder)
+        val requestBuilder = mockk<WebRequestBuilder>()
+        val appConfig = mockk<ApplicationConfigurationOuterClass.ApplicationConfiguration>()
+        val appConfigBuilder =
+            mockk<ApplicationConfigurationOuterClass.ApplicationConfiguration.Builder>()
+
+        every { appConfig.toBuilder() } returns appConfigBuilder
+
+        every { appConfigBuilder.addAllCountryCodes(any()) } returns appConfigBuilder
+
+        every { appConfigBuilder.build() } returns appConfig
+
+        coEvery { requestBuilder.asyncGetApplicationConfigurationFromServer() } returns appConfig
+
+        every { WebRequestBuilder.getInstance() } returns requestBuilder
+
+        runBlocking {
+            val config = ApplicationConfigurationService.asyncRetrieveApplicationConfiguration()
+            verify(exactly = 1) { appConfigBuilder.addAllCountryCodes(any()) }
+        }
+
+        every { CWADebug.isDebugBuildOrMode } returns false
+
+        CWADebug.isDebugBuildOrMode shouldBe false
+
+        runBlocking {
+            val config = ApplicationConfigurationService.asyncRetrieveApplicationConfiguration()
+            verify(exactly = 1) { appConfigBuilder.addAllCountryCodes(any()) }
+        }
+    }
+}
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
index b03e57dd794..cdbf8a0e143 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
@@ -55,10 +55,10 @@ class CachedKeyFileHolderTest {
 
         runBlocking {
 
-            CachedKeyFileHolder.asyncFetchFiles(date)
+            CachedKeyFileHolder.asyncFetchFiles(date, listOf("DE"))
 
             coVerifyOrder {
-                CachedKeyFileHolder.asyncFetchFiles(date)
+                CachedKeyFileHolder.asyncFetchFiles(date, listOf("DE"))
                 CachedKeyFileHolder["getDatesFromServer"]()
                 keyCacheRepository.deleteOutdatedEntries(any())
                 CachedKeyFileHolder["getMissingDaysFromDiff"](arrayListOf<String>())
diff --git a/Server-Protocol-Buffer/src/main/proto/applicationConfiguration.proto b/Server-Protocol-Buffer/src/main/proto/applicationConfiguration.proto
index a840bcd6aa9..142d737f6af 100644
--- a/Server-Protocol-Buffer/src/main/proto/applicationConfiguration.proto
+++ b/Server-Protocol-Buffer/src/main/proto/applicationConfiguration.proto
@@ -12,6 +12,8 @@ message ApplicationConfiguration {
     AttenuationDuration attenuationDuration = 4;
 
     ApplicationVersionConfiguration appVersion = 5;
+
+    repeated string countryCodes = 6;
 }
 
 message RiskScoreParameters {

From 6c8eff440224db28ec8745664061274bf9185a61 Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Sat, 29 Aug 2020 01:13:09 +0200
Subject: [PATCH 06/24] change CURRENT_COUNTRY val to var

---
 .../coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt
index 7b02d484d13..ba18ea55ac8 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt
@@ -46,7 +46,7 @@ object DiagnosisKeyConstants {
 
     /** resource variables but non-static context */
     private var CURRENT_VERSION = "v1"
-    val CURRENT_COUNTRY = "DE"
+    var CURRENT_COUNTRY = "DE"
 
     /** Distribution URL built from CDN URL's and REST resources */
     private var VERSIONED_DISTRIBUTION_CDN_URL = "$VERSION/$CURRENT_VERSION"

From c941829855eb9e515df8fc2bfcaa9c13a66b015e Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Sat, 29 Aug 2020 02:07:30 +0200
Subject: [PATCH 07/24] Suppress "LongMethod" warning (#2229)

---
 .../main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
index 39f92230a58..4c5eedbfb28 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
@@ -44,6 +44,7 @@ import java.util.UUID
  * Singleton used for accessing key files via combining cached entries from existing files and new requests.
  * made explicitly with [asyncFetchFiles] in mind
  */
+@SuppressWarnings("LongMethod")
 object CachedKeyFileHolder {
     private val TAG: String? = CachedKeyFileHolder::class.simpleName
 

From ce5ce765c6bb94c8791a58540f932fc1a398fcdf Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Sat, 29 Aug 2020 23:41:06 +0200
Subject: [PATCH 08/24] Adjust unit tests to respect new country filter

---
 .../TestForAPIFragment.kt                     |  4 ++--
 .../diagnosiskey/DiagnosisKeyConstants.kt     |  1 -
 .../ApplicationConfigurationServiceTest.kt    |  6 +++--
 .../RetrieveDiagnosisKeysTransactionTest.kt   | 22 ++++++++++++-------
 .../util/CachedKeyFileHolderTest.kt           | 17 +++++++++-----
 5 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
index 45cb3eb96f1..78f0d977955 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
@@ -61,7 +61,8 @@ import org.joda.time.DateTimeZone
 import timber.log.Timber
 import java.io.File
 import java.lang.reflect.Type
-import java.util.*
+import java.util.Date
+import java.util.UUID
 import kotlin.system.measureTimeMillis
 
 @SuppressWarnings("TooManyFunctions", "MagicNumber", "LongMethod")
@@ -147,7 +148,6 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
         qrPagerAdapter = QRPagerAdapter()
         qrPager.adapter = qrPagerAdapter
 
-
         // Load countries from App config and update Country UI element states
         lifecycleScope.launch {
             lastSetCountries =
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt
index ba18ea55ac8..a432fc7b9d0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt
@@ -74,7 +74,6 @@ object DiagnosisKeyConstants {
     val COUNTRY_APPCONFIG_DOWNLOAD_URL =
         "$APPCONFIG_COUNTRY_DOWNLOAD_URL/$CURRENT_COUNTRY/app_config"
 
-
     /** Dynamic URL to be able to specify which country should be used
      * instead of $CURRENT_COUNTRY
      **/
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationServiceTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationServiceTest.kt
index 4d361253791..60da8aab48a 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationServiceTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationServiceTest.kt
@@ -32,6 +32,8 @@ class ApplicationConfigurationServiceTest : BaseTest() {
 
         every { appConfigBuilder.addAllCountryCodes(any()) } returns appConfigBuilder
 
+        every { appConfigBuilder.clearCountryCodes() } returns appConfigBuilder
+
         every { appConfigBuilder.build() } returns appConfig
 
         coEvery { requestBuilder.asyncGetApplicationConfigurationFromServer() } returns appConfig
@@ -39,7 +41,7 @@ class ApplicationConfigurationServiceTest : BaseTest() {
         every { WebRequestBuilder.getInstance() } returns requestBuilder
 
         runBlocking {
-            val config = ApplicationConfigurationService.asyncRetrieveApplicationConfiguration()
+            ApplicationConfigurationService.asyncRetrieveApplicationConfiguration()
             verify(exactly = 1) { appConfigBuilder.addAllCountryCodes(any()) }
         }
 
@@ -48,7 +50,7 @@ class ApplicationConfigurationServiceTest : BaseTest() {
         CWADebug.isDebugBuildOrMode shouldBe false
 
         runBlocking {
-            val config = ApplicationConfigurationService.asyncRetrieveApplicationConfiguration()
+            ApplicationConfigurationService.asyncRetrieveApplicationConfiguration()
             verify(exactly = 1) { appConfigBuilder.addAllCountryCodes(any()) }
         }
     }
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt
index e8c59395e85..20eee123393 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt
@@ -1,9 +1,14 @@
 package de.rki.coronawarnapp.transaction
 
 import com.google.android.gms.nearby.exposurenotification.ExposureConfiguration
+import de.rki.coronawarnapp.http.WebRequestBuilder
 import de.rki.coronawarnapp.nearby.InternalExposureNotificationClient
+import de.rki.coronawarnapp.server.protocols.ApplicationConfigurationOuterClass
 import de.rki.coronawarnapp.service.applicationconfiguration.ApplicationConfigurationService
 import de.rki.coronawarnapp.storage.LocalData
+import de.rki.coronawarnapp.util.CWADebug
+import de.rki.coronawarnapp.util.CachedKeyFileHolder
+import io.kotest.matchers.shouldBe
 import io.mockk.Runs
 import io.mockk.coEvery
 import io.mockk.coVerifyOrder
@@ -50,15 +55,17 @@ class RetrieveDiagnosisKeysTransactionTest {
 
     @Test
     fun testTransactionNoFiles() {
-        coEvery { RetrieveDiagnosisKeysTransaction["executeFetchKeyFilesFromServer"](any<Date>()) } returns listOf<File>()
+        val requestedCountries = listOf("DE")
+        coEvery { RetrieveDiagnosisKeysTransaction["executeFetchKeyFilesFromServer"](any<Date>(),
+            requestedCountries) } returns listOf<File>()
 
         runBlocking {
-            RetrieveDiagnosisKeysTransaction.start()
+            RetrieveDiagnosisKeysTransaction.start(requestedCountries)
 
             coVerifyOrder {
                 RetrieveDiagnosisKeysTransaction["executeSetup"]()
                 RetrieveDiagnosisKeysTransaction["executeRetrieveRiskScoreParams"]()
-                RetrieveDiagnosisKeysTransaction["executeFetchKeyFilesFromServer"](any<Date>())
+                RetrieveDiagnosisKeysTransaction["executeFetchKeyFilesFromServer"](any<Date>(), requestedCountries)
                 RetrieveDiagnosisKeysTransaction["executeFetchDateUpdate"](any<Date>())
             }
         }
@@ -67,18 +74,17 @@ class RetrieveDiagnosisKeysTransactionTest {
     @Test
     fun testTransactionHasFiles() {
         val file = Paths.get("src", "test", "resources", "keys.bin").toFile()
+        val requestedCountries = listOf("DE")
 
-        coEvery { RetrieveDiagnosisKeysTransaction["executeFetchKeyFilesFromServer"](any<Date>()) } returns listOf(
-            file
-        )
+        coEvery { RetrieveDiagnosisKeysTransaction["executeFetchKeyFilesFromServer"](any<Date>(), requestedCountries) } returns listOf(file)
 
         runBlocking {
-            RetrieveDiagnosisKeysTransaction.start()
+            RetrieveDiagnosisKeysTransaction.start(requestedCountries)
 
             coVerifyOrder {
                 RetrieveDiagnosisKeysTransaction["executeSetup"]()
                 RetrieveDiagnosisKeysTransaction["executeRetrieveRiskScoreParams"]()
-                RetrieveDiagnosisKeysTransaction["executeFetchKeyFilesFromServer"](any<Date>())
+                RetrieveDiagnosisKeysTransaction["executeFetchKeyFilesFromServer"](any<Date>(), requestedCountries)
                 RetrieveDiagnosisKeysTransaction["executeAPISubmission"](
                     any<String>(),
                     listOf(file),
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
index cdbf8a0e143..d8494d2fb7d 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
@@ -16,6 +16,7 @@ import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
+import java.io.File
 import java.util.Date
 
 /**
@@ -46,22 +47,28 @@ class CachedKeyFileHolderTest {
     @Test
     fun testAsyncFetchFiles() {
         val date = Date()
+        val countries = listOf("DE")
+        val country = "DE"
 
         coEvery { keyCacheRepository.getDates() } returns listOf()
         coEvery { keyCacheRepository.getFilesFromEntries() } returns listOf()
         every { CachedKeyFileHolder["isLast3HourFetchEnabled"]() } returns false
         every { CachedKeyFileHolder["checkForFreeSpace"]() } returns Unit
-        every { CachedKeyFileHolder["getDatesFromServer"]() } returns arrayListOf<String>()
+        every { CachedKeyFileHolder["getDatesFromServer"](country) } returns arrayListOf<String>()
+
+        every { CoronaWarnApplication.getAppContext().cacheDir } returns File("./")
+        every { CachedKeyFileHolder["getCountriesFromServer"](countries) } returns countries
 
         runBlocking {
 
-            CachedKeyFileHolder.asyncFetchFiles(date, listOf("DE"))
+            CachedKeyFileHolder.asyncFetchFiles(date, countries)
 
             coVerifyOrder {
-                CachedKeyFileHolder.asyncFetchFiles(date, listOf("DE"))
-                CachedKeyFileHolder["getDatesFromServer"]()
+                CachedKeyFileHolder.asyncFetchFiles(date, countries)
+                CachedKeyFileHolder["getCountriesFromServer"](countries)
+                CachedKeyFileHolder["getDatesFromServer"](country)
                 keyCacheRepository.deleteOutdatedEntries(any())
-                CachedKeyFileHolder["getMissingDaysFromDiff"](arrayListOf<String>())
+                CachedKeyFileHolder["getMissingDaysFromDiff"](listOf(Pair(country, listOf<String>() )))
                 keyCacheRepository.getDates()
                 keyCacheRepository.getFilesFromEntries()
             }

From df93d0149d1ea1ad708e3302852b4201543d5541 Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Mon, 31 Aug 2020 11:02:21 +0200
Subject: [PATCH 09/24] Align with backend for app config country property name

---
 .../java/de.rki.coronawarnapp/TestForAPIFragment.kt       | 2 +-
 .../ApplicationConfigurationService.kt                    | 4 ++--
 .../transaction/RetrieveDiagnosisKeysTransaction.kt       | 2 +-
 .../ApplicationConfigurationServiceTest.kt                | 8 ++++----
 .../src/main/proto/applicationConfiguration.proto         | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
index 78f0d977955..1d048a383e8 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
@@ -152,7 +152,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
         lifecycleScope.launch {
             lastSetCountries =
                 ApplicationConfigurationService.asyncRetrieveApplicationConfiguration()
-                    .countryCodesList
+                    .supportedCountriesList
 
             (input_country_codes_editText as EditText).setText(
                 lastSetCountries?.joinToString(
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationService.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationService.kt
index 9b003860e5d..314b7c1197d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationService.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationService.kt
@@ -11,8 +11,8 @@ object ApplicationConfigurationService {
             return if (CWADebug.isDebugBuildOrMode) {
                 // TODO: THIS IS A MOCK -> Remove after Backend is providing this information.
                 it.toBuilder()
-                    .clearCountryCodes()
-                    .addAllCountryCodes(
+                    .clearSupportedCountries()
+                    .addAllSupportedCountries(
                         listOf(
                             "DE", "UK", "FR", "IT", "SP", "PL", "RO", "NL",
                             "BE", "CZ", "EL", "SE", "PT", "HU", "AT", "CH", "BG", "DK", "FI", "SK",
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
index 7534baa9c71..72ae8ce6839 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
@@ -182,7 +182,7 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
 
         val countries = requestedCountries ?: ApplicationConfigurationService
             .asyncRetrieveApplicationConfiguration()
-            .countryCodesList
+            .supportedCountriesList
 
         val keyFiles = executeFetchKeyFilesFromServer(
             currentDate,
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationServiceTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationServiceTest.kt
index 60da8aab48a..771b9d242da 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationServiceTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationServiceTest.kt
@@ -30,9 +30,9 @@ class ApplicationConfigurationServiceTest : BaseTest() {
 
         every { appConfig.toBuilder() } returns appConfigBuilder
 
-        every { appConfigBuilder.addAllCountryCodes(any()) } returns appConfigBuilder
+        every { appConfigBuilder.addAllSupportedCountries(any()) } returns appConfigBuilder
 
-        every { appConfigBuilder.clearCountryCodes() } returns appConfigBuilder
+        every { appConfigBuilder.clearSupportedCountries() } returns appConfigBuilder
 
         every { appConfigBuilder.build() } returns appConfig
 
@@ -42,7 +42,7 @@ class ApplicationConfigurationServiceTest : BaseTest() {
 
         runBlocking {
             ApplicationConfigurationService.asyncRetrieveApplicationConfiguration()
-            verify(exactly = 1) { appConfigBuilder.addAllCountryCodes(any()) }
+            verify(exactly = 1) { appConfigBuilder.addAllSupportedCountries(any()) }
         }
 
         every { CWADebug.isDebugBuildOrMode } returns false
@@ -51,7 +51,7 @@ class ApplicationConfigurationServiceTest : BaseTest() {
 
         runBlocking {
             ApplicationConfigurationService.asyncRetrieveApplicationConfiguration()
-            verify(exactly = 1) { appConfigBuilder.addAllCountryCodes(any()) }
+            verify(exactly = 1) { appConfigBuilder.addAllSupportedCountries(any()) }
         }
     }
 }
diff --git a/Server-Protocol-Buffer/src/main/proto/applicationConfiguration.proto b/Server-Protocol-Buffer/src/main/proto/applicationConfiguration.proto
index 142d737f6af..a686d33cbdd 100644
--- a/Server-Protocol-Buffer/src/main/proto/applicationConfiguration.proto
+++ b/Server-Protocol-Buffer/src/main/proto/applicationConfiguration.proto
@@ -13,7 +13,7 @@ message ApplicationConfiguration {
 
     ApplicationVersionConfiguration appVersion = 5;
 
-    repeated string countryCodes = 6;
+    repeated string supportedCountries = 6;
 }
 
 message RiskScoreParameters {

From 03a62191686b87e91882dc9d8012c8c986984cbf Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Mon, 31 Aug 2020 13:40:35 +0200
Subject: [PATCH 10/24] Display total file size of keys in results (#2229)

---
 .../de.rki.coronawarnapp/TestForAPIFragment.kt     | 14 ++++++++------
 .../RetrieveDiagnosisKeysTransaction.kt            | 10 ++++++++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
index 1d048a383e8..8b75244a769 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
@@ -320,7 +320,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
                         "${countries?.joinToString(", ")}\n\n"
             )
             .append("Result: \n\n")
-            .append("#\t Combined \t Download \t Key Calc \t File #\n")
+            .append("#\t Combined \t Download \t Key Calc \t File # \t Files size\n")
 
         label_test_api_measure_calc_key_status.text = resultInfo.toString()
 
@@ -328,11 +328,13 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             var keyRetrievalError = ""
             var keyFileCount: Int = -1
             var keyFileDownloadDuration: Long = -1
+            var keyFilesSize: Long = -1
 
             try {
-                measureDiagnosticKeyRetrieval("#$index") { duration, keyCount ->
+                measureDiagnosticKeyRetrieval("#$index") { duration, keyCount, totalFileSize ->
                     keyFileCount = keyCount
                     keyFileDownloadDuration = duration
+                    keyFilesSize = totalFileSize
                 }
             } catch (e: TransactionException) {
                 keyRetrievalError = e.message.toString()
@@ -353,7 +355,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             resultInfo.append(
                 "${index + 1}. \t ${calculationDuration + keyFileDownloadDuration} ms \t\t " +
                         "$keyFileDownloadDuration ms " +
-                        "\t\t $calculationDuration ms \t\t $keyFileCount\n"
+                        "\t\t $calculationDuration ms \t\t $keyFileCount \t\t $keyFilesSize MB\n"
             )
 
             if (keyRetrievalError.isNotEmpty()) {
@@ -386,7 +388,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
 
     private suspend fun measureDiagnosticKeyRetrieval(
         label: String,
-        finished: (duration: Long, keyCount: Int) -> Unit
+        finished: (duration: Long, keyCount: Int, fileSize: Long) -> Unit
     ) {
         var keyFileDownloadStart: Long = -1
 
@@ -396,10 +398,10 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
                 keyFileDownloadStart = System.currentTimeMillis()
             }
 
-            RetrieveDiagnosisKeysTransaction.onKeyFilesFinished = {
+            RetrieveDiagnosisKeysTransaction.onKeyFilesFinished = { count, size ->
                 Timber.v("MEASURE [Diagnostic Key Files] $label finished")
                 val duration = System.currentTimeMillis() - keyFileDownloadStart
-                finished(duration, it)
+                finished(duration, count, size)
             }
             // start diagnostic key transaction
             RetrieveDiagnosisKeysTransaction.start(lastSetCountries)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
index 72ae8ce6839..7c8511ec165 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
@@ -120,7 +120,7 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
     private val exportFilesForRollback = AtomicReference<List<File>>()
 
     var onKeyFilesStarted: (() -> Unit)? = null
-    var onKeyFilesFinished: ((keyCount: Int) -> Unit)? = null
+    var onKeyFilesFinished: ((keyCount: Int, fileSize: Long) -> Unit)? = null
 
     suspend fun startWithConstraints() {
         val currentDate = DateTime(Instant.now(), DateTimeZone.UTC)
@@ -199,7 +199,13 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
         }
 
         if (CWADebug.isDebugBuildOrMode) {
-            onKeyFilesFinished?.invoke(keyFiles.size)
+            var totalFileSize: Long = 0
+            keyFiles.also {
+                it.forEach { file ->
+                    totalFileSize += file.length()
+                }
+            }
+            onKeyFilesFinished?.invoke(keyFiles.size, totalFileSize / (1024 *1024))
             onKeyFilesFinished = null
         }
 

From 7b763cb23d829d8cdbbbc03e9a59491c95ef1197 Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Mon, 31 Aug 2020 13:54:34 +0200
Subject: [PATCH 11/24] Fix linting issue

---
 .../transaction/RetrieveDiagnosisKeysTransaction.kt            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
index 7c8511ec165..7fc3ba66653 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
@@ -200,12 +200,13 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
 
         if (CWADebug.isDebugBuildOrMode) {
             var totalFileSize: Long = 0
+            val fileSizeUnit = (1024 * 1024)
             keyFiles.also {
                 it.forEach { file ->
                     totalFileSize += file.length()
                 }
             }
-            onKeyFilesFinished?.invoke(keyFiles.size, totalFileSize / (1024 *1024))
+            onKeyFilesFinished?.invoke(keyFiles.size, totalFileSize / fileSizeUnit)
             onKeyFilesFinished = null
         }
 

From 38e26d982b58b98740eb5bcf9172cf0dc35ee055 Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Tue, 1 Sep 2020 16:22:59 +0200
Subject: [PATCH 12/24] Update strings.xml files

---
 Corona-Warn-App/src/main/res/values-bg/strings.xml | 1 -
 Corona-Warn-App/src/main/res/values-de/strings.xml | 4 +++-
 Corona-Warn-App/src/main/res/values-en/strings.xml | 2 --
 Corona-Warn-App/src/main/res/values-pl/strings.xml | 1 -
 Corona-Warn-App/src/main/res/values-ro/strings.xml | 1 -
 Corona-Warn-App/src/main/res/values-tr/strings.xml | 1 -
 Corona-Warn-App/src/main/res/values/strings.xml    | 1 +
 7 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Corona-Warn-App/src/main/res/values-bg/strings.xml b/Corona-Warn-App/src/main/res/values-bg/strings.xml
index 5c79b067486..f1f3d6c5278 100644
--- a/Corona-Warn-App/src/main/res/values-bg/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-bg/strings.xml
@@ -1125,6 +1125,5 @@
     <string name="test_api_body_other_keys">"Other key"</string>
     <!-- NOTR -->
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
-    <string name="test_api_country_filter_status">Country filter applied for: \n%1$s</string>
 
 </resources>
\ No newline at end of file
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 6de05aeec03..833686e6014 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -1140,6 +1140,8 @@
     <string name="test_api_body_other_keys">"Other key"</string>
     <!-- NOTR -->
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
-    <string name="test_api_country_filter_status">Country filter applied for: \n%1$s</string>
+
+    <string name="test_api_country_filter_status">Länderfilter angewand für: \n%1$s</string>
+    <string name="test_api_country_settings_heading">Länder Einstellungen</string>
 
 </resources>
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 af4b2f3577d..2f6cc3b9e6a 100644
--- a/Corona-Warn-App/src/main/res/values-en/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-en/strings.xml
@@ -1125,7 +1125,5 @@
     <string name="test_api_body_other_keys">"Other key"</string>
     <!-- NOTR -->
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
-    <string name="test_api_country_filter_status">Country filter applied for: \n%1$s</string>
-    <string name="test_api_country_settings_heading">Country Settings</string>
 
 </resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values-pl/strings.xml b/Corona-Warn-App/src/main/res/values-pl/strings.xml
index a0e9a46279e..285f9ecce06 100644
--- a/Corona-Warn-App/src/main/res/values-pl/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-pl/strings.xml
@@ -1125,6 +1125,5 @@
     <string name="test_api_body_other_keys">"Other key"</string>
     <!-- NOTR -->
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
-    <string name="test_api_country_filter_status">Country filter applied for: \n%1$s</string>
 
 </resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values-ro/strings.xml b/Corona-Warn-App/src/main/res/values-ro/strings.xml
index 60299980f0f..b7575383faf 100644
--- a/Corona-Warn-App/src/main/res/values-ro/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-ro/strings.xml
@@ -1125,6 +1125,5 @@
     <string name="test_api_body_other_keys">"Other key"</string>
     <!-- NOTR -->
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
-    <string name="test_api_country_filter_status">Country filter applied for: \n%1$s</string>
 
 </resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values-tr/strings.xml b/Corona-Warn-App/src/main/res/values-tr/strings.xml
index 3dad26c0e0c..426f593e57a 100644
--- a/Corona-Warn-App/src/main/res/values-tr/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-tr/strings.xml
@@ -1125,6 +1125,5 @@
     <string name="test_api_body_other_keys">"Other key"</string>
     <!-- NOTR -->
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
-    <string name="test_api_country_filter_status">Country filter applied for: \n%1$s</string>
 
 </resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index e8125ce1ea8..365980a6ccb 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -1143,6 +1143,7 @@
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
     <!-- NOTR -->
     <string name="test_api_switch_background_notifications">"Background Notifications"</string>
+
     <string name="test_api_country_filter_status">Country filter applied for: \n%1$s</string>
     <string name="test_api_country_settings_heading">Country Settings</string>
 

From 468d09eb4cf162e37d4323fd667647a6df7a5a18 Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Tue, 1 Sep 2020 17:06:40 +0200
Subject: [PATCH 13/24] Do refactoring and some code clean up

---
 .../TestForAPIFragment.kt                     | 74 +++++++++----------
 .../coronawarnapp/http/WebRequestBuilder.kt   |  6 +-
 .../diagnosiskey/DiagnosisKeyConstants.kt     |  2 +-
 .../storage/FileStorageHelper.kt              |  2 +-
 4 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
index 8b75244a769..b03a1b404df 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
@@ -8,9 +8,7 @@ import android.util.Base64
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.EditText
 import android.widget.ImageView
-import android.widget.Switch
 import android.widget.Toast
 import androidx.core.content.pm.PackageInfoCompat
 import androidx.fragment.app.Fragment
@@ -52,7 +50,6 @@ import de.rki.coronawarnapp.transaction.RiskLevelTransaction
 import de.rki.coronawarnapp.ui.viewmodel.TracingViewModel
 import de.rki.coronawarnapp.util.CachedKeyFileHolder
 import de.rki.coronawarnapp.util.KeyFileHelper
-import kotlinx.android.synthetic.deviceForTesters.fragment_test_for_a_p_i.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -135,7 +132,8 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
                 0
             )
         )
-        label_googlePlayServices_version.text = "Google Play Services version: " + v.toString()
+        binding.labelGooglePlayServicesVersion.text =
+            "Google Play Services version: " + v.toString()
 
         token = UUID.randomUUID().toString()
 
@@ -144,7 +142,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
 
         getExposureKeys()
 
-        qrPager = qr_code_viewpager
+        qrPager = binding.qrCodeViewpager
         qrPagerAdapter = QRPagerAdapter()
         qrPager.adapter = qrPagerAdapter
 
@@ -154,7 +152,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
                 ApplicationConfigurationService.asyncRetrieveApplicationConfiguration()
                     .supportedCountriesList
 
-            (input_country_codes_editText as EditText).setText(
+            binding.inputCountryCodesEditText.setText(
                 lastSetCountries?.joinToString(
                     ","
                 )
@@ -163,15 +161,15 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             updateCountryStatusLabel()
         }
 
-        button_api_test_start.setOnClickListener {
+        binding.buttonApiTestStart.setOnClickListener {
             start()
         }
 
-        button_api_get_exposure_keys.setOnClickListener {
+        binding.buttonApiGetExposureKeys.setOnClickListener {
             getExposureKeys()
         }
 
-        val last3HoursSwitch = test_api_switch_last_three_hours_from_server as Switch
+        val last3HoursSwitch = binding.testApiSwitchLastThreeHoursFromServer
         last3HoursSwitch.isChecked = LocalData.last3HoursMode()
         last3HoursSwitch.setOnClickListener {
             val isLast3HoursModeEnabled = last3HoursSwitch.isChecked
@@ -179,7 +177,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             LocalData.last3HoursMode(isLast3HoursModeEnabled)
         }
 
-        val backgroundNotificationSwitch = test_api_switch_background_notifications as Switch
+        val backgroundNotificationSwitch = binding.testApiSwitchBackgroundNotifications
         backgroundNotificationSwitch.isChecked = LocalData.backgroundNotification()
         backgroundNotificationSwitch.setOnClickListener {
             val isBackgroundNotificationsActive = backgroundNotificationSwitch.isChecked
@@ -187,26 +185,26 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             LocalData.backgroundNotification(isBackgroundNotificationsActive)
         }
 
-        button_api_get_check_exposure.setOnClickListener {
+        binding.buttonApiGetCheckExposure.setOnClickListener {
             checkExposure()
         }
 
-        button_api_scan_qr_code.setOnClickListener {
+        binding.buttonApiScanQrCode.setOnClickListener {
             IntentIntegrator.forSupportFragment(this)
                 .setOrientationLocked(false)
                 .setBeepEnabled(false)
                 .initiateScan()
         }
 
-        button_api_share_my_keys.setOnClickListener {
+        binding.buttonApiShareMyKeys.setOnClickListener {
             shareMyKeys()
         }
 
-        button_api_enter_other_keys.setOnClickListener {
+        binding.buttonApiEnterOtherKeys.setOnClickListener {
             enterOtherKeys()
         }
 
-        button_api_submit_keys.setOnClickListener {
+        binding.buttonApiSubmitKeys.setOnClickListener {
             tracingViewModel.viewModelScope.launch {
                 try {
                     internalExposureNotificationPermissionHelper.requestPermissionToShareKeys()
@@ -221,7 +219,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             }
         }
 
-        button_calculate_risk_level.setOnClickListener {
+        binding.buttonCalculateRiskLevel.setOnClickListener {
             tracingViewModel.viewModelScope.launch {
                 try {
                     RiskLevelTransaction.start()
@@ -231,7 +229,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             }
         }
 
-        button_insert_exposure_summary.setOnClickListener {
+        binding.buttonInsertExposureSummary.setOnClickListener {
             // Now broadcasts them to the worker.
             val intent = Intent(
                 context,
@@ -241,7 +239,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             context?.sendBroadcast(intent)
         }
 
-        button_retrieve_exposure_summary.setOnClickListener {
+        binding.buttonRetrieveExposureSummary.setOnClickListener {
             tracingViewModel.viewModelScope.launch {
                 showToast(
                     ExposureSummaryRepository.getExposureSummaryRepository()
@@ -250,7 +248,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             }
         }
 
-        button_clear_db.setOnClickListener {
+        binding.buttonClearDb.setOnClickListener {
             tracingViewModel.viewModelScope.launch {
                 withContext(Dispatchers.IO) {
                     AppDatabase.getInstance(requireContext()).clearAllTables()
@@ -258,7 +256,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             }
         }
 
-        button_tracing_intervals.setOnClickListener {
+        binding.buttonTracingIntervals.setOnClickListener {
             tracingViewModel.viewModelScope.launch {
                 showToast(
                     TracingIntervalRepository.getDateRepository(requireContext()).getIntervals()
@@ -267,15 +265,15 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             }
         }
 
-        button_tracing_duration_in_retention_period.setOnClickListener {
+        binding.buttonTracingDurationInRetentionPeriod.setOnClickListener {
             tracingViewModel.viewModelScope.launch {
                 showToast(TimeVariables.getActiveTracingDaysInRetentionPeriod().toString())
             }
         }
 
-        button_filter_country_codes.setOnClickListener {
+        binding.buttonFilterCountryCodes.setOnClickListener {
             // Get user input country codes
-            val rawCountryCodes = (input_country_codes_editText as EditText).text.toString()
+            val rawCountryCodes = binding.inputCountryCodesEditText.text.toString()
 
             // Country codes can be separated by space or ,
             var countryCodes = rawCountryCodes.split(',', ' ').filter { it.isNotEmpty() }
@@ -290,10 +288,10 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             }
         }
 
-        button_retrieve_diagnosis_keys_and_calc_risk_level.setOnClickListener {
+        binding.buttonRetrieveDiagnosisKeysAndCalcRiskLevel.setOnClickListener {
             lifecycleScope.launch {
                 val repeatCount =
-                    (input_measure_risk_key_repeat_count as EditText).text.toString().toInt()
+                    binding.inputMeasureRiskKeyRepeatCount.text.toString().toInt()
                 measureRiskLevelAndKeyRetrieval(repeatCount)
             }
         }
@@ -322,7 +320,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             .append("Result: \n\n")
             .append("#\t Combined \t Download \t Key Calc \t File # \t Files size\n")
 
-        label_test_api_measure_calc_key_status.text = resultInfo.toString()
+        binding.labelTestApiMeasureCalcKeyStatus.text = resultInfo.toString()
 
         repeat(callCount) { index ->
             var keyRetrievalError = ""
@@ -366,7 +364,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
                 resultInfo.append("Calculation Error: $calculationError\n")
             }
 
-            label_test_api_measure_calc_key_status.text = resultInfo.toString()
+            binding.labelTestApiMeasureCalcKeyStatus.text = resultInfo.toString()
         }
     }
 
@@ -415,7 +413,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
      * Updates the Label for country filter
      */
     private fun updateCountryStatusLabel() {
-        label_country_code_filter_status.text =
+        binding.labelCountryCodeFilterStatus.text =
             getString(
                 R.string.test_api_country_filter_status,
                 lastSetCountries?.joinToString(", ")
@@ -433,8 +431,8 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
     private val onScannedKey = { key: AppleLegacyKeyExchange.Key? ->
         Timber.i("keys scanned..")
         key?.let {
-            text_scanned_key.text = prettyKey(key)
-            text_scanned_key.visibility = View.VISIBLE
+            binding.textScannedKey.text = prettyKey(key)
+            binding.textScannedKey.visibility = View.VISIBLE
 //            text_scanned_key.movementMethod = ScrollingMovementMethod.getInstance()
         }
         otherExposureKeyList.add(key!!)
@@ -550,27 +548,27 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
 
     private fun updateExposureSummaryDisplay(exposureSummary: ExposureSummary?) {
 
-        label_exposure_summary_matchedKeyCount.text = getString(
+        binding.labelExposureSummaryMatchedKeyCount.text = getString(
             R.string.test_api_body_matchedKeyCount,
             (exposureSummary?.matchedKeyCount ?: "-").toString()
         )
 
-        label_exposure_summary_daysSinceLastExposure.text = getString(
+        binding.labelExposureSummaryDaysSinceLastExposure.text = getString(
             R.string.test_api_body_daysSinceLastExposure,
             (exposureSummary?.daysSinceLastExposure ?: "-").toString()
         )
 
-        label_exposure_summary_maximumRiskScore.text = getString(
+        binding.labelExposureSummaryMaximumRiskScore.text = getString(
             R.string.test_api_body_maximumRiskScore,
             (exposureSummary?.maximumRiskScore ?: "-").toString()
         )
 
-        label_exposure_summary_summationRiskScore.text = getString(
+        binding.labelExposureSummarySummationRiskScore.text = getString(
             R.string.test_api_body_summation_risk,
             (exposureSummary?.summationRiskScore ?: "-").toString()
         )
 
-        label_exposure_summary_attenuation.text = getString(
+        binding.labelExposureSummaryAttenuation.text = getString(
             R.string.test_api_body_attenuation,
             (exposureSummary?.attenuationDurationsInMinutes?.joinToString() ?: "-").toString()
         )
@@ -587,14 +585,14 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             R.string.test_api_body_my_keys,
             myKeys?.size ?: 0
         )
-        label_my_keys.text = myKeysLabelAndCount
-        text_my_keys.text = myExposureKeysJSON
+        binding.labelMyKeys.text = myKeysLabelAndCount
+        binding.textMyKeys.text = myExposureKeysJSON
 
         myKeys?.maxBy { it.rollingStartIntervalNumber }?.rollingStartIntervalNumber?.toLong()?.let {
             val ms = it * 60L * 10L * 1000L
             val dateString = DateTime(ms, DateTimeZone.UTC)
 
-            label_latest_key_date.text = "Latest key is from: $dateString"
+            binding.labelLatestKeyDate.text = "Latest key is from: $dateString"
         }
     }
 
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt
index 34e4e7e101f..a92142a6781 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt
@@ -81,17 +81,17 @@ class WebRequestBuilder(
 
     /**
      * Gets the country index which is then filtered by given filter param or if param not set
-     * @param filter (array of country codes) used to filter
+     * @param wantedCountries (array of country codes) used to filter
      * only wanted countries of the country index (case insensitive)
      */
     suspend fun asyncGetCountryIndex(
-        filter: List<String>
+        wantedCountries: List<String>
     ): List<String> =
         withContext(Dispatchers.IO) {
             return@withContext distributionService
                 .getDateIndex(DiagnosisKeyConstants.AVAILABLE_COUNTRIES_URL)
                 .filter {
-                    filter.map { c -> c.toUpperCase(Locale.ROOT) }
+                    wantedCountries.map { c -> c.toUpperCase(Locale.ROOT) }
                         .contains(it.toUpperCase(Locale.ROOT))
                 }
                 .toList()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt
index a432fc7b9d0..e36b9111864 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/diagnosiskey/DiagnosisKeyConstants.kt
@@ -46,7 +46,7 @@ object DiagnosisKeyConstants {
 
     /** resource variables but non-static context */
     private var CURRENT_VERSION = "v1"
-    var CURRENT_COUNTRY = "DE"
+    private const val CURRENT_COUNTRY = "DE"
 
     /** Distribution URL built from CDN URL's and REST resources */
     private var VERSIONED_DISTRIBUTION_CDN_URL = "$VERSION/$CURRENT_VERSION"
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/FileStorageHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/FileStorageHelper.kt
index 536d4e53150..44442e9e61d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/FileStorageHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/FileStorageHelper.kt
@@ -36,7 +36,7 @@ object FileStorageHelper {
      */
     val keyExportDirectory = File(
         CoronaWarnApplication.getAppContext().cacheDir,
-        "${FileStorageConstants.KEY_EXPORT_DIRECTORY_NAME}/"
+        FileStorageConstants.KEY_EXPORT_DIRECTORY_NAME
     )
 
     /**

From 56745b148369fce9bbd8d2ac4cecfd8c581d11e0 Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Tue, 1 Sep 2020 17:38:51 +0200
Subject: [PATCH 14/24] Move RiskLevel and Key retrieval measurement in own
 class

---
 .../RiskLevelAndKeyRetrievalBenchmark.kt      | 129 ++++++++++++++++++
 .../TestForAPIFragment.kt                     | 114 +---------------
 .../RetrieveDiagnosisKeysTransaction.kt       |   4 +-
 3 files changed, 138 insertions(+), 109 deletions(-)
 create mode 100644 Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/RiskLevelAndKeyRetrievalBenchmark.kt

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/RiskLevelAndKeyRetrievalBenchmark.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/RiskLevelAndKeyRetrievalBenchmark.kt
new file mode 100644
index 00000000000..33426d8ed55
--- /dev/null
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/RiskLevelAndKeyRetrievalBenchmark.kt
@@ -0,0 +1,129 @@
+package de.rki.coronawarnapp
+
+import android.content.Context
+import android.text.format.Formatter
+import de.rki.coronawarnapp.exception.ExceptionCategory
+import de.rki.coronawarnapp.exception.TransactionException
+import de.rki.coronawarnapp.exception.reporting.report
+import de.rki.coronawarnapp.transaction.RetrieveDiagnosisKeysTransaction
+import de.rki.coronawarnapp.transaction.RiskLevelTransaction
+import timber.log.Timber
+import kotlin.system.measureTimeMillis
+
+object RiskLevelAndKeyRetrievalBenchmark {
+
+    /**
+     * Calls the RetrieveDiagnosisKeysTransaction and RiskLevelTransaction and measures them.
+     * Results are displayed using a label
+     * @param callCount defines how often the transactions should be called (each call will be
+     * measured separately)
+     */
+    suspend fun start(
+        context: Context?,
+        countries: List<String>,
+        callCount: Int,
+        callback: (resultInfo: String) -> Unit
+    ) {
+
+        var resultInfo = StringBuilder()
+            .append(
+                "MEASUREMENT Running for Countries:\n " +
+                        "${countries?.joinToString(", ")}\n\n"
+            )
+            .append("Result: \n\n")
+            .append("#\t Combined \t Download \t Key Calc \t File # \t Files size\n")
+
+        callback(resultInfo.toString())
+
+        repeat(callCount) { index ->
+            var keyRetrievalError = ""
+            var keyFileCount: Int = -1
+            var keyFileDownloadDuration: Long = -1
+            var keyFilesSize: Long = -1
+
+            try {
+                measureDiagnosticKeyRetrieval(
+                    "#$index",
+                    countries
+                ) { duration, keyCount, totalFileSize ->
+                    keyFileCount = keyCount
+                    keyFileDownloadDuration = duration
+                    keyFilesSize = totalFileSize
+                }
+            } catch (e: TransactionException) {
+                keyRetrievalError = e.message.toString()
+            }
+
+            var calculationDuration: Long = -1
+            var calculationError = ""
+
+            try {
+                measureKeyCalculation("#$index") {
+                    calculationDuration = it
+                }
+            } catch (e: TransactionException) {
+                calculationError = e.message.toString()
+            }
+
+            // build result entry for current iteration with all gathered data
+            resultInfo.append(
+                "${index + 1}. \t ${calculationDuration + keyFileDownloadDuration} ms \t\t " +
+                        "$keyFileDownloadDuration ms " +
+                        "\t\t $calculationDuration ms \t\t $keyFileCount \t\t " +
+                        "${Formatter.formatFileSize(context, keyFilesSize)}\n"
+            )
+
+            if (keyRetrievalError.isNotEmpty()) {
+                resultInfo.append("Key Retrieval Error: $keyRetrievalError\n")
+            }
+
+            if (calculationError.isNotEmpty()) {
+                resultInfo.append("Calculation Error: $calculationError\n")
+            }
+
+            callback(resultInfo.toString())
+        }
+    }
+
+    private suspend fun measureKeyCalculation(label: String, finished: (duration: Long) -> Unit) {
+        try {
+            Timber.v("MEASURE [Risk Level Calculation] $label started")
+            // start risk level calculation and get duration
+            measureTimeMillis {
+                RiskLevelTransaction.start()
+            }.also {
+                Timber.v("MEASURE [Risk Level Calculation] $label finished")
+                finished(it)
+            }
+        } catch (e: TransactionException) {
+            e.report(ExceptionCategory.INTERNAL)
+            throw e
+        }
+    }
+
+    private suspend fun measureDiagnosticKeyRetrieval(
+        label: String,
+        countries: List<String>,
+        finished: (duration: Long, keyCount: Int, fileSize: Long) -> Unit
+    ) {
+        var keyFileDownloadStart: Long = -1
+
+        try {
+            RetrieveDiagnosisKeysTransaction.onKeyFilesStarted = {
+                Timber.v("MEASURE [Diagnostic Key Files] $label started")
+                keyFileDownloadStart = System.currentTimeMillis()
+            }
+
+            RetrieveDiagnosisKeysTransaction.onKeyFilesFinished = { count, size ->
+                Timber.v("MEASURE [Diagnostic Key Files] $label finished")
+                val duration = System.currentTimeMillis() - keyFileDownloadStart
+                finished(duration, count, size)
+            }
+            // start diagnostic key transaction
+            RetrieveDiagnosisKeysTransaction.start(countries)
+        } catch (e: TransactionException) {
+            e.report(ExceptionCategory.INTERNAL)
+            throw e
+        }
+    }
+}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
index b03a1b404df..0ab82413b51 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
@@ -292,7 +292,13 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             lifecycleScope.launch {
                 val repeatCount =
                     binding.inputMeasureRiskKeyRepeatCount.text.toString().toInt()
-                measureRiskLevelAndKeyRetrieval(repeatCount)
+                RiskLevelAndKeyRetrievalBenchmark.start(
+                    context,
+                    lastSetCountries ?: listOf("DE"),
+                    repeatCount
+                ) { status ->
+                    binding.labelTestApiMeasureCalcKeyStatus.text = status
+                }
             }
         }
     }
@@ -303,112 +309,6 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
         updateExposureSummaryDisplay(null)
     }
 
-    /**
-     * Calls the RetrieveDiagnosisKeysTransaction and RiskLevelTransaction and measures them.
-     * Results are displayed using a label
-     * @param callCount defines how often the transactions should be called (each call will be
-     * measured separately)
-     */
-    private suspend fun measureRiskLevelAndKeyRetrieval(callCount: Int) {
-        val countries = lastSetCountries
-
-        var resultInfo = StringBuilder()
-            .append(
-                "MEASUREMENT Running for Countries:\n " +
-                        "${countries?.joinToString(", ")}\n\n"
-            )
-            .append("Result: \n\n")
-            .append("#\t Combined \t Download \t Key Calc \t File # \t Files size\n")
-
-        binding.labelTestApiMeasureCalcKeyStatus.text = resultInfo.toString()
-
-        repeat(callCount) { index ->
-            var keyRetrievalError = ""
-            var keyFileCount: Int = -1
-            var keyFileDownloadDuration: Long = -1
-            var keyFilesSize: Long = -1
-
-            try {
-                measureDiagnosticKeyRetrieval("#$index") { duration, keyCount, totalFileSize ->
-                    keyFileCount = keyCount
-                    keyFileDownloadDuration = duration
-                    keyFilesSize = totalFileSize
-                }
-            } catch (e: TransactionException) {
-                keyRetrievalError = e.message.toString()
-            }
-
-            var calculationDuration: Long = -1
-            var calculationError = ""
-
-            try {
-                measureKeyCalculation("#$index") {
-                    calculationDuration = it
-                }
-            } catch (e: TransactionException) {
-                calculationError = e.message.toString()
-            }
-
-            // build result entry for current iteration with all gathered data
-            resultInfo.append(
-                "${index + 1}. \t ${calculationDuration + keyFileDownloadDuration} ms \t\t " +
-                        "$keyFileDownloadDuration ms " +
-                        "\t\t $calculationDuration ms \t\t $keyFileCount \t\t $keyFilesSize MB\n"
-            )
-
-            if (keyRetrievalError.isNotEmpty()) {
-                resultInfo.append("Key Retrieval Error: $keyRetrievalError\n")
-            }
-
-            if (calculationError.isNotEmpty()) {
-                resultInfo.append("Calculation Error: $calculationError\n")
-            }
-
-            binding.labelTestApiMeasureCalcKeyStatus.text = resultInfo.toString()
-        }
-    }
-
-    private suspend fun measureKeyCalculation(label: String, finished: (duration: Long) -> Unit) {
-        try {
-            Timber.v("MEASURE [Risk Level Calculation] $label started")
-            // start risk level calculation and get duration
-            measureTimeMillis {
-                RiskLevelTransaction.start()
-            }.also {
-                Timber.v("MEASURE [Risk Level Calculation] $label finished")
-                finished(it)
-            }
-        } catch (e: TransactionException) {
-            e.report(ExceptionCategory.INTERNAL)
-            throw e
-        }
-    }
-
-    private suspend fun measureDiagnosticKeyRetrieval(
-        label: String,
-        finished: (duration: Long, keyCount: Int, fileSize: Long) -> Unit
-    ) {
-        var keyFileDownloadStart: Long = -1
-
-        try {
-            RetrieveDiagnosisKeysTransaction.onKeyFilesStarted = {
-                Timber.v("MEASURE [Diagnostic Key Files] $label started")
-                keyFileDownloadStart = System.currentTimeMillis()
-            }
-
-            RetrieveDiagnosisKeysTransaction.onKeyFilesFinished = { count, size ->
-                Timber.v("MEASURE [Diagnostic Key Files] $label finished")
-                val duration = System.currentTimeMillis() - keyFileDownloadStart
-                finished(duration, count, size)
-            }
-            // start diagnostic key transaction
-            RetrieveDiagnosisKeysTransaction.start(lastSetCountries)
-        } catch (e: TransactionException) {
-            e.report(ExceptionCategory.INTERNAL)
-            throw e
-        }
-    }
-
     /**
      * Updates the Label for country filter
      */
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
index 7fc3ba66653..08e2e7d53e3 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
@@ -200,13 +200,13 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
 
         if (CWADebug.isDebugBuildOrMode) {
             var totalFileSize: Long = 0
-            val fileSizeUnit = (1024 * 1024)
             keyFiles.also {
                 it.forEach { file ->
                     totalFileSize += file.length()
                 }
             }
-            onKeyFilesFinished?.invoke(keyFiles.size, totalFileSize / fileSizeUnit)
+            onKeyFilesFinished?.invoke(
+                keyFiles.size, totalFileSize)
             onKeyFilesFinished = null
         }
 

From 873b1d9d06abaadb446b04ac0462a87518a4819a Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Wed, 2 Sep 2020 13:56:56 +0200
Subject: [PATCH 15/24] Move code in logical classes. Remove translation in
 test fragment

---
 .../TestForAPIFragment.kt                     |  23 +-
 .../res/layout/fragment_test_for_a_p_i.xml    |   4 +-
 .../de/rki/coronawarnapp/util/CWADebug.kt     |   7 +
 .../coronawarnapp/util/CachedKeyFileHolder.kt | 219 ++++++++----------
 .../de/rki/coronawarnapp/util/CountryUtils.kt |  31 +++
 .../src/main/res/values-de/strings.xml        |   4 -
 .../src/main/res/values/strings.xml           |   4 -
 7 files changed, 153 insertions(+), 139 deletions(-)
 create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CountryUtils.kt

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
index 0ab82413b51..77940c6423d 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
@@ -313,11 +313,8 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
      * Updates the Label for country filter
      */
     private fun updateCountryStatusLabel() {
-        binding.labelCountryCodeFilterStatus.text =
-            getString(
-                R.string.test_api_country_filter_status,
-                lastSetCountries?.joinToString(", ")
-            )
+        binding.labelCountryCodeFilterStatus.text = "Country filter applied for: \n " +
+                "${lastSetCountries?.joinToString(",")}"
     }
 
     private val prettyKey = { key: AppleLegacyKeyExchange.Key ->
@@ -406,7 +403,10 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             )
 
             val dir =
-                File(File(requireContext().getExternalFilesDir(null), "key-export"), token ?: "")
+                File(
+                    File(requireContext().getExternalFilesDir(null), "key-export"),
+                    token ?: ""
+                )
             dir.mkdirs()
 
             var googleFileList: List<File>
@@ -488,12 +488,13 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
         binding.labelMyKeys.text = myKeysLabelAndCount
         binding.textMyKeys.text = myExposureKeysJSON
 
-        myKeys?.maxBy { it.rollingStartIntervalNumber }?.rollingStartIntervalNumber?.toLong()?.let {
-            val ms = it * 60L * 10L * 1000L
-            val dateString = DateTime(ms, DateTimeZone.UTC)
+        myKeys?.maxBy { it.rollingStartIntervalNumber }?.rollingStartIntervalNumber?.toLong()
+            ?.let {
+                val ms = it * 60L * 10L * 1000L
+                val dateString = DateTime(ms, DateTimeZone.UTC)
 
-            binding.labelLatestKeyDate.text = "Latest key is from: $dateString"
-        }
+                binding.labelLatestKeyDate.text = "Latest key is from: $dateString"
+            }
     }
 
     private fun showToast(message: String) {
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
index 70cbe8d7671..8161e95bfe8 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
@@ -231,7 +231,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacing_normal"
                 android:accessibilityHeading="true"
-                android:text="@string/test_api_country_settings_heading" />
+                android:text="Country Settings" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -256,7 +256,7 @@
                 android:id="@+id/label_country_code_filter_status"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/test_api_country_filter_status">
+                android:text="Country filter applied for:">
 
             </TextView>
 
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CWADebug.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CWADebug.kt
index cc614f2797b..171633b8003 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CWADebug.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CWADebug.kt
@@ -1,8 +1,15 @@
 package de.rki.coronawarnapp.util
 
 import de.rki.coronawarnapp.BuildConfig
+import de.rki.coronawarnapp.storage.LocalData
 
 object CWADebug {
     val isDebugBuildOrMode: Boolean
         get() = BuildConfig.DEBUG || BuildConfig.BUILD_VARIANT == "deviceForTesters"
+
+    val isLast3HoursFetchEnabled: Boolean
+        get() = LocalData.last3HoursMode()
+
+    val isDebugBuildOrModeAndLast3HoursFetchEnabled: Boolean
+        get() = isDebugBuildOrMode && isLast3HoursFetchEnabled
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
index 4c5eedbfb28..0eb57f46b33 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
@@ -19,13 +19,9 @@
 
 package de.rki.coronawarnapp.util
 
-import de.rki.coronawarnapp.BuildConfig
 import de.rki.coronawarnapp.CoronaWarnApplication
 import de.rki.coronawarnapp.http.WebRequestBuilder
-import de.rki.coronawarnapp.service.diagnosiskey.DiagnosisKeyConstants
 import de.rki.coronawarnapp.storage.FileStorageHelper
-import de.rki.coronawarnapp.storage.LocalData
-import de.rki.coronawarnapp.storage.keycache.KeyCacheEntity
 import de.rki.coronawarnapp.storage.keycache.KeyCacheRepository
 import de.rki.coronawarnapp.storage.keycache.KeyCacheRepository.DateEntryType.DAY
 import de.rki.coronawarnapp.util.CachedKeyFileHolder.asyncFetchFiles
@@ -44,7 +40,6 @@ import java.util.UUID
  * Singleton used for accessing key files via combining cached entries from existing files and new requests.
  * made explicitly with [asyncFetchFiles] in mind
  */
-@SuppressWarnings("LongMethod")
 object CachedKeyFileHolder {
     private val TAG: String? = CachedKeyFileHolder::class.simpleName
 
@@ -80,97 +75,117 @@ object CachedKeyFileHolder {
         // Build pair of country to date <Country, Date[]>
         val serverDates = getCountriesFromServer(countries).map { Pair(it, getDatesFromServer(it)) }
 
-        // TODO remove last3HourFetch before Release
-        if (BuildConfig.FLAVOR != "device" && isLast3HourFetchEnabled()) {
-            Timber.v("Last 3 Hours will be Fetched. Only use for Debugging!")
-            val currentDateServerFormat = currentDate.toServerFormat()
+        if (CWADebug.isDebugBuildOrModeAndLast3HoursFetchEnabled) {
+            asyncHandleLast3HoursFilesFetch(currentDate, serverDates)
+        } else {
+            asyncHandleFilesFetch(serverDates)
+        }
+    }
+
+    private fun checkForFreeSpace() = FileStorageHelper.checkFileStorageFreeSpace()
 
-            // just fetch the hours if the date is available
-            // extend fetch for all dates in all countries provided in serverDates
-            val packagesWithCurrentDate = serverDates
-                .filter { countryWithDates ->
-                    countryWithDates.second.contains(
-                        currentDateServerFormat
-                    )
+    /**
+     * Fetches files given by serverDates by respecting countries
+     * @param serverDates pair of dates per country code
+     */
+    private suspend fun asyncHandleFilesFetch(
+        serverDates: List<Pair<String, List<String>>>
+    ): List<File> = withContext(Dispatchers.IO) {
+        // Build flat map of uuids from dates of countries
+        val uuidListFromServer = serverDates.flatMap { pair ->
+            val countryUtils = CountryUtils(pair.first, pair.second)
+            pair.second
+                .map { date ->
+                    countryUtils.getURLForDay(date)
                 }
+        }
 
-            if (packagesWithCurrentDate.isNotEmpty()) {
-                return@withContext serverDates
-                    .flatMap { countryWithDates ->
-                        getLast3Hours(currentDate)
-                            .map {
-                                getURLForHour(
-                                    countryWithDates.first,
-                                    currentDate.toServerFormat(),
-                                    it
-                                )
-                            }
-                            .map { url ->
-                                async {
-                                    return@async WebRequestBuilder.getInstance()
-                                        .asyncGetKeyFilesFromServer(url)
-                                }
-                            }
-                    }
-                    .awaitAll()
-            } else {
-                throw IllegalStateException(
-                    "you cannot use the last 3 hour mode if the date index " +
-                            "does not contain any data for today"
-                )
-            }
-        } else {
+        Timber.v("${uuidListFromServer.size} available dates from server for ${serverDates.size} countries")
 
-            // Build flat map of uuids from dates of countries
-            val uuidListFromServer = serverDates.flatMap { pair ->
-                pair.second
-                    .map { date ->
-                        getURLForDay(pair.first, date).generateCacheKeyFromString()
+        // queries will be executed after the "query plan" was set
+        val deferredQueries: MutableCollection<Deferred<Any>> = mutableListOf()
+        keyCache.deleteOutdatedEntries(uuidListFromServer)
+
+        val missingDays = getMissingDaysFromDiff(serverDates)
+        if (missingDays.isNotEmpty()) {
+            // we have a date difference
+            deferredQueries.addAll(
+                missingDays
+                    .flatMap { daysFromServer ->
+                        val countryUtils = CountryUtils(daysFromServer.first, daysFromServer.second)
+                        daysFromServer.second.map {
+                            countryUtils.getURLForDay(it)
+                        }
                     }
-            }
+                    .map { url ->
+                        async {
+                            url.createDayEntryForUrl()
+                        }
+                    }
+            )
+        }
 
-            Timber.v("${uuidListFromServer.size} available dates from server for ${serverDates.size} countries")
+        // execute the query plan
+        try {
+            deferredQueries.awaitAll()
+        } catch (e: Exception) {
+            // For an error we clear the cache to try again
+            keyCache.clear()
+            throw e
+        }
 
-            // queries will be executed after the "query plan" was set
-            val deferredQueries: MutableCollection<Deferred<Any>> = mutableListOf()
-            keyCache.deleteOutdatedEntries(uuidListFromServer)
+        keyCache.getFilesFromEntries()
+            .also { it.forEach { file -> Timber.v("cached file:${file.path}") } }
+    }
 
-            val missingDays = getMissingDaysFromDiff(serverDates)
-            if (missingDays.isNotEmpty()) {
-                // we have a date difference
-                deferredQueries.addAll(
-                    missingDays
-                        .flatMap { daysFromServer ->
-                            daysFromServer.second.map {
-                                getURLForDay(
-                                    daysFromServer.first,
-                                    it
-                                )
-                            }
+    /**
+     * Fetches files given by serverDates by respecting countries
+     * @param currentDate base for where only dates within 3 hours before will be fetched
+     * @param serverDates pair of dates per country code
+     */
+    private suspend fun asyncHandleLast3HoursFilesFetch(
+        currentDate: Date,
+        serverDates: List<Pair<String, List<String>>>
+    ): List<File> = withContext(Dispatchers.IO) {
+        Timber.v("Last 3 Hours will be Fetched. Only use for Debugging!")
+        val currentDateServerFormat = currentDate.toServerFormat()
+
+        // just fetch the hours if the date is available
+        // extend fetch for all dates in all countries provided in serverDates
+        val packagesWithCurrentDate = serverDates
+            .filter { countryWithDates ->
+                countryWithDates.second.contains(
+                    currentDateServerFormat
+                )
+            }
+
+        if (packagesWithCurrentDate.isNotEmpty()) {
+            return@withContext serverDates
+                .flatMap { countryWithDates ->
+                    val countryUtils = CountryUtils(countryWithDates.first, countryWithDates.second)
+                    getLast3Hours(currentDate)
+                        .map {
+                            countryUtils.getURLForHour(
+                                currentDate.toServerFormat(),
+                                it
+                            )
                         }
                         .map { url ->
                             async {
-                                url.createDayEntryForUrl()
+                                return@async WebRequestBuilder.getInstance()
+                                    .asyncGetKeyFilesFromServer(url)
                             }
                         }
-                )
-            }
-
-            // execute the query plan
-            try {
-                deferredQueries.awaitAll()
-            } catch (e: Exception) {
-                // For an error we clear the cache to try again
-                keyCache.clear()
-                throw e
-            }
-
-            keyCache.getFilesFromEntries()
-                .also { it.forEach { file -> Timber.v("cached file:${file.path}") } }
+                }
+                .awaitAll()
+        } else {
+            throw IllegalStateException(
+                "you cannot use the last 3 hour mode if the date index " +
+                        "does not contain any data for today"
+            )
         }
-    }
 
-    private fun checkForFreeSpace() = FileStorageHelper.checkFileStorageFreeSpace()
+    }
 
     /**
      * Calculates the missing days based on current missing entries in the cache
@@ -185,7 +200,10 @@ object CachedKeyFileHolder {
                 countryDates.first,
                 countryDates.second
                     .also { Timber.d("Country: ${countryDates.first}: ${it.size} Days") }
-                    .filter { it.dateEntryCacheMiss(countryDates.first, cacheEntries) }
+                    .filter {
+                        CountryUtils(countryDates.first, countryDates.second)
+                            .isDateEntryCacheMissing(countryDates.first, cacheEntries)
+                    }
                     .toList()
                     .also { Timber.d("Country: ${countryDates.first}, Missing Days: ${it.size}") }
             )
@@ -207,17 +225,6 @@ object CachedKeyFileHolder {
         .toList()
         .also { Timber.d("${it.size} missing hours") }
 
-    /**
-     * Determines whether a given String has an existing date cache entry under a unique name
-     * given from the URL that is based on this String
-     *
-     * @param country the country of the date
-     * @param cache the given cache entries
-     */
-    private fun String.dateEntryCacheMiss(country: String, cache: List<KeyCacheEntity>) = !cache
-        .map { date -> date.id }
-        .contains(getURLForDay(country, this).generateCacheKeyFromString())
-
     /**
      * Creates a date entry in the Key Cache for a given String with a unique Key Name derived from the URL
      * and the URI of the downloaded File for that given key
@@ -231,30 +238,11 @@ object CachedKeyFileHolder {
     /**
      * Generates a unique key name (UUIDv3) for the cache entry based out of a string (e.g. an url)
      */
-    private fun String.generateCacheKeyFromString() =
+    fun String.generateCacheKeyFromString() =
         "${UUID.nameUUIDFromBytes(this.toByteArray())}".also {
             Timber.v("$this mapped to cache entry $it")
         }
 
-    /**
-     * Gets the correct URL String for querying an hour bucket
-     *
-     * @param country the country of the date and hour
-     * @param formattedDate the formatted date for the hour bucket request
-     * @param formattedHour the formatted hour
-     */
-    private fun getURLForHour(country: String, formattedDate: String, formattedHour: String) =
-        "${getURLForDay(country, formattedDate)}/${DiagnosisKeyConstants.HOUR}/$formattedHour"
-
-    /**
-     * Gets the correct URL String for querying a day bucket
-     *
-     * @param country the country of the formattedDate
-     * @param formattedDate the formatted date
-     */
-    private fun getURLForDay(country: String, formattedDate: String) =
-        "${DiagnosisKeyConstants.AVAILABLE_COUNTRIES_URL}/$country/${DiagnosisKeyConstants.DATE}/$formattedDate"
-
     /**
      * Get all dates of a country from server based as formatted dates
      *
@@ -274,9 +262,4 @@ object CachedKeyFileHolder {
      */
     private suspend fun getCountriesFromServer(countries: List<String>) =
         WebRequestBuilder.getInstance().asyncGetCountryIndex(countries)
-
-    /**
-     * TODO remove before release
-     */
-    private fun isLast3HourFetchEnabled(): Boolean = LocalData.last3HoursMode()
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CountryUtils.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CountryUtils.kt
new file mode 100644
index 00000000000..18df16010f3
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CountryUtils.kt
@@ -0,0 +1,31 @@
+package de.rki.coronawarnapp.util
+
+import de.rki.coronawarnapp.service.diagnosiskey.DiagnosisKeyConstants
+import de.rki.coronawarnapp.storage.keycache.KeyCacheEntity
+import de.rki.coronawarnapp.util.CachedKeyFileHolder.generateCacheKeyFromString
+
+data class CountryUtils(val country: String, val dates: Collection<String>) {
+
+    fun isDateEntryCacheMissing(formattedDate: String, cache: List<KeyCacheEntity>) = !cache
+        .map { date -> date.id }
+        .contains(getURLForDay(formattedDate).generateCacheKeyFromString())
+
+    /**
+     * Gets the correct URL String for querying a day bucket
+     *
+     * @param country the country of the formattedDate
+     * @param formattedDate the formatted date
+     */
+    fun getURLForDay(formattedDate: String) =
+        "${DiagnosisKeyConstants.AVAILABLE_COUNTRIES_URL}/$country/${DiagnosisKeyConstants.DATE}/$formattedDate"
+
+    /**
+     * Gets the correct URL String for querying an hour bucket
+     *
+     * @param country the country of the date and hour
+     * @param formattedDate the formatted date for the hour bucket request
+     * @param formattedHour the formatted hour
+     */
+    fun getURLForHour(formattedDate: String, formattedHour: String) =
+        "${getURLForDay(formattedDate)}/${DiagnosisKeyConstants.HOUR}/$formattedHour"
+}
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 833686e6014..af4d42f0fe1 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -1140,8 +1140,4 @@
     <string name="test_api_body_other_keys">"Other key"</string>
     <!-- NOTR -->
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
-
-    <string name="test_api_country_filter_status">Länderfilter angewand für: \n%1$s</string>
-    <string name="test_api_country_settings_heading">Länder Einstellungen</string>
-
 </resources>
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 365980a6ccb..d6f46eba892 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -1143,8 +1143,4 @@
     <string name="test_api_calculate_risk_level">"Calculate Risk Level"</string>
     <!-- NOTR -->
     <string name="test_api_switch_background_notifications">"Background Notifications"</string>
-
-    <string name="test_api_country_filter_status">Country filter applied for: \n%1$s</string>
-    <string name="test_api_country_settings_heading">Country Settings</string>
-
 </resources>
\ No newline at end of file

From 0f6d5653da7afec036b83a0647013de28267d3f8 Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Wed, 2 Sep 2020 14:11:56 +0200
Subject: [PATCH 16/24] Fix linting and Unit tests

---
 .../java/de.rki.coronawarnapp/TestForAPIFragment.kt          | 2 --
 .../java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt    | 1 -
 .../de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt     | 5 ++++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
index 77940c6423d..6fe1fbf53c2 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
@@ -45,7 +45,6 @@ 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.RetrieveDiagnosisKeysTransaction
 import de.rki.coronawarnapp.transaction.RiskLevelTransaction
 import de.rki.coronawarnapp.ui.viewmodel.TracingViewModel
 import de.rki.coronawarnapp.util.CachedKeyFileHolder
@@ -60,7 +59,6 @@ import java.io.File
 import java.lang.reflect.Type
 import java.util.Date
 import java.util.UUID
-import kotlin.system.measureTimeMillis
 
 @SuppressWarnings("TooManyFunctions", "MagicNumber", "LongMethod")
 class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHelper.Callback {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
index 0eb57f46b33..238e3091c53 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
@@ -184,7 +184,6 @@ object CachedKeyFileHolder {
                         "does not contain any data for today"
             )
         }
-
     }
 
     /**
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
index d8494d2fb7d..f59901b5662 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
@@ -2,6 +2,7 @@ package de.rki.coronawarnapp.util
 
 import android.content.Context
 import de.rki.coronawarnapp.CoronaWarnApplication
+import de.rki.coronawarnapp.storage.LocalData
 import de.rki.coronawarnapp.storage.keycache.KeyCacheRepository
 import io.mockk.MockKAnnotations
 import io.mockk.Runs
@@ -50,9 +51,11 @@ class CachedKeyFileHolderTest {
         val countries = listOf("DE")
         val country = "DE"
 
+        mockkObject(CWADebug)
+
         coEvery { keyCacheRepository.getDates() } returns listOf()
         coEvery { keyCacheRepository.getFilesFromEntries() } returns listOf()
-        every { CachedKeyFileHolder["isLast3HourFetchEnabled"]() } returns false
+        every { CWADebug.isDebugBuildOrModeAndLast3HoursFetchEnabled } returns false
         every { CachedKeyFileHolder["checkForFreeSpace"]() } returns Unit
         every { CachedKeyFileHolder["getDatesFromServer"](country) } returns arrayListOf<String>()
 

From 0409073f3765bee609ae42b412f1b6f10f762e40 Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Wed, 2 Sep 2020 15:18:40 +0200
Subject: [PATCH 17/24] Remove 3hour boolean check from debug class.

---
 .../src/main/java/de/rki/coronawarnapp/util/CWADebug.kt    | 7 -------
 .../java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt  | 3 ++-
 .../de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt   | 3 +--
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CWADebug.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CWADebug.kt
index 171633b8003..cc614f2797b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CWADebug.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CWADebug.kt
@@ -1,15 +1,8 @@
 package de.rki.coronawarnapp.util
 
 import de.rki.coronawarnapp.BuildConfig
-import de.rki.coronawarnapp.storage.LocalData
 
 object CWADebug {
     val isDebugBuildOrMode: Boolean
         get() = BuildConfig.DEBUG || BuildConfig.BUILD_VARIANT == "deviceForTesters"
-
-    val isLast3HoursFetchEnabled: Boolean
-        get() = LocalData.last3HoursMode()
-
-    val isDebugBuildOrModeAndLast3HoursFetchEnabled: Boolean
-        get() = isDebugBuildOrMode && isLast3HoursFetchEnabled
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
index 238e3091c53..44899a9d464 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
@@ -22,6 +22,7 @@ package de.rki.coronawarnapp.util
 import de.rki.coronawarnapp.CoronaWarnApplication
 import de.rki.coronawarnapp.http.WebRequestBuilder
 import de.rki.coronawarnapp.storage.FileStorageHelper
+import de.rki.coronawarnapp.storage.LocalData
 import de.rki.coronawarnapp.storage.keycache.KeyCacheRepository
 import de.rki.coronawarnapp.storage.keycache.KeyCacheRepository.DateEntryType.DAY
 import de.rki.coronawarnapp.util.CachedKeyFileHolder.asyncFetchFiles
@@ -75,7 +76,7 @@ object CachedKeyFileHolder {
         // Build pair of country to date <Country, Date[]>
         val serverDates = getCountriesFromServer(countries).map { Pair(it, getDatesFromServer(it)) }
 
-        if (CWADebug.isDebugBuildOrModeAndLast3HoursFetchEnabled) {
+        if (CWADebug.isDebugBuildOrMode && LocalData.last3HoursMode()) {
             asyncHandleLast3HoursFilesFetch(currentDate, serverDates)
         } else {
             asyncHandleFilesFetch(serverDates)
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
index f59901b5662..857b01eb086 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
@@ -2,7 +2,6 @@ package de.rki.coronawarnapp.util
 
 import android.content.Context
 import de.rki.coronawarnapp.CoronaWarnApplication
-import de.rki.coronawarnapp.storage.LocalData
 import de.rki.coronawarnapp.storage.keycache.KeyCacheRepository
 import io.mockk.MockKAnnotations
 import io.mockk.Runs
@@ -55,7 +54,7 @@ class CachedKeyFileHolderTest {
 
         coEvery { keyCacheRepository.getDates() } returns listOf()
         coEvery { keyCacheRepository.getFilesFromEntries() } returns listOf()
-        every { CWADebug.isDebugBuildOrModeAndLast3HoursFetchEnabled } returns false
+        every { CWADebug.isDebugBuildOrMode } returns false
         every { CachedKeyFileHolder["checkForFreeSpace"]() } returns Unit
         every { CachedKeyFileHolder["getDatesFromServer"](country) } returns arrayListOf<String>()
 

From a1a2e125d902541624ebc0bd4c56d0f42f9ac8d3 Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Wed, 2 Sep 2020 16:04:15 +0200
Subject: [PATCH 18/24] Refactor CountryWrapper and missing dates check.

---
 .../coronawarnapp/util/CachedKeyFileHolder.kt | 144 ++++++++++--------
 .../de/rki/coronawarnapp/util/CountryUtils.kt |  31 ----
 2 files changed, 82 insertions(+), 93 deletions(-)
 delete mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CountryUtils.kt

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
index 44899a9d464..a6c8bf6c2a9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
@@ -21,11 +21,14 @@ package de.rki.coronawarnapp.util
 
 import de.rki.coronawarnapp.CoronaWarnApplication
 import de.rki.coronawarnapp.http.WebRequestBuilder
+import de.rki.coronawarnapp.service.diagnosiskey.DiagnosisKeyConstants
 import de.rki.coronawarnapp.storage.FileStorageHelper
 import de.rki.coronawarnapp.storage.LocalData
+import de.rki.coronawarnapp.storage.keycache.KeyCacheEntity
 import de.rki.coronawarnapp.storage.keycache.KeyCacheRepository
 import de.rki.coronawarnapp.storage.keycache.KeyCacheRepository.DateEntryType.DAY
 import de.rki.coronawarnapp.util.CachedKeyFileHolder.asyncFetchFiles
+import de.rki.coronawarnapp.util.CachedKeyFileHolder.generateCacheKeyFromString
 import de.rki.coronawarnapp.util.TimeAndDateExtensions.toServerFormat
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
@@ -74,7 +77,9 @@ object CachedKeyFileHolder {
         checkForFreeSpace()
 
         // Build pair of country to date <Country, Date[]>
-        val serverDates = getCountriesFromServer(countries).map { Pair(it, getDatesFromServer(it)) }
+        val serverDates = getCountriesFromServer(countries).map {
+            CountryDataWrapper(it, getDatesFromServer((it)))
+        }
 
         if (CWADebug.isDebugBuildOrMode && LocalData.last3HoursMode()) {
             asyncHandleLast3HoursFilesFetch(currentDate, serverDates)
@@ -90,15 +95,13 @@ object CachedKeyFileHolder {
      * @param serverDates pair of dates per country code
      */
     private suspend fun asyncHandleFilesFetch(
-        serverDates: List<Pair<String, List<String>>>
+        serverDates: List<CountryDataWrapper>
     ): List<File> = withContext(Dispatchers.IO) {
         // Build flat map of uuids from dates of countries
-        val uuidListFromServer = serverDates.flatMap { pair ->
-            val countryUtils = CountryUtils(pair.first, pair.second)
-            pair.second
-                .map { date ->
-                    countryUtils.getURLForDay(date)
-                }
+        val uuidListFromServer = serverDates.flatMap { countryWrapper ->
+            countryWrapper.dates.map { date ->
+                countryWrapper.getURLForDay(date)
+            }
         }
 
         Timber.v("${uuidListFromServer.size} available dates from server for ${serverDates.size} countries")
@@ -107,23 +110,24 @@ object CachedKeyFileHolder {
         val deferredQueries: MutableCollection<Deferred<Any>> = mutableListOf()
         keyCache.deleteOutdatedEntries(uuidListFromServer)
 
-        val missingDays = getMissingDaysFromDiff(serverDates)
-        if (missingDays.isNotEmpty()) {
+        val countryWithMissingDays = getMissingDaysFromDiff(serverDates)
+        if (countryWithMissingDays.isNotEmpty()) {
             // we have a date difference
-            deferredQueries.addAll(
-                missingDays
-                    .flatMap { daysFromServer ->
-                        val countryUtils = CountryUtils(daysFromServer.first, daysFromServer.second)
-                        daysFromServer.second.map {
-                            countryUtils.getURLForDay(it)
-                        }
-                    }
-                    .map { url ->
-                        async {
-                            url.createDayEntryForUrl()
-                        }
+            countryWithMissingDays
+                .flatMap { country ->
+                    country.dates.map { country.getURLForDay(it) }
+                }
+                .map { url ->
+                    async {
+                        keyCache.createEntry(
+                            url.generateCacheKeyFromString(),
+                            WebRequestBuilder.getInstance().asyncGetKeyFilesFromServer(url).toURI(),
+                            DAY
+                        )
                     }
-            )
+                }
+                .toList()
+                .also { deferredQueries.addAll(it) }
         }
 
         // execute the query plan
@@ -146,7 +150,7 @@ object CachedKeyFileHolder {
      */
     private suspend fun asyncHandleLast3HoursFilesFetch(
         currentDate: Date,
-        serverDates: List<Pair<String, List<String>>>
+        serverDates: List<CountryDataWrapper>
     ): List<File> = withContext(Dispatchers.IO) {
         Timber.v("Last 3 Hours will be Fetched. Only use for Debugging!")
         val currentDateServerFormat = currentDate.toServerFormat()
@@ -155,21 +159,15 @@ object CachedKeyFileHolder {
         // extend fetch for all dates in all countries provided in serverDates
         val packagesWithCurrentDate = serverDates
             .filter { countryWithDates ->
-                countryWithDates.second.contains(
-                    currentDateServerFormat
-                )
+                countryWithDates.dates.contains(currentDateServerFormat)
             }
 
         if (packagesWithCurrentDate.isNotEmpty()) {
             return@withContext serverDates
                 .flatMap { countryWithDates ->
-                    val countryUtils = CountryUtils(countryWithDates.first, countryWithDates.second)
                     getLast3Hours(currentDate)
-                        .map {
-                            countryUtils.getURLForHour(
-                                currentDate.toServerFormat(),
-                                it
-                            )
+                        .map { hour ->
+                            countryWithDates.getURLForHour(currentDate.toServerFormat(), hour)
                         }
                         .map { url ->
                             async {
@@ -192,32 +190,28 @@ object CachedKeyFileHolder {
      * with respect to all countries defined
      */
     private suspend fun getMissingDaysFromDiff(
-        datesFromServer: Collection<Pair<String, Collection<String>>>
-    ): List<Pair<String, List<String>>> {
+        serverCountryData: Collection<CountryDataWrapper>
+    ): Collection<CountryDataWrapper> {
         val cacheEntries = keyCache.getDates()
-        return datesFromServer.map { countryDates ->
-            Pair(
-                countryDates.first,
-                countryDates.second
-                    .also { Timber.d("Country: ${countryDates.first}: ${it.size} Days") }
-                    .filter {
-                        CountryUtils(countryDates.first, countryDates.second)
-                            .isDateEntryCacheMissing(countryDates.first, cacheEntries)
-                    }
-                    .toList()
-                    .also { Timber.d("Country: ${countryDates.first}, Missing Days: ${it.size}") }
-            )
-        }
+        return serverCountryData
+            .also { Timber.d("Server country data: %s", it) }
+            .map { availCountry ->
+                CountryDataWrapper(
+                    availCountry.country,
+                    availCountry.getMissingDates(cacheEntries)
+                )
+            }
+            .filter { countryData ->
+                // Only return countries with missing dates.
+                countryData.dates.isNotEmpty()
+            }
+            .also { Timber.d("Locally missing country data: %s", it) }
     }
 
-    /**
-     * TODO remove before Release
-     */
     private const val LATEST_HOURS_NEEDED = 3
 
     /**
      * Calculates the last 3 hours
-     * TODO remove before Release
      */
     private suspend fun getLast3Hours(day: Date): List<String> = getHoursFromServer(day)
         .also { Timber.v("${it.size} hours from server, but only latest 3 hours needed") }
@@ -225,16 +219,6 @@ object CachedKeyFileHolder {
         .toList()
         .also { Timber.d("${it.size} missing hours") }
 
-    /**
-     * Creates a date entry in the Key Cache for a given String with a unique Key Name derived from the URL
-     * and the URI of the downloaded File for that given key
-     */
-    private suspend fun String.createDayEntryForUrl() = keyCache.createEntry(
-        this.generateCacheKeyFromString(),
-        WebRequestBuilder.getInstance().asyncGetKeyFilesFromServer(this).toURI(),
-        DAY
-    )
-
     /**
      * Generates a unique key name (UUIDv3) for the cache entry based out of a string (e.g. an url)
      */
@@ -262,4 +246,40 @@ object CachedKeyFileHolder {
      */
     private suspend fun getCountriesFromServer(countries: List<String>) =
         WebRequestBuilder.getInstance().asyncGetCountryIndex(countries)
+
 }
+
+internal data class CountryDataWrapper(val country: String, val dates: Collection<String>) {
+
+    /**
+     * Return a filtered list that contains all dates which are part of this wrapper, but not in the parameter.
+     */
+    fun getMissingDates(cachedKeys: Collection<KeyCacheEntity>): Collection<String> {
+        val cacheIds = cachedKeys.map { it.id }
+
+        return dates.filterNot { date ->
+            val formattedDateUrl = getURLForDay(date)
+            val cacheKeyFromUrl = formattedDateUrl.generateCacheKeyFromString()
+            // If the cache doesn't contain our ID, it's a missing date
+            cacheIds.contains(cacheKeyFromUrl)
+        }
+    }
+
+    /**
+     * Gets the correct URL String for querying a day bucket
+     *
+     * @param formattedDate the formatted date
+     */
+    fun getURLForDay(formattedDate: String) =
+        "${DiagnosisKeyConstants.AVAILABLE_COUNTRIES_URL}/$country/${DiagnosisKeyConstants.DATE}/$formattedDate"
+
+    /**
+     * Gets the correct URL String for querying an hour bucket
+     *
+     * @param formattedDate the formatted date for the hour bucket request
+     * @param formattedHour the formatted hour
+     */
+    fun getURLForHour(formattedDate: String, formattedHour: String) =
+        "${getURLForDay(formattedDate)}/${DiagnosisKeyConstants.HOUR}/$formattedHour"
+}
+
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CountryUtils.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CountryUtils.kt
deleted file mode 100644
index 18df16010f3..00000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CountryUtils.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package de.rki.coronawarnapp.util
-
-import de.rki.coronawarnapp.service.diagnosiskey.DiagnosisKeyConstants
-import de.rki.coronawarnapp.storage.keycache.KeyCacheEntity
-import de.rki.coronawarnapp.util.CachedKeyFileHolder.generateCacheKeyFromString
-
-data class CountryUtils(val country: String, val dates: Collection<String>) {
-
-    fun isDateEntryCacheMissing(formattedDate: String, cache: List<KeyCacheEntity>) = !cache
-        .map { date -> date.id }
-        .contains(getURLForDay(formattedDate).generateCacheKeyFromString())
-
-    /**
-     * Gets the correct URL String for querying a day bucket
-     *
-     * @param country the country of the formattedDate
-     * @param formattedDate the formatted date
-     */
-    fun getURLForDay(formattedDate: String) =
-        "${DiagnosisKeyConstants.AVAILABLE_COUNTRIES_URL}/$country/${DiagnosisKeyConstants.DATE}/$formattedDate"
-
-    /**
-     * Gets the correct URL String for querying an hour bucket
-     *
-     * @param country the country of the date and hour
-     * @param formattedDate the formatted date for the hour bucket request
-     * @param formattedHour the formatted hour
-     */
-    fun getURLForHour(formattedDate: String, formattedHour: String) =
-        "${getURLForDay(formattedDate)}/${DiagnosisKeyConstants.HOUR}/$formattedHour"
-}

From a4c4f829715ddc290a216fb2a4c204d76c949072 Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Wed, 2 Sep 2020 16:18:30 +0200
Subject: [PATCH 19/24] Fix linting and Unit tests

---
 .../main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt | 2 --
 .../java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt  | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
index a6c8bf6c2a9..e5e68aa8f55 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
@@ -246,7 +246,6 @@ object CachedKeyFileHolder {
      */
     private suspend fun getCountriesFromServer(countries: List<String>) =
         WebRequestBuilder.getInstance().asyncGetCountryIndex(countries)
-
 }
 
 internal data class CountryDataWrapper(val country: String, val dates: Collection<String>) {
@@ -282,4 +281,3 @@ internal data class CountryDataWrapper(val country: String, val dates: Collectio
     fun getURLForHour(formattedDate: String, formattedHour: String) =
         "${getURLForDay(formattedDate)}/${DiagnosisKeyConstants.HOUR}/$formattedHour"
 }
-
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
index 857b01eb086..57dda66561b 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
@@ -69,8 +69,9 @@ class CachedKeyFileHolderTest {
                 CachedKeyFileHolder.asyncFetchFiles(date, countries)
                 CachedKeyFileHolder["getCountriesFromServer"](countries)
                 CachedKeyFileHolder["getDatesFromServer"](country)
+                CachedKeyFileHolder["asyncHandleFilesFetch"](listOf(CountryDataWrapper(country, listOf())))
                 keyCacheRepository.deleteOutdatedEntries(any())
-                CachedKeyFileHolder["getMissingDaysFromDiff"](listOf(Pair(country, listOf<String>() )))
+                CachedKeyFileHolder["getMissingDaysFromDiff"](listOf(CountryDataWrapper(country, listOf() )))
                 keyCacheRepository.getDates()
                 keyCacheRepository.getFilesFromEntries()
             }

From 085c08451efef504294f69fad454ec9126e4dbd3 Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Thu, 3 Sep 2020 08:52:48 +0200
Subject: [PATCH 20/24] Add Unit test for getMissingDates

---
 .../util/CachedKeyFileHolderTest.kt           | 45 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
index 57dda66561b..a9a1e502d98 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt
@@ -2,7 +2,9 @@ package de.rki.coronawarnapp.util
 
 import android.content.Context
 import de.rki.coronawarnapp.CoronaWarnApplication
+import de.rki.coronawarnapp.storage.keycache.KeyCacheEntity
 import de.rki.coronawarnapp.storage.keycache.KeyCacheRepository
+import io.kotest.matchers.shouldBe
 import io.mockk.MockKAnnotations
 import io.mockk.Runs
 import io.mockk.coEvery
@@ -69,15 +71,54 @@ class CachedKeyFileHolderTest {
                 CachedKeyFileHolder.asyncFetchFiles(date, countries)
                 CachedKeyFileHolder["getCountriesFromServer"](countries)
                 CachedKeyFileHolder["getDatesFromServer"](country)
-                CachedKeyFileHolder["asyncHandleFilesFetch"](listOf(CountryDataWrapper(country, listOf())))
+                CachedKeyFileHolder["asyncHandleFilesFetch"](
+                    listOf(
+                        CountryDataWrapper(
+                            country,
+                            listOf()
+                        )
+                    )
+                )
                 keyCacheRepository.deleteOutdatedEntries(any())
-                CachedKeyFileHolder["getMissingDaysFromDiff"](listOf(CountryDataWrapper(country, listOf() )))
+                CachedKeyFileHolder["getMissingDaysFromDiff"](
+                    listOf(
+                        CountryDataWrapper(
+                            country,
+                            listOf()
+                        )
+                    )
+                )
                 keyCacheRepository.getDates()
                 keyCacheRepository.getFilesFromEntries()
             }
         }
     }
 
+    @Test
+    fun testGetMissingDaysFromDiff() {
+        val c1 = KeyCacheEntity()
+        c1.id = "10008bf0-8890-356d-a4a4-dc375553160a"
+        c1.path =
+            "/data/user/0/de.rki.coronawarnapp.dev/cache/key-export/10008bf0-8890-356d-a4a4-dc375553160a.zip"
+        c1.type = KeyCacheRepository.DateEntryType.DAY.ordinal
+
+        val c2 = KeyCacheEntity()
+        c2.id = "a8cc7b31-843e-3924-b918-023c386aec69"
+        c2.path =
+            "/data/user/0/de.rki.coronawarnapp.dev/cache/key-export/a8cc7b31-843e-3924-b918-023c386aec69.zip"
+        c2.type = KeyCacheRepository.DateEntryType.DAY.ordinal
+
+        val cacheEntries: Collection<KeyCacheEntity> = listOf(c1, c2)
+
+        val countryDataWrapper =
+            CountryDataWrapper("DE", listOf("2020-08-29", "2020-08-26", "2020-08-28"))
+
+        val result = countryDataWrapper.getMissingDates(cacheEntries)
+
+        result.size shouldBe 1
+        result.elementAt(0) shouldBe "2020-08-28"
+    }
+
     @After
     fun cleanUp() {
         unmockkAll()

From b76b418e35197203b69425fd9756eed9ffbacae9 Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Thu, 3 Sep 2020 15:10:05 +0200
Subject: [PATCH 21/24] Code cleanup

---
 .../RiskLevelAndKeyRetrievalBenchmark.kt      | 16 ++++------
 .../TestForAPIFragment.kt                     |  7 ++--
 .../res/layout/fragment_test_for_a_p_i.xml    | 23 +++++++------
 .../RetrieveDiagnosisKeysTransaction.kt       | 12 +++----
 .../coronawarnapp/util/CachedKeyFileHolder.kt | 32 +++++++++----------
 5 files changed, 42 insertions(+), 48 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/RiskLevelAndKeyRetrievalBenchmark.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/RiskLevelAndKeyRetrievalBenchmark.kt
index 33426d8ed55..b205356d82a 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/RiskLevelAndKeyRetrievalBenchmark.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/RiskLevelAndKeyRetrievalBenchmark.kt
@@ -10,7 +10,10 @@ import de.rki.coronawarnapp.transaction.RiskLevelTransaction
 import timber.log.Timber
 import kotlin.system.measureTimeMillis
 
-object RiskLevelAndKeyRetrievalBenchmark {
+class RiskLevelAndKeyRetrievalBenchmark(
+    private val context: Context,
+    private val countries: List<String>
+) {
 
     /**
      * Calls the RetrieveDiagnosisKeysTransaction and RiskLevelTransaction and measures them.
@@ -19,8 +22,6 @@ object RiskLevelAndKeyRetrievalBenchmark {
      * measured separately)
      */
     suspend fun start(
-        context: Context?,
-        countries: List<String>,
         callCount: Int,
         callback: (resultInfo: String) -> Unit
     ) {
@@ -58,9 +59,7 @@ object RiskLevelAndKeyRetrievalBenchmark {
             var calculationError = ""
 
             try {
-                measureKeyCalculation("#$index") {
-                    calculationDuration = it
-                }
+                calculationDuration = measureKeyCalculation("#$index")
             } catch (e: TransactionException) {
                 calculationError = e.message.toString()
             }
@@ -85,15 +84,14 @@ object RiskLevelAndKeyRetrievalBenchmark {
         }
     }
 
-    private suspend fun measureKeyCalculation(label: String, finished: (duration: Long) -> Unit) {
+    private suspend fun measureKeyCalculation(label: String): Long {
         try {
             Timber.v("MEASURE [Risk Level Calculation] $label started")
             // start risk level calculation and get duration
-            measureTimeMillis {
+            return measureTimeMillis {
                 RiskLevelTransaction.start()
             }.also {
                 Timber.v("MEASURE [Risk Level Calculation] $label finished")
-                finished(it)
             }
         } catch (e: TransactionException) {
             e.report(ExceptionCategory.INTERNAL)
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
index 6fe1fbf53c2..2701871516c 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
@@ -290,11 +290,10 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
             lifecycleScope.launch {
                 val repeatCount =
                     binding.inputMeasureRiskKeyRepeatCount.text.toString().toInt()
-                RiskLevelAndKeyRetrievalBenchmark.start(
+                RiskLevelAndKeyRetrievalBenchmark(
                     context,
-                    lastSetCountries ?: listOf("DE"),
-                    repeatCount
-                ) { status ->
+                    lastSetCountries ?: listOf("DE")
+                ).start(repeatCount) { status ->
                     binding.labelTestApiMeasureCalcKeyStatus.text = status
                 }
             }
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
index 8161e95bfe8..20c841ab352 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
@@ -239,16 +239,15 @@
 
                 <EditText
                     android:id="@+id/input_country_codes_editText"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.9" />
+                    android:layout_weight="1" />
 
                 <Button
                     android:id="@+id/button_filter_country_codes"
                     style="@style/buttonPrimary"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.1"
                     android:text="Apply" />
             </LinearLayout>
 
@@ -275,23 +274,23 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
+                <EditText
+                    android:id="@+id/input_measure_risk_key_repeat_count"
+                    android:layout_width="98dp"
+                    android:layout_height="wrap_content"
+                    android:inputType="number"
+                    android:text="1" />
+
                 <Button
                     android:id="@+id/button_retrieve_diagnosis_keys_and_calc_risk_level"
                     style="@style/buttonPrimary"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/spacing_normal"
                     android:layout_marginBottom="@dimen/spacing_normal"
                     android:layout_weight="1"
                     android:text="Measure: Calculate Risk Level / Key Retrieval" />
 
-                <EditText
-                    android:id="@+id/input_measure_risk_key_repeat_count"
-                    android:layout_width="98dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:inputType="number"
-                    android:text="1" />
 
             </LinearLayout>
 
@@ -299,7 +298,7 @@
                 android:id="@+id/label_test_api_measure_calc_key_status"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Result: "/>
+                android:text="Result: " />
 
             <TextView
                 style="@style/headline4"
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
index 08e2e7d53e3..ae1dc5f5e75 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
@@ -199,14 +199,12 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
         }
 
         if (CWADebug.isDebugBuildOrMode) {
-            var totalFileSize: Long = 0
-            keyFiles.also {
-                it.forEach { file ->
-                    totalFileSize += file.length()
-                }
-            }
+            val totalFileSize = keyFiles.fold(0L, { acc, file ->
+                file.length() + acc
+            })
             onKeyFilesFinished?.invoke(
-                keyFiles.size, totalFileSize)
+                keyFiles.size, totalFileSize
+            )
             onKeyFilesFinished = null
         }
 
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
index e5e68aa8f55..5330e409d92 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
@@ -162,27 +162,27 @@ object CachedKeyFileHolder {
                 countryWithDates.dates.contains(currentDateServerFormat)
             }
 
-        if (packagesWithCurrentDate.isNotEmpty()) {
-            return@withContext serverDates
-                .flatMap { countryWithDates ->
-                    getLast3Hours(currentDate)
-                        .map { hour ->
-                            countryWithDates.getURLForHour(currentDate.toServerFormat(), hour)
-                        }
-                        .map { url ->
-                            async {
-                                return@async WebRequestBuilder.getInstance()
-                                    .asyncGetKeyFilesFromServer(url)
-                            }
-                        }
-                }
-                .awaitAll()
-        } else {
+        if (packagesWithCurrentDate.isEmpty()) {
             throw IllegalStateException(
                 "you cannot use the last 3 hour mode if the date index " +
                         "does not contain any data for today"
             )
         }
+
+        return@withContext serverDates
+            .flatMap { countryWithDates ->
+                getLast3Hours(currentDate)
+                    .map { hour ->
+                        countryWithDates.getURLForHour(currentDate.toServerFormat(), hour)
+                    }
+                    .map { url ->
+                        async {
+                            return@async WebRequestBuilder.getInstance()
+                                .asyncGetKeyFilesFromServer(url)
+                        }
+                    }
+            }
+            .awaitAll()
     }
 
     /**

From daf40168f5c5951383b0ee0dcfc78a1413ff2cad Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Thu, 3 Sep 2020 15:40:18 +0200
Subject: [PATCH 22/24] Hide keyboard on action

---
 .../TestForAPIFragment.kt                     | 67 +++++++++++++------
 .../res/layout/fragment_test_for_a_p_i.xml    |  4 +-
 2 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
index 2701871516c..f8b9a483b2b 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
@@ -1,5 +1,6 @@
 package de.rki.coronawarnapp
 
+import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Color
@@ -8,6 +9,8 @@ import android.util.Base64
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
 import android.widget.ImageView
 import android.widget.Toast
 import androidx.core.content.pm.PackageInfoCompat
@@ -270,28 +273,34 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
         }
 
         binding.buttonFilterCountryCodes.setOnClickListener {
-            // Get user input country codes
-            val rawCountryCodes = binding.inputCountryCodesEditText.text.toString()
-
-            // Country codes can be separated by space or ,
-            var countryCodes = rawCountryCodes.split(',', ' ').filter { it.isNotEmpty() }
+            filterCountryCodes()
+        }
 
-            lastSetCountries = countryCodes
+        binding.buttonRetrieveDiagnosisKeysAndCalcRiskLevel.setOnClickListener {
+            startKeyRetrievalAndRiskCalcBenchmark()
+        }
 
-            // Trigger asyncFetchFiles which will use all Countries passed as parameter
-            val currentDate = Date(System.currentTimeMillis())
-            lifecycleScope.launch {
-                CachedKeyFileHolder.asyncFetchFiles(currentDate, countryCodes)
-                updateCountryStatusLabel()
+        binding.inputMeasureRiskKeyRepeatCount.setOnEditorActionListener { v, actionCode, event ->
+            if (actionCode == EditorInfo.IME_ACTION_DONE) {
+                startKeyRetrievalAndRiskCalcBenchmark()
             }
+            false
         }
+    }
 
-        binding.buttonRetrieveDiagnosisKeysAndCalcRiskLevel.setOnClickListener {
-            lifecycleScope.launch {
-                val repeatCount =
-                    binding.inputMeasureRiskKeyRepeatCount.text.toString().toInt()
+    override fun onResume() {
+        super.onResume()
+
+        updateExposureSummaryDisplay(null)
+    }
+
+    private fun startKeyRetrievalAndRiskCalcBenchmark() {
+        lifecycleScope.launch {
+            val repeatCount =
+                binding.inputMeasureRiskKeyRepeatCount.text.toString().toInt()
+            context?.let {
                 RiskLevelAndKeyRetrievalBenchmark(
-                    context,
+                    it,
                     lastSetCountries ?: listOf("DE")
                 ).start(repeatCount) { status ->
                     binding.labelTestApiMeasureCalcKeyStatus.text = status
@@ -300,10 +309,30 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
         }
     }
 
-    override fun onResume() {
-        super.onResume()
+    private fun filterCountryCodes() {
+        hideKeyboard()
+        // Get user input country codes
+        val rawCountryCodes = binding.inputCountryCodesEditText.text.toString()
 
-        updateExposureSummaryDisplay(null)
+        // Country codes can be separated by space or ,
+        var countryCodes = rawCountryCodes.split(',', ' ').filter { it.isNotEmpty() }
+
+        lastSetCountries = countryCodes
+
+        // Trigger asyncFetchFiles which will use all Countries passed as parameter
+        val currentDate = Date(System.currentTimeMillis())
+        lifecycleScope.launch {
+            CachedKeyFileHolder.asyncFetchFiles(currentDate, countryCodes)
+            updateCountryStatusLabel()
+        }
+    }
+
+    private fun hideKeyboard() {
+        activity?.currentFocus.let {
+            val inputManager =
+                context?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+            inputManager.hideSoftInputFromWindow(it?.windowToken, 0)
+        }
     }
 
     /**
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
index 20c841ab352..2452245478a 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
@@ -241,7 +241,8 @@
                     android:id="@+id/input_country_codes_editText"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                    android:layout_weight="1"
+                    />
 
                 <Button
                     android:id="@+id/button_filter_country_codes"
@@ -289,6 +290,7 @@
                     android:layout_marginTop="@dimen/spacing_normal"
                     android:layout_marginBottom="@dimen/spacing_normal"
                     android:layout_weight="1"
+                    android:imeOptions="actionDone"
                     android:text="Measure: Calculate Risk Level / Key Retrieval" />
 
 

From c5024911e27512d6ee5a1752bb9d61efce8cb999 Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Thu, 3 Sep 2020 16:40:01 +0200
Subject: [PATCH 23/24] Extend statistics for api submission

---
 .../RiskLevelAndKeyRetrievalBenchmark.kt      | 55 ++++++++++++++-----
 .../TestForAPIFragment.kt                     |  1 +
 .../RetrieveDiagnosisKeysTransaction.kt       | 39 ++++++++-----
 3 files changed, 66 insertions(+), 29 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/RiskLevelAndKeyRetrievalBenchmark.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/RiskLevelAndKeyRetrievalBenchmark.kt
index b205356d82a..85b980a36e0 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/RiskLevelAndKeyRetrievalBenchmark.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/RiskLevelAndKeyRetrievalBenchmark.kt
@@ -5,6 +5,7 @@ import android.text.format.Formatter
 import de.rki.coronawarnapp.exception.ExceptionCategory
 import de.rki.coronawarnapp.exception.TransactionException
 import de.rki.coronawarnapp.exception.reporting.report
+import de.rki.coronawarnapp.storage.keycache.KeyCacheRepository
 import de.rki.coronawarnapp.transaction.RetrieveDiagnosisKeysTransaction
 import de.rki.coronawarnapp.transaction.RiskLevelTransaction
 import timber.log.Timber
@@ -15,6 +16,12 @@ class RiskLevelAndKeyRetrievalBenchmark(
     private val countries: List<String>
 ) {
 
+    /**
+     * the key cache instance used to store queried dates and hours
+     */
+    private val keyCache =
+        KeyCacheRepository.getDateRepository(context)
+
     /**
      * Calls the RetrieveDiagnosisKeysTransaction and RiskLevelTransaction and measures them.
      * Results are displayed using a label
@@ -32,25 +39,31 @@ class RiskLevelAndKeyRetrievalBenchmark(
                         "${countries?.joinToString(", ")}\n\n"
             )
             .append("Result: \n\n")
-            .append("#\t Combined \t Download \t Key Calc \t File # \t Files size\n")
+            .append("#\t Combined \t Download \t Sub \t Risk \t File # \t  F. size\n")
 
         callback(resultInfo.toString())
 
         repeat(callCount) { index ->
+
+            keyCache.clear()
+
             var keyRetrievalError = ""
             var keyFileCount: Int = -1
             var keyFileDownloadDuration: Long = -1
             var keyFilesSize: Long = -1
+            var apiSubmissionDuration: Long = -1
 
             try {
                 measureDiagnosticKeyRetrieval(
-                    "#$index",
-                    countries
-                ) { duration, keyCount, totalFileSize ->
-                    keyFileCount = keyCount
-                    keyFileDownloadDuration = duration
-                    keyFilesSize = totalFileSize
-                }
+                    label = "#$index",
+                    countries = countries,
+                    downloadFinished = { duration, keyCount, totalFileSize ->
+                        keyFileCount = keyCount
+                        keyFileDownloadDuration = duration
+                        keyFilesSize = totalFileSize
+                    }, apiSubmissionFinished = { duration ->
+                        apiSubmissionDuration = duration
+                    })
             } catch (e: TransactionException) {
                 keyRetrievalError = e.message.toString()
             }
@@ -66,9 +79,9 @@ class RiskLevelAndKeyRetrievalBenchmark(
 
             // build result entry for current iteration with all gathered data
             resultInfo.append(
-                "${index + 1}. \t ${calculationDuration + keyFileDownloadDuration} ms \t\t " +
-                        "$keyFileDownloadDuration ms " +
-                        "\t\t $calculationDuration ms \t\t $keyFileCount \t\t " +
+                "${index + 1}. \t ${calculationDuration + keyFileDownloadDuration + apiSubmissionDuration} ms \t " +
+                        "$keyFileDownloadDuration ms " + "\t $apiSubmissionDuration ms" +
+                        "\t $calculationDuration ms \t $keyFileCount \t " +
                         "${Formatter.formatFileSize(context, keyFilesSize)}\n"
             )
 
@@ -102,21 +115,33 @@ class RiskLevelAndKeyRetrievalBenchmark(
     private suspend fun measureDiagnosticKeyRetrieval(
         label: String,
         countries: List<String>,
-        finished: (duration: Long, keyCount: Int, fileSize: Long) -> Unit
+        downloadFinished: (duration: Long, keyCount: Int, fileSize: Long) -> Unit,
+        apiSubmissionFinished: (duration: Long) -> Unit
     ) {
         var keyFileDownloadStart: Long = -1
+        var apiSubmissionStarted: Long = -1
 
         try {
-            RetrieveDiagnosisKeysTransaction.onKeyFilesStarted = {
+            RetrieveDiagnosisKeysTransaction.onKeyFilesDownloadStarted = {
                 Timber.v("MEASURE [Diagnostic Key Files] $label started")
                 keyFileDownloadStart = System.currentTimeMillis()
             }
 
-            RetrieveDiagnosisKeysTransaction.onKeyFilesFinished = { count, size ->
+            RetrieveDiagnosisKeysTransaction.onKeyFilesDownloadFinished = { count, size ->
                 Timber.v("MEASURE [Diagnostic Key Files] $label finished")
                 val duration = System.currentTimeMillis() - keyFileDownloadStart
-                finished(duration, count, size)
+                downloadFinished(duration, count, size)
             }
+
+            RetrieveDiagnosisKeysTransaction.onApiSubmissionStarted = {
+                apiSubmissionStarted = System.currentTimeMillis()
+            }
+
+            RetrieveDiagnosisKeysTransaction.onApiSubmissionFinished = {
+                val duration = System.currentTimeMillis() - apiSubmissionStarted
+                apiSubmissionFinished(duration)
+            }
+
             // start diagnostic key transaction
             RetrieveDiagnosisKeysTransaction.start(countries)
         } catch (e: TransactionException) {
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
index f8b9a483b2b..ac579527077 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestForAPIFragment.kt
@@ -295,6 +295,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel
     }
 
     private fun startKeyRetrievalAndRiskCalcBenchmark() {
+        hideKeyboard()
         lifecycleScope.launch {
             val repeatCount =
                 binding.inputMeasureRiskKeyRepeatCount.text.toString().toInt()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
index ae1dc5f5e75..0a42533f0f0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
@@ -119,8 +119,11 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
     /** atomic reference for the rollback value for created files during the transaction */
     private val exportFilesForRollback = AtomicReference<List<File>>()
 
-    var onKeyFilesStarted: (() -> Unit)? = null
-    var onKeyFilesFinished: ((keyCount: Int, fileSize: Long) -> Unit)? = null
+    var onApiSubmissionStarted: (() -> Unit)? = null
+    var onApiSubmissionFinished: (() -> Unit)? = null
+
+    var onKeyFilesDownloadStarted: (() -> Unit)? = null
+    var onKeyFilesDownloadFinished: ((keyCount: Int, fileSize: Long) -> Unit)? = null
 
     suspend fun startWithConstraints() {
         val currentDate = DateTime(Instant.now(), DateTimeZone.UTC)
@@ -175,20 +178,33 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
         /****************************************************
          * FILES FROM WEB REQUESTS
          ****************************************************/
-        if (CWADebug.isDebugBuildOrMode) {
-            onKeyFilesStarted?.invoke()
-            onKeyFilesStarted = null
-        }
-
         val countries = requestedCountries ?: ApplicationConfigurationService
             .asyncRetrieveApplicationConfiguration()
             .supportedCountriesList
 
+        if (CWADebug.isDebugBuildOrMode) {
+            onKeyFilesDownloadStarted?.invoke()
+            onKeyFilesDownloadStarted = null
+        }
+
         val keyFiles = executeFetchKeyFilesFromServer(
             currentDate,
             countries
         )
 
+        if (CWADebug.isDebugBuildOrMode) {
+            val totalFileSize = keyFiles.fold(0L, { acc, file ->
+                file.length() + acc
+            })
+
+            onKeyFilesDownloadFinished?.invoke(keyFiles.size, totalFileSize)
+        }
+
+        if (CWADebug.isDebugBuildOrMode) {
+            onApiSubmissionStarted?.invoke()
+            onApiSubmissionStarted = null
+        }
+
         if (keyFiles.isNotEmpty()) {
             /****************************************************
              * SUBMIT FILES TO API
@@ -199,13 +215,8 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
         }
 
         if (CWADebug.isDebugBuildOrMode) {
-            val totalFileSize = keyFiles.fold(0L, { acc, file ->
-                file.length() + acc
-            })
-            onKeyFilesFinished?.invoke(
-                keyFiles.size, totalFileSize
-            )
-            onKeyFilesFinished = null
+            onApiSubmissionFinished?.invoke()
+            onApiSubmissionFinished = null
         }
 
         /****************************************************

From 3050ace595d80e771e97607b0c726211d72cea2d Mon Sep 17 00:00:00 2001
From: Mert Safter <mert.safter@sap.com>
Date: Thu, 3 Sep 2020 16:40:49 +0200
Subject: [PATCH 24/24] Set callback to null after invoked

---
 .../transaction/RetrieveDiagnosisKeysTransaction.kt              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
index 0a42533f0f0..1b9f0217488 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
@@ -198,6 +198,7 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
             })
 
             onKeyFilesDownloadFinished?.invoke(keyFiles.size, totalFileSize)
+            onKeyFilesDownloadFinished = null
         }
 
         if (CWADebug.isDebugBuildOrMode) {