Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-07-13 17:23:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update SQLCipher to 4.5.3-FTS-S3

Browse Source
This commit is contained in:
Greyson Parrelli
2023-03-15 16:19:01 -04:00
parent 8ca596580c
commit 7d7e6e5013
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherDeletingErrorHandler.java
+2 -2
View File
@@ -27,8 +27,8 @@ public final class SqlCipherDeletingErrorHandler implements DatabaseErrorHandler
}
@Override
public void onCorruption(SQLiteDatabase db) {
Log.e(TAG, "Database '" + databaseName + "' corrupted! Going to try to run some diagnostics.");
public void onCorruption(SQLiteDatabase db, String message) {
Log.e(TAG, "Database '" + databaseName + "' corrupted! Message: " + message + ". Going to try to run some diagnostics.");
Log.w(TAG, " ===== PRAGMA integrity_check =====");
try (Cursor cursor = db.rawQuery("PRAGMA integrity_check", null)) {
app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherErrorHandler.kt
+5 -6
View File
@@ -18,15 +18,14 @@ import java.util.concurrent.atomic.AtomicReference
*/
class SqlCipherErrorHandler(private val databaseName: String) : DatabaseErrorHandler {
override fun onCorruption(db: SQLiteDatabase) {
val output = StringBuilder()
output.append("Database '$databaseName' corrupted! Going to try to run some diagnostics.\n")
override fun onCorruption(db: SQLiteDatabase, message: String) {
val result: DiagnosticResults = runDiagnostics(ApplicationDependencies.getApplication(), db)
var lines: List<String> = result.logs.split("\n")
lines = listOf("Database '$databaseName' corrupted!. Diagnostics results:\n") + lines
lines = listOf("Database '$databaseName' corrupted!", "[sqlite] $message", "Diagnostics results:") + lines
Log.e(TAG, "Database '$databaseName' corrupted!. Diagnostics results:\n ${result.logs}")
Log.e(TAG, "Database '$databaseName' corrupted!")
Log.e(TAG, "[sqlite] $message")
Log.e(TAG, "Diagnostic results:\n ${result.logs}")
if (result is DiagnosticResults.Success) {
if (result.pragma1Passes && result.pragma2Passes) {
dependencies.gradle
+1 -1
View File
@@ -106,7 +106,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.25.1')
alias('signal-android-database-sqlcipher').to('org.signal:sqlcipher-android:4.5.3-FTS-S2')
alias('signal-android-database-sqlcipher').to('org.signal:sqlcipher-android:4.5.3-FTS-S3')
// Third Party
alias('greenrobot-eventbus').to('org.greenrobot:eventbus:3.0.0')
gradle/verification-metadata.xml
+5
View File
@@ -4790,6 +4790,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="c7c90d6cb382dc7e599c0c5f515018b820c5a037d9a1655adc72adc04074fc5e" 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.slf4j" name="slf4j-api" version="1.6.4">
<artifact name="slf4j-api-1.6.4.jar">
<sha256 value="367b909030f714ee1176ab096b681e06348f03385e98d1bce0ed801b5452357e" origin="Generated by Gradle"/>