Explicitly remove messages.db journal

Fixes #7636
This commit is contained in:
Moxie Marlinspike 2018-04-05 03:50:33 -07:00
parent c3882e9d51
commit ca471b1408

View File

@ -77,6 +77,7 @@ public class DatabaseUpgradeActivity extends BaseActivity {
public static final int INTERNALIZE_CONTACTS = 317;
public static final int SQLCIPHER = 334;
public static final int SQLCIPHER_COMPLETE = 352;
public static final int REMOVE_JOURNAL = 353;
private static final SortedSet<Integer> UPGRADE_VERSIONS = new TreeSet<Integer>() {{
add(NO_MORE_KEY_EXCHANGE_PREFIX_VERSION);
@ -284,6 +285,11 @@ public class DatabaseUpgradeActivity extends BaseActivity {
if (file != null && file.exists()) file.delete();
}
if (params[0] < REMOVE_JOURNAL) {
File file = context.getDatabasePath("messages.db-journal");
if (file != null && file.exists()) file.delete();
}
return null;
}