From 5226947e0af5fe79fbf4966ac4b9b055276740c8 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 17 Feb 2021 11:08:57 +1100 Subject: [PATCH 1/6] Fix DB migration --- .../securesms/database/helpers/SQLCipherOpenHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java index 42bf560d80..3174665403 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java @@ -61,7 +61,7 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper { // Loki - onUpgrade(...) must be updated to use Loki version numbers if Signal makes any database changes - private static final int DATABASE_VERSION = lokiV19; + private static final int DATABASE_VERSION = lokiV19_REFACTOR2; private static final String DATABASE_NAME = "signal.db"; private final Context context; From f725d903a4d1c96c12216db41e55413168c947a6 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 17 Feb 2021 11:09:41 +1100 Subject: [PATCH 2/6] Update version number --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ec9415fb83..133b4c995d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -158,8 +158,8 @@ dependencies { testImplementation 'org.robolectric:shadows-multidex:4.2' } -def canonicalVersionCode = 136 -def canonicalVersionName = "1.7.0" +def canonicalVersionCode = 137 +def canonicalVersionName = "1.7.1" def postFixSize = 10 def abiPostFix = ['armeabi-v7a' : 1, From 7f4603a1baa960778ade47a826653b31076694d0 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 17 Feb 2021 11:30:37 +1100 Subject: [PATCH 3/6] Fix DB migration --- .../database/helpers/SQLCipherOpenHelper.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java index 3174665403..ecb17b8c10 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java @@ -56,12 +56,10 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper { private static final int lokiV18_CLEAR_BG_POLL_JOBS = 39; //TODO Merge all "refactor" migrations to one before pushing to the main repo. private static final int lokiV19 = 40; - private static final int lokiV19_REFACTOR1 = 41; - private static final int lokiV19_REFACTOR2 = 42; - + private static final int lokiV20 = 41; // Loki - onUpgrade(...) must be updated to use Loki version numbers if Signal makes any database changes - private static final int DATABASE_VERSION = lokiV19_REFACTOR2; + private static final int DATABASE_VERSION = lokiV20; private static final String DATABASE_NAME = "signal.db"; private final Context context; @@ -220,17 +218,12 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper { } // Many classes were removed. We need to update DB structure and data to match the code changes. - //TODO Merge "refactor" changes in one migration. if (oldVersion < lokiV19) { db.execSQL(LokiAPIDatabase.getCreateClosedGroupEncryptionKeyPairsTable()); db.execSQL(LokiAPIDatabase.getCreateClosedGroupPublicKeysTable()); ClosedGroupsMigration.INSTANCE.perform(db); - } - if (oldVersion < lokiV19_REFACTOR1) { db.execSQL("DROP TABLE identities"); deleteJobRecords(db, "RetrieveProfileJob"); - } - if (oldVersion < lokiV19_REFACTOR2) { deleteJobRecords(db, "RefreshAttributesJob", "RotateProfileKeyJob", @@ -239,6 +232,15 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper { ); } + if (oldVersion < lokiV20) { + deleteJobRecords(db, + "CleanPreKeysJob", + "RefreshPreKeysJob", + "CreateSignedPreKeysJob", + "RotateSignedPreKeyJob" + ); + } + db.setTransactionSuccessful(); } finally { db.endTransaction(); From d6379c4d58a26f71e95f23bd40011d9a78dd7f92 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 17 Feb 2021 11:31:20 +1100 Subject: [PATCH 4/6] Update build number --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 133b4c995d..cac2775ffe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -158,7 +158,7 @@ dependencies { testImplementation 'org.robolectric:shadows-multidex:4.2' } -def canonicalVersionCode = 137 +def canonicalVersionCode = 138 def canonicalVersionName = "1.7.1" def postFixSize = 10 From 362e24f98cc4730d2fb4bcf8259f5bc356f71423 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 17 Feb 2021 11:36:56 +1100 Subject: [PATCH 5/6] Fix DB migration --- .../database/helpers/SQLCipherOpenHelper.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java index ecb17b8c10..4549490782 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java @@ -236,8 +236,20 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper { deleteJobRecords(db, "CleanPreKeysJob", "RefreshPreKeysJob", - "CreateSignedPreKeysJob", - "RotateSignedPreKeyJob" + "CreateSignedPreKeyJob", + "RotateSignedPreKeyJob", + "MultiDeviceBlockedUpdateJob", + "MultiDeviceConfigurationUpdateJob", + "MultiDeviceContactUpdateJob", + "MultiDeviceGroupUpdateJob", + "MultiDeviceOpenGroupUpdateJob", + "MultiDeviceProfileKeyUpdateJob", + "MultiDeviceReadUpdateJob", + "MultiDeviceStickerPackOperationJob", + "MultiDeviceStickerPackSyncJob", + "MultiDeviceVerifiedUpdateJob", + "ServiceOutageDetectionJob", + "SessionRequestMessageSendJob" ); } From 32902d5bc8f864e7d8f08af3ca720408e5cf09f0 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 17 Feb 2021 11:39:36 +1100 Subject: [PATCH 6/6] Update build number --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index cac2775ffe..6727cdf697 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -158,7 +158,7 @@ dependencies { testImplementation 'org.robolectric:shadows-multidex:4.2' } -def canonicalVersionCode = 138 +def canonicalVersionCode = 139 def canonicalVersionName = "1.7.1" def postFixSize = 10