TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-26 05:46:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add determinte progress and foreground service for sqlcipher migration

Browse Source
This commit is contained in:
Moxie Marlinspike
2018-02-01 16:01:24 -08:00
parent bdd4b456c4
commit 23aee53c7d
7 changed files with 139 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,11 +78,11 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
ClassicOpenHelper legacyHelper = new ClassicOpenHelper(context);
android.database.sqlite.SQLiteDatabase legacyDb = legacyHelper.getWritableDatabase();
SQLCipherMigrationHelper.migratePlaintext(legacyDb, db);
SQLCipherMigrationHelper.migratePlaintext(context, legacyDb, db);
MasterSecret masterSecret = KeyCachingService.getMasterSecret(context);
if (masterSecret != null) SQLCipherMigrationHelper.migrateCiphertext(context, masterSecret, legacyDb, db);
if (masterSecret != null) SQLCipherMigrationHelper.migrateCiphertext(context, masterSecret, legacyDb, db, null);
else TextSecurePreferences.setNeedsSqlCipherMigration(context, true);
}
}