From 15a7cd4bbe80299471c2076da0c1209334c27778 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Tue, 1 Aug 2017 12:15:45 +0200
Subject: fixed bug in db migrations when going from <15 to something recent

---
 .../de/pixart/messenger/persistance/DatabaseBackend.java     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java')

diff --git a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java
index c2688890f..3d9df91bb 100644
--- a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java
+++ b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java
@@ -274,8 +274,6 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             recreateAxolotlDb(db);
             db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
                     + Message.FINGERPRINT + " TEXT");
-        } else if (oldVersion < 22 && newVersion >= 22) {
-            db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.CERTIFICATE);
         }
         if (oldVersion < 16 && newVersion >= 16) {
             db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
@@ -335,6 +333,10 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             }
         }
 
+        if (oldVersion >= 15 && oldVersion < 22 && newVersion >= 22) {
+            db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.CERTIFICATE);
+        }
+
         if (oldVersion < 23 && newVersion >= 23) {
             db.execSQL(CREATE_DISCOVERY_RESULTS_STATEMENT);
         }
@@ -366,7 +368,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         if (oldVersion < 30 && newVersion >= 30) {
             db.execSQL(CREATE_START_TIMES_TABLE);
         }
-        if (oldVersion < 31 && newVersion >= 31) {
+        if (oldVersion >= 15 && oldVersion < 31 && newVersion >= 31) {
             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<>();
@@ -385,13 +387,13 @@ public class DatabaseBackend extends SQLiteOpenHelper {
                 db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, entry.getValue(), whereClause, where);
             }
         }
-        if (oldVersion < 32 && newVersion >= 32) {
+        if (oldVersion >= 15 && oldVersion < 32 && newVersion >= 32) {
             db.execSQL("ALTER TABLE "+ SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN "+SQLiteAxolotlStore.LAST_ACTIVATION + " NUMBER");
             ContentValues defaults = new ContentValues();
             defaults.put(SQLiteAxolotlStore.LAST_ACTIVATION,System.currentTimeMillis());
             db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME,defaults,null,null);
         }
-        if (oldVersion < 33 && newVersion >= 33) {
+        if (oldVersion >= 15 && oldVersion < 33 && newVersion >= 33) {
             String whereClause = SQLiteAxolotlStore.OWN+"=1";
             db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME,createFingerprintStatusContentValues(FingerprintStatus.Trust.VERIFIED,true),whereClause,null);
         }
-- 
cgit v1.2.3