From 007adb1bd4582897750f01ae01fa270b482a9a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20M=C3=B6ller?= <jakob.moeller@sap.com>
Date: Sat, 6 Jun 2020 17:48:24 +0200
Subject: [PATCH] Correct File Storage to internal, fixes #6 (#218)
Signed-off-by: d067928 <jakob.moeller@sap.com>
---
.../java/de/rki/coronawarnapp/storage/FileStorageHelper.kt | 4 +---
.../rki/coronawarnapp/storage/keycache/KeyCacheRepository.kt | 3 ++-
2 files changed, 3 insertions(+), 4 deletions(-)
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 89a4ff7ea..0b785287d 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
@@ -27,12 +27,10 @@ object FileStorageHelper {
* Get key files export directory used to store all export files for the transaction
* Uses FileStorageConstants.KEY_EXPORT_DIRECTORY_NAME constant
*
- * TODO Change to CacheDir before release
- *
* @return File of key export directory
*/
val keyExportDirectory = File(
- CoronaWarnApplication.getAppContext().getExternalFilesDir(null),
+ CoronaWarnApplication.getAppContext().cacheDir,
FileStorageConstants.KEY_EXPORT_DIRECTORY_NAME
)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/keycache/KeyCacheRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/keycache/KeyCacheRepository.kt
index e89af1e3b..92fb64795 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/keycache/KeyCacheRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/keycache/KeyCacheRepository.kt
@@ -59,7 +59,8 @@ class KeyCacheRepository(private val keyCacheDao: KeyCacheDao) {
)
suspend fun deleteOutdatedEntries() = keyCacheDao.getAllEntries().forEach {
- if (File(it.path).isOutdated()) {
+ val file = File(it.path)
+ if (file.isOutdated() || !file.exists()) {
deleteFileForEntry(it)
keyCacheDao.deleteEntry(it)
}
--
GitLab