Merge pull request #809 from session-foundation/release/1.20.7

Release 1.20.7

Author: SessionHero01

app/build.gradle

@@ -13,8 +13,8 @@ configurations.forEach {
     it.exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 388
-def canonicalVersionName = "1.20.6"
+def canonicalVersionCode = 389
+def canonicalVersionName = "1.20.7"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
@@ -327,7 +327,7 @@ dependencies {
     implementation 'com.annimon:stream:1.1.8'
     implementation 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
     implementation 'androidx.sqlite:sqlite-ktx:2.3.1'
-    implementation 'net.zetetic:sqlcipher-android:4.5.4@aar'
+    implementation 'net.zetetic:sqlcipher-android:4.6.1@aar'
     implementation project(":libsignal")
     implementation project(":libsession")
     implementation project(":libsession-util")

app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java

@@ -668,7 +668,7 @@ private void executeStatements(SQLiteDatabase db, String[] statements) {
   }
 
   private static boolean columnExists(@NonNull SQLiteDatabase db, @NonNull String table, @NonNull String column) {
-    try (Cursor cursor = db.rawQuery("PRAGMA table_info(" + table + ")", null)) {
+    try (Cursor cursor = db.rawQuery("PRAGMA table_xinfo(" + table + ")", null)) {
       int nameColumnIndex = cursor.getColumnIndexOrThrow("name");
 
       while (cursor.moveToNext()) {