Merge pull request #394 from corona-warn-app/jm-todos

Jm todos
corona-warn-app · May 30, 2020 · d379d70 · d379d70
2 parents 67574a4 + 818f437
commit d379d70
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 33 deletions.
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/AppDatabase.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/AppDatabase.kt
@@ -12,6 +12,7 @@ import de.rki.coronawarnapp.storage.tracing.TracingIntervalEntity
 import de.rki.coronawarnapp.util.Converters
 import net.sqlcipher.database.SQLiteDatabase
 import net.sqlcipher.database.SupportFactory
+import java.util.UUID
 
 @Database(
     entities = [ExposureSummaryEntity::class, KeyCacheEntity::class, TracingIntervalEntity::class],
@@ -35,9 +36,14 @@ abstract class AppDatabase : RoomDatabase() {
             }
         }
 
+        fun resetInstance(context: Context) = { instance = null }.also { getInstance(context) }
+
         private fun buildDatabase(context: Context): AppDatabase {
+            if (LocalData.databasePassword() == null) {
+                LocalData.databasePassword(UUID.randomUUID().toString().toCharArray())
+            }
             return Room.databaseBuilder(context, AppDatabase::class.java, DATABASE_NAME)
-                .openHelperFactory(SupportFactory(SQLiteDatabase.getBytes(LocalData.getDatabasePassword())))
+                .openHelperFactory(SupportFactory(SQLiteDatabase.getBytes(LocalData.databasePassword())))
                 .build()
         }
     }

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt
@@ -5,7 +5,6 @@ import de.rki.coronawarnapp.CoronaWarnApplication
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.util.security.SecurityHelper.globalEncryptedSharedPreferencesInstance
 import java.util.Date
-import java.util.UUID
 
 /**
  * LocalData is responsible for all access to the shared preferences. Each preference is accessible
@@ -474,24 +473,21 @@ object LocalData {
      * DATABASE PASSWORD
      ****************************************************/
 
-    fun getDatabasePassword(): CharArray {
-        val pw = getSharedPreferenceInstance().getString(
-            CoronaWarnApplication.getAppContext()
-                .getString(R.string.preference_database_password),
-            null
-        )
-        if (pw == null) {
-            with(getSharedPreferenceInstance().edit()) {
-                putString(
-                    CoronaWarnApplication.getAppContext()
-                        .getString(R.string.preference_database_password),
-                    UUID.randomUUID().toString()
-                )
-                commit()
-            }
-            return getDatabasePassword()
+    fun databasePassword(): CharArray? = getSharedPreferenceInstance().getString(
+        CoronaWarnApplication.getAppContext()
+            .getString(R.string.preference_database_password),
+        null
+    )?.toCharArray()
+
+    fun databasePassword(password: CharArray) {
+        with(getSharedPreferenceInstance().edit()) {
+            putString(
+                CoronaWarnApplication.getAppContext()
+                    .getString(R.string.preference_database_password),
+                password.toString()
+            )
+            commit()
         }
-        return pw.toCharArray()
     }
 
     /****************************************************

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt
@@ -78,6 +78,7 @@ class SettingsResetFragment : BaseFragment() {
                 ).show()
             }
             withContext(Dispatchers.IO) {
+                // todo include link to google settings for resetting BLE data
                 deleteLocalAppContent()
             }
             navigateToOnboarding()

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
@@ -69,7 +69,8 @@ object CachedKeyFileHolder {
         keyCache.deleteOutdatedEntries()
         // queries will be executed after the "query plan" was set
         val deferredQueries: MutableCollection<Deferred<Any>> = mutableListOf()
-        val missingDays = getMissingDaysFromDiff()
+        val serverDates = getDatesFromServer()
+        val missingDays = getMissingDaysFromDiff(serverDates)
         if (missingDays.isNotEmpty()) {
             // we have a date difference
             deferredQueries.addAll(
@@ -80,12 +81,16 @@ object CachedKeyFileHolder {
             // if we have a date difference we need to refetch the current hours
             keyCache.clearHours()
         }
-        // we have an hour difference
-        deferredQueries.addAll(
-            getMissingHoursFromDiff(currentDate)
-                .map { getURLForHour(currentDate.toServerFormat(), it) }
-                .map { url -> async { url.createHourEntryForUrl() } }
-        )
+        val currentDateServerFormat = currentDate.toServerFormat()
+        // just fetch the hours if the date is available
+        if (serverDates.contains(currentDateServerFormat)) {
+            // we have an hour difference
+            deferredQueries.addAll(
+                getMissingHoursFromDiff(currentDate)
+                    .map { getURLForHour(currentDate.toServerFormat(), it) }
+                    .map { url -> async { url.createHourEntryForUrl() } }
+            )
+        }
         // execute the query plan
         try {
             deferredQueries.awaitAll()
@@ -100,9 +105,9 @@ object CachedKeyFileHolder {
     /**
      * Calculates the missing days based on current missing entries in the cache
      */
-    private suspend fun getMissingDaysFromDiff(): List<String> {
+    private suspend fun getMissingDaysFromDiff(datesFromServer: Collection<String>): List<String> {
         val cacheEntries = keyCache.getDates()
-        return getDatesFromServer()
+        return datesFromServer
             .also { Log.d(TAG, "${it.size} days from server") }
             .filter { it.dateEntryCacheMiss(cacheEntries) }
             .toList()

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataRetentionHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataRetentionHelper.kt
@@ -24,8 +24,7 @@ import android.util.Log
 import de.rki.coronawarnapp.storage.AppDatabase
 import de.rki.coronawarnapp.storage.FileStorageHelper
 import de.rki.coronawarnapp.storage.LocalData
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import java.util.UUID
 
 /**
  * Helper for supplying functionality regarding Data Retention
@@ -37,12 +36,15 @@ object DataRetentionHelper {
      * Deletes all data known to the Application
      *
      */
-    suspend fun clearAllLocalData(context: Context) = withContext(Dispatchers.Default) {
+    fun clearAllLocalData(context: Context) {
         Log.w(TAG, "CWA LOCAL DATA DELETION INITIATED.")
-        // Shared Preferences Reset
-        LocalData.getSharedPreferenceInstance().edit().clear().apply()
         // Database Reset
         AppDatabase.getInstance(context).clearAllTables()
+        // Shared Preferences Reset
+        LocalData.getSharedPreferenceInstance().edit().clear().apply()
+        // Delete Database Instance
+        AppDatabase.resetInstance(context)
+        LocalData.databasePassword(UUID.randomUUID().toString().toCharArray())
         // Export File Reset
         FileStorageHelper.getAllFilesInKeyExportDirectory().forEach { it.delete() }
         Log.w(TAG, "CWA LOCAL DATA DELETION COMPLETED.")