Bump version to 6.22.8

Previous bump only incremented the version code.

app/build.gradle

@@ -47,14 +47,14 @@ ktlint {
 }
 
 def canonicalVersionCode = 1272
-def canonicalVersionName = "6.22.5"
+def canonicalVersionName = "6.22.8"
 
 def postFixSize = 100
-def abiPostFix = ['universal'   : 0,
+def abiPostFix = ['universal'   : 15,
-                  'armeabi-v7a' : 1,
+                  'armeabi-v7a' : 16,
-                  'arm64-v8a'   : 2,
+                  'arm64-v8a'   : 17,
-                  'x86'         : 3,
+                  'x86'         : 18,
-                  'x86_64'      : 4]
+                  'x86_64'      : 19]
 
 def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]
 

app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt

@@ -1075,25 +1075,26 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       values.putNull(ORIGINAL_MESSAGE_ID)
     }
 
-    writableDatabase.beginTransaction()
+    val messageId: Long = writableDatabase.withinTransaction {
-    val messageId: Long
+      val id = writableDatabase.insert(TABLE_NAME, null, values)
-    try {
+
-      messageId = writableDatabase.insert(TABLE_NAME, null, values)
+      if (id < 0) {
-      if (messageId < 0) {
         Log.w(TAG, "Failed to insert text message (${message.sentTimestampMillis}, ${message.authorId}, ThreadId::$threadId)! Likely a duplicate.")
-        return Optional.empty()
+      } else {
+        if (unread && editedMessage == null) {
+          threads.incrementUnread(threadId, 1, 0)
+        }
+
+        if (message.subscriptionId != -1) {
+          recipients.setDefaultSubscriptionId(message.authorId, message.subscriptionId)
+        }
       }
 
-      if (unread && editedMessage == null) {
+      id
-        threads.incrementUnread(threadId, 1, 0)
+    }
-      }
 
-      if (message.subscriptionId != -1) {
+    if (messageId < 0) {
-        recipients.setDefaultSubscriptionId(message.authorId, message.subscriptionId)
+      return Optional.empty()
-      }
-      writableDatabase.setTransactionSuccessful()
-    } finally {
-      writableDatabase.endTransaction()
     }
 
     if (!silent) {

app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJobV2.kt

@@ -145,7 +145,11 @@ class PushProcessMessageJobV2 private constructor(
         }
         PushProcessMessageJobV2(builder.build(), result.envelope.toBuilder().clearContent().build(), result.content, result.metadata, result.serverDeliveredTimestamp)
       } else {
-        messageProcessor.process(result.envelope, result.content, result.metadata, result.serverDeliveredTimestamp)
+        try {
+          messageProcessor.process(result.envelope, result.content, result.metadata, result.serverDeliveredTimestamp)
+        } catch (e: Exception) {
+          Log.e(TAG, "Failed to process message with timestamp ${result.envelope.timestamp}. Dropping.")
+        }
         null
       }
     }

dependencies.gradle

@@ -112,7 +112,7 @@ dependencyResolutionManagement {
             alias('libsignal-android').to('org.signal', 'libsignal-android').versionRef('libsignal-client')
             alias('signal-aesgcmprovider').to('org.signal:aesgcmprovider:0.0.3')
             alias('signal-ringrtc').to('org.signal:ringrtc-android:2.27.0')
-            alias('signal-android-database-sqlcipher').to('org.signal:sqlcipher-android:4.5.4-S1')
+            alias('signal-android-database-sqlcipher').to('org.signal:sqlcipher-android:4.5.4-S2')
 
             // Third Party
             alias('greenrobot-eventbus').to('org.greenrobot:eventbus:3.0.0')

gradle/verification-metadata.xml

@@ -5896,19 +5896,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="5133a1cf4f3fbf43dc3ab0dd536602bb3d89bb9a1e71b0c86adc034becc11d1f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.signal" name="sqlcipher-android" version="4.5.3-FTS-S2">
+      <component group="org.signal" name="sqlcipher-android" version="4.5.4-S2">
-         <artifact name="sqlcipher-android-4.5.3-FTS-S2.aar">
+         <artifact name="sqlcipher-android-4.5.4-S2.aar">
-            <sha256 value="c7c90d6cb382dc7e599c0c5f515018b820c5a037d9a1655adc72adc04074fc5e" origin="Generated by Gradle"/>
+            <sha256 value="6f423eb00997e28dd116efa1c1511b78cce0e39e8753026cdc9820fb17140e99" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.signal" name="sqlcipher-android" version="4.5.3-FTS-S3">
-         <artifact name="sqlcipher-android-4.5.3-FTS-S3.aar">
-            <sha256 value="5551f0bfc413f0d56fca2e6fdddaaae0547b6d35a8c438bb2f66e8e0a1144f10" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.signal" name="sqlcipher-android" version="4.5.4-S1">
-         <artifact name="sqlcipher-android-4.5.4-S1.aar">
-            <sha256 value="99b60cc1df0606a3672ce9b87b8b1a43823f45ae027a6fd2167612f1ede080d5" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.slf4j" name="slf4j-api" version="1.6.4">