From e1e67f3b2ec0510b73b9d98f02323d1a5d6d5c86 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 25 Feb 2020 10:58:02 +0000 Subject: [PATCH] Clear the cache directory but don't delete it. --- .../bramble/account/AndroidAccountManager.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/bramble-android/src/main/java/org/briarproject/bramble/account/AndroidAccountManager.java b/bramble-android/src/main/java/org/briarproject/bramble/account/AndroidAccountManager.java index b0cb783d3..37460cc9b 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/account/AndroidAccountManager.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/account/AndroidAccountManager.java @@ -36,7 +36,7 @@ class AndroidAccountManager extends AccountManagerImpl * Directories that shouldn't be deleted when deleting the user's account. */ private static final List PROTECTED_DIR_NAMES = - asList("code_cache", "lib", "shared_prefs"); + asList("cache", "code_cache", "lib", "shared_prefs"); protected final Context appContext; private final SharedPreferences prefs; @@ -104,7 +104,6 @@ class AndroidAccountManager extends AccountManagerImpl } } files.add(appContext.getFilesDir()); - files.add(appContext.getCacheDir()); addIfNotNull(files, appContext.getExternalCacheDir()); if (SDK_INT >= 19) { for (File file : appContext.getExternalCacheDirs()) { @@ -116,16 +115,16 @@ class AndroidAccountManager extends AccountManagerImpl addIfNotNull(files, file); } } + // Clear the cache directory but don't delete it + File cacheDir = appContext.getCacheDir(); + File[] children = cacheDir.listFiles(); + if (children != null) files.addAll(asList(children)); for (File file : files) { if (LOG.isLoggable(INFO)) { LOG.info("Deleting " + file.getAbsolutePath()); } deleteFileOrDir(file); } - // Recreate the cache dir as some OpenGL drivers expect it to exist - if (!new File(dataDir, "cache").mkdirs()) { - LOG.warning("Could not recreate cache dir"); - } } private File getDataDir() {