Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 21:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Clear the cache directory but don't delete it.

Browse Source
This commit is contained in:
akwizgran
2020-02-25 10:58:02 +00:00
parent 1d63b16ff1
commit e1e67f3b2e
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bramble-android/src/main/java/org/briarproject/bramble/account/AndroidAccountManager.java
View File

@@ -36,7 +36,7 @@ class AndroidAccountManager extends AccountManagerImpl
* Directories that shouldn't be deleted when deleting the user's account. * Directories that shouldn't be deleted when deleting the user's account.
*/ */
private static final List<String> PROTECTED_DIR_NAMES = private static final List<String> PROTECTED_DIR_NAMES =
asList("code_cache", "lib", "shared_prefs"); asList("cache", "code_cache", "lib", "shared_prefs");
protected final Context appContext; protected final Context appContext;
private final SharedPreferences prefs; private final SharedPreferences prefs;
@@ -104,7 +104,6 @@ class AndroidAccountManager extends AccountManagerImpl
} }
} }
files.add(appContext.getFilesDir()); files.add(appContext.getFilesDir());
files.add(appContext.getCacheDir());
addIfNotNull(files, appContext.getExternalCacheDir()); addIfNotNull(files, appContext.getExternalCacheDir());
if (SDK_INT >= 19) { if (SDK_INT >= 19) {
for (File file : appContext.getExternalCacheDirs()) { for (File file : appContext.getExternalCacheDirs()) {
@@ -116,16 +115,16 @@ class AndroidAccountManager extends AccountManagerImpl
addIfNotNull(files, file); 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) { for (File file : files) {
if (LOG.isLoggable(INFO)) { if (LOG.isLoggable(INFO)) {
LOG.info("Deleting " + file.getAbsolutePath()); LOG.info("Deleting " + file.getAbsolutePath());
} }
deleteFileOrDir(file); 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() { private File getDataDir() {