TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-21 11:51:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear cache on update

Browse Source
This commit is contained in:
Moxie Marlinspike 2018-04-12 17:17:48 -07:00
parent c573d5703b
commit 0b0853a223
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
View File

@ -45,11 +45,13 @@ import org.thoughtcrime.securesms.jobs.PushDecryptJob;
import org.thoughtcrime.securesms.jobs.RefreshAttributesJob; import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.service.KeyCachingService; import org.thoughtcrime.securesms.service.KeyCachingService;
import org.thoughtcrime.securesms.util.FileUtils;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.VersionTracker; import org.thoughtcrime.securesms.util.VersionTracker;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.TreeSet; import java.util.TreeSet;
@ -78,6 +80,7 @@ public class DatabaseUpgradeActivity extends BaseActivity {
public static final int SQLCIPHER = 334; public static final int SQLCIPHER = 334;
public static final int SQLCIPHER_COMPLETE = 352; public static final int SQLCIPHER_COMPLETE = 352;
public static final int REMOVE_JOURNAL = 353; public static final int REMOVE_JOURNAL = 353;
public static final int REMOVE_CACHE = 354;
private static final SortedSet<Integer> UPGRADE_VERSIONS = new TreeSet<Integer>() {{ private static final SortedSet<Integer> UPGRADE_VERSIONS = new TreeSet<Integer>() {{
add(NO_MORE_KEY_EXCHANGE_PREFIX_VERSION); add(NO_MORE_KEY_EXCHANGE_PREFIX_VERSION);
@ -97,6 +100,7 @@ public class DatabaseUpgradeActivity extends BaseActivity {
add(PERSISTENT_BLOBS); add(PERSISTENT_BLOBS);
add(SQLCIPHER); add(SQLCIPHER);
add(SQLCIPHER_COMPLETE); add(SQLCIPHER_COMPLETE);
add(REMOVE_CACHE);
}}; }};
private MasterSecret masterSecret; private MasterSecret masterSecret;
@ -290,6 +294,14 @@ public class DatabaseUpgradeActivity extends BaseActivity {
if (file != null && file.exists()) file.delete(); if (file != null && file.exists()) file.delete();
} }
if (params[0] < REMOVE_CACHE) {
try {
FileUtils.deleteDirectoryContents(context.getCacheDir());
} catch (IOException e) {
Log.w(TAG, e);
}
}
return null; return null;
} }

24
src/org/thoughtcrime/securesms/util/FileUtils.java
View File

@ -1,5 +1,6 @@
package org.thoughtcrime.securesms.util; package org.thoughtcrime.securesms.util;
import java.io.File;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
@ -30,4 +31,27 @@ public class FileUtils {
throw new AssertionError(e); throw new AssertionError(e);
} }
} }
public static void deleteDirectoryContents(File directory) throws IOException {
if (directory == null || !directory.exists() || !directory.isDirectory()) return;
File[] files = directory.listFiles();
if (files != null) {
for (File file : files) {
if (file.isDirectory()) deleteDirectory(file);
else file.delete();
}
}
}
public static void deleteDirectory(File directory) throws IOException {
if (directory == null || !directory.exists() || !directory.isDirectory()) {
return;
}
deleteDirectoryContents(directory);
directory.delete();
}
} }