aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-11-27 13:17:06 +0100
committerChristian Schneppe <christian@pix-art.de>2016-11-27 13:17:06 +0100
commit2f9d92fcb5b0adb922ff8896ffaa90e70ffe5672 (patch)
tree381ca6939fcbbfaca90e2588b6665f19d8f1e36f
parent6a7cd82b6bd128542ed87f9619b80be18dceacfd (diff)
fixed migrations from pre-btbv phase
add some logging to FullScreenView
-rw-r--r--src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java
index ed0f14cd9..1b3a9aaa4 100644
--- a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java
+++ b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java
@@ -55,7 +55,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
private static DatabaseBackend instance = null;
public static final String DATABASE_NAME = "history";
- public static final int DATABASE_VERSION = 32;
+ public static final int DATABASE_VERSION = 33;
private static String CREATE_CONTATCS_STATEMENT = "create table "
+ Contact.TABLENAME + "(" + Contact.ACCOUNT + " TEXT, "
@@ -362,12 +362,12 @@ public class DatabaseBackend extends SQLiteOpenHelper {
db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.TRUST + " TEXT");
db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.ACTIVE + " NUMBER");
HashMap<Integer, ContentValues> migration = new HashMap<>();
- migration.put(0, createFingerprintStatusContentValues(FingerprintStatus.Trust.UNDECIDED, true));
+ migration.put(0, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, true));
migration.put(1, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, true));
migration.put(2, createFingerprintStatusContentValues(FingerprintStatus.Trust.UNTRUSTED, true));
migration.put(3, createFingerprintStatusContentValues(FingerprintStatus.Trust.COMPROMISED, false));
migration.put(4, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, false));
- migration.put(5, createFingerprintStatusContentValues(FingerprintStatus.Trust.UNDECIDED, false));
+ migration.put(5, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, false));
migration.put(6, createFingerprintStatusContentValues(FingerprintStatus.Trust.UNTRUSTED, false));
migration.put(7, createFingerprintStatusContentValues(FingerprintStatus.Trust.VERIFIED_X509, true));
migration.put(8, createFingerprintStatusContentValues(FingerprintStatus.Trust.VERIFIED_X509, false));
@@ -383,6 +383,10 @@ public class DatabaseBackend extends SQLiteOpenHelper {
defaults.put(SQLiteAxolotlStore.LAST_ACTIVATION,System.currentTimeMillis());
db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME,defaults,null,null);
}
+ if (oldVersion < 33 && newVersion >= 33) {
+ String whereClause = SQLiteAxolotlStore.OWN+"=1";
+ db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME,createFingerprintStatusContentValues(FingerprintStatus.Trust.VERIFIED,true),whereClause,null);
+ }
}
private static ContentValues createFingerprintStatusContentValues(FingerprintStatus.Trust trust, boolean active) {