narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

don’t use secure delete when migrating edit column

Browse source
This commit is contained in:
Daniel Gultsch 2019-12-08 11:33:09 +01:00
parent 1dad17ada4
commit 8d245fc754
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
View file

@ -195,7 +195,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
@Override @Override
public void onConfigure(SQLiteDatabase db) { public void onConfigure(SQLiteDatabase db) {
db.execSQL("PRAGMA foreign_keys=ON"); db.execSQL("PRAGMA foreign_keys=ON");
db.rawQuery("PRAGMA secure_delete=ON", null); db.rawQuery("PRAGMA secure_delete=ON", null).close();
} }
@Override @Override
@ -548,7 +548,12 @@ public class DatabaseBackend extends SQLiteOpenHelper {
} }
if (oldVersion < 46 && newVersion >= 46) { if (oldVersion < 46 && newVersion >= 46) {
final long start = SystemClock.elapsedRealtime();
db.rawQuery("PRAGMA secure_delete = FALSE", null).close();
db.execSQL("update "+Message.TABLENAME+" set "+Message.EDITED+"=NULL"); db.execSQL("update "+Message.TABLENAME+" set "+Message.EDITED+"=NULL");
db.rawQuery("PRAGMA secure_delete=ON", null).close();
final long diff = SystemClock.elapsedRealtime() - start;
Log.d(Config.LOGTAG,"deleted old edit information in "+diff+"ms");
} }
} }
@ -584,14 +589,14 @@ public class DatabaseBackend extends SQLiteOpenHelper {
String newJid; String newJid;
try { try {
newJid = Jid.of(cursor.getString(cursor.getColumnIndex(Contact.JID))).toString(); newJid = Jid.of(cursor.getString(cursor.getColumnIndex(Contact.JID))).toString();
} catch (IllegalArgumentException ignored) { } catch (final IllegalArgumentException e) {
Log.e(Config.LOGTAG, "Failed to migrate Contact JID " Log.e(Config.LOGTAG, "Failed to migrate Contact JID "
+ cursor.getString(cursor.getColumnIndex(Contact.JID)) + cursor.getString(cursor.getColumnIndex(Contact.JID))
+ ": " + ignored + ". Skipping..."); + ": Skipping...", e);
continue; continue;
} }
String updateArgs[] = { final String[] updateArgs = {
newJid, newJid,
cursor.getString(cursor.getColumnIndex(Contact.ACCOUNT)), cursor.getString(cursor.getColumnIndex(Contact.ACCOUNT)),
cursor.getString(cursor.getColumnIndex(Contact.JID)), cursor.getString(cursor.getColumnIndex(Contact.JID)),