Update SQLCipher to 4.5.4-S1

app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java

@@ -11,7 +11,6 @@ import android.util.Pair;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
-import net.zetetic.database.sqlcipher.SQLiteConstraintException;
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
 import org.greenrobot.eventbus.EventBus;

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

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.database
 
 import android.content.ContentValues
 import android.content.Context
-import net.zetetic.database.sqlcipher.SQLiteConstraintException
+import android.database.sqlite.SQLiteConstraintException
 import org.signal.core.util.CursorUtil
 import org.signal.core.util.SqlUtil
 import org.signal.core.util.logging.Log

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

@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.database
 import android.content.ContentValues
 import android.content.Context
 import android.database.Cursor
+import android.database.sqlite.SQLiteConstraintException
 import android.net.Uri
 import android.text.TextUtils
 import androidx.annotation.VisibleForTesting
@@ -10,7 +11,6 @@ import androidx.core.content.contentValuesOf
 import app.cash.exhaustive.Exhaustive
 import com.google.protobuf.ByteString
 import com.google.protobuf.InvalidProtocolBufferException
-import net.zetetic.database.sqlcipher.SQLiteConstraintException
 import org.signal.core.util.Bitmask
 import org.signal.core.util.CursorUtil
 import org.signal.core.util.SqlUtil

app/src/main/java/org/thoughtcrime/securesms/database/SQLiteDatabase.java

@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.database;
 
 import android.content.ContentValues;
 import android.database.Cursor;
+import android.database.SQLException;
 import android.os.CancellationSignal;
 import android.util.Pair;
 
@@ -10,7 +11,6 @@ import androidx.annotation.NonNull;
 import androidx.sqlite.db.SupportSQLiteDatabase;
 import androidx.sqlite.db.SupportSQLiteQuery;
 
-import net.zetetic.database.SQLException;
 import net.zetetic.database.sqlcipher.SQLiteStatement;
 import net.zetetic.database.sqlcipher.SQLiteTransactionListener;
 

dependencies.gradle

@@ -108,7 +108,7 @@ dependencyResolutionManagement {
             alias('signal-aesgcmprovider').to('org.signal:aesgcmprovider:0.0.3')
             alias('signal-argon2').to('org.signal:argon2:13.1')
             alias('signal-ringrtc').to('org.signal:ringrtc-android:2.26.3')
-            alias('signal-android-database-sqlcipher').to('org.signal:sqlcipher-android:4.5.3-FTS-S3')
+            alias('signal-android-database-sqlcipher').to('org.signal:sqlcipher-android:4.5.4-S1')
 
             // Third Party
             alias('greenrobot-eventbus').to('org.greenrobot:eventbus:3.0.0')

gradle/verification-metadata.xml

@@ -5393,6 +5393,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <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">
          <artifact name="slf4j-api-1.6.4.jar">
             <sha256 value="367b909030f714ee1176ab096b681e06348f03385e98d1bce0ed801b5452357e" origin="Generated by Gradle"/>