diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java index 91e7593540..61f480bbb1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogTables.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogTables.kt index 10967643e2..871655ccfb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogTables.kt +++ b/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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt index 7a853b7f25..d470f02fca 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt +++ b/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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SQLiteDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SQLiteDatabase.java index 25088b402f..40e1215d63 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SQLiteDatabase.java +++ b/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; diff --git a/dependencies.gradle b/dependencies.gradle index 5441572b60..afc34864c8 100644 --- a/dependencies.gradle +++ b/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') diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 6a484ee025..ea732a3dda 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -5393,6 +5393,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + +