diff options
| author | Christian Schneppe <christian@pix-art.de> | 2019-01-26 21:38:54 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2019-01-26 21:38:54 +0100 |
| commit | 537056f3a4ab38b0b0779d7a71ed2ebbb08f0bdb (patch) | |
| tree | 2705881fd0f8e049ea411bbd407deb40a83c54ff /src/main/java/de/pixart/messenger/persistance | |
| parent | 8f6aa480b5c9cd9c6f1b8243da6ee234394af82c (diff) | |
make new backup and restore possible with old databases
Diffstat (limited to 'src/main/java/de/pixart/messenger/persistance')
| -rw-r--r-- | src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java index d3220a875..941ee6a47 100644 --- a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java +++ b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java @@ -60,7 +60,7 @@ import rocks.xmpp.addr.Jid; public class DatabaseBackend extends SQLiteOpenHelper { public static final String DATABASE_NAME = "history"; - public static final int DATABASE_VERSION = 45; // = Conversations DATABASE_VERSION + 1 + public static final int DATABASE_VERSION = 46; // = Conversations DATABASE_VERSION + 2 private static DatabaseBackend instance = null; private static String CREATE_CONTATCS_STATEMENT = "create table " @@ -136,6 +136,7 @@ public class DatabaseBackend extends SQLiteOpenHelper { + SQLiteAxolotlStore.OWN + " INTEGER, " + SQLiteAxolotlStore.FINGERPRINT + " TEXT, " + SQLiteAxolotlStore.CERTIFICATE + " BLOB, " + + SQLiteAxolotlStore.TRUSTED + " TEXT, " + SQLiteAxolotlStore.TRUST + " TEXT, " + SQLiteAxolotlStore.ACTIVE + " NUMBER, " + SQLiteAxolotlStore.LAST_ACTIVATION + " NUMBER," @@ -552,6 +553,10 @@ public class DatabaseBackend extends SQLiteOpenHelper { db.execSQL(CREATE_MESSAGE_RELATIVE_FILE_PATH_INDEX); db.execSQL(CREATE_MESSAGE_TYPE_INDEX); } + + if (oldVersion < 46 && newVersion >= 46) { + db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.TRUSTED); // TODO - just to make old databases importable, column isn't needed at all + } } private void canonicalizeJids(SQLiteDatabase db) { |