empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Mark DB current after backup upgrade process

Browse source 
Fixes #7596
This commit is contained in:
Moxie Marlinspike 2018-04-02 06:27:50 -07:00
parent c0da061072
commit 2c82b3610d
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/org/thoughtcrime/securesms/database/DatabaseFactory.java
View file

@ -136,6 +136,7 @@ public class DatabaseFactory {
public static void upgradeRestored(Context context, SQLiteDatabase database){ public static void upgradeRestored(Context context, SQLiteDatabase database){
getInstance(context).databaseHelper.onUpgrade(database, database.getVersion(), -1); getInstance(context).databaseHelper.onUpgrade(database, database.getVersion(), -1);
getInstance(context).databaseHelper.markCurrent(database);
} }
private DatabaseFactory(@NonNull Context context) { private DatabaseFactory(@NonNull Context context) {

4
src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
View file

@ -185,6 +185,10 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
return getWritableDatabase(databaseSecret.asString()); return getWritableDatabase(databaseSecret.asString());
} }
public void markCurrent(SQLiteDatabase db) {
db.setVersion(DATABASE_VERSION);
}
private void executeStatements(SQLiteDatabase db, String[] statements) { private void executeStatements(SQLiteDatabase db, String[] statements) {
for (String statement : statements) for (String statement : statements)
db.execSQL(statement); db.execSQL(statement);