cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Set expiry to NULL where it was 0L, hopefully fixing migration issues"

Browse Source 
This reverts commit c8f730ced8.
This commit is contained in:
Vincent Breitmoser
2018-07-24 15:24:54 +02:00
parent 9baa65f6f4
commit 5785a713cb
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainDatabase.java
View File

@@ -51,7 +51,7 @@ import timber.log.Timber;
*/ */
public class KeychainDatabase { public class KeychainDatabase {
private static final String DATABASE_NAME = "openkeychain.db"; private static final String DATABASE_NAME = "openkeychain.db";
private static final int DATABASE_VERSION = 31; private static final int DATABASE_VERSION = 30;
private final SupportSQLiteOpenHelper supportSQLiteOpenHelper; private final SupportSQLiteOpenHelper supportSQLiteOpenHelper;
private static KeychainDatabase sInstance; private static KeychainDatabase sInstance;
@@ -363,16 +363,9 @@ public class KeychainDatabase {
case 29: case 29:
recreateUnifiedKeyView(db); recreateUnifiedKeyView(db);
case 30:
fixKeyExpiries(db);
} }
} }
private void fixKeyExpiries(SupportSQLiteDatabase db) {
db.execSQL("UPDATE keys SET expiry = NULL WHERE expiry = 0;");
}
private void recreateUnifiedKeyView(SupportSQLiteDatabase db) { private void recreateUnifiedKeyView(SupportSQLiteDatabase db) {
try { try {
db.beginTransaction(); db.beginTransaction();