diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
index 4a83284f9..8930c066c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
@@ -95,7 +95,6 @@ public class JobDatabase extends SQLiteOpenHelper implements SignalDatabaseOpenH
if (instance == null) {
SqlCipherLibraryLoader.load();
instance = new JobDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context));
- instance.setWriteAheadLoggingEnabled(true);
}
}
}
@@ -103,7 +102,7 @@ public class JobDatabase extends SQLiteOpenHelper implements SignalDatabaseOpenH
}
public JobDatabase(@NonNull Application application, @NonNull DatabaseSecret databaseSecret) {
- super(application, DATABASE_NAME, databaseSecret.asString(), null, DATABASE_VERSION, 0, new SqlCipherErrorHandler(DATABASE_NAME), new SqlCipherDatabaseHook());
+ super(application, DATABASE_NAME, databaseSecret.asString(), null, DATABASE_VERSION, 0, new SqlCipherErrorHandler(DATABASE_NAME), new SqlCipherDatabaseHook(), true);
this.application = application;
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java
index d4184b0b5..238f540cc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java
@@ -55,7 +55,6 @@ public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabase
if (instance == null) {
SqlCipherLibraryLoader.load();
instance = new KeyValueDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context));
- instance.setWriteAheadLoggingEnabled(true);
}
}
}
@@ -68,7 +67,7 @@ public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabase
private KeyValueDatabase(@NonNull Application application, @NonNull DatabaseSecret databaseSecret) {
- super(application, DATABASE_NAME, databaseSecret.asString(), null, DATABASE_VERSION, 0,new SqlCipherErrorHandler(DATABASE_NAME), new SqlCipherDatabaseHook());
+ super(application, DATABASE_NAME, databaseSecret.asString(), null, DATABASE_VERSION, 0,new SqlCipherErrorHandler(DATABASE_NAME), new SqlCipherDatabaseHook(), true);
this.application = application;
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt
index d3c0214eb..fbbb620d4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt
@@ -35,7 +35,8 @@ class LocalMetricsDatabase private constructor(
DATABASE_VERSION,
0,
SqlCipherDeletingErrorHandler(DATABASE_NAME),
- SqlCipherDatabaseHook()
+ SqlCipherDatabaseHook(),
+ true
),
SignalDatabaseOpenHelper {
@@ -83,7 +84,6 @@ class LocalMetricsDatabase private constructor(
if (instance == null) {
SqlCipherLibraryLoader.load()
instance = LocalMetricsDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context))
- instance!!.setWriteAheadLoggingEnabled(true)
}
}
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt
index 35e311445..48e9d6306 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt
@@ -40,7 +40,8 @@ class LogDatabase private constructor(
DATABASE_VERSION,
0,
SqlCipherDeletingErrorHandler(DATABASE_NAME),
- SqlCipherDatabaseHook()
+ SqlCipherDatabaseHook(),
+ true
),
SignalDatabaseOpenHelper {
@@ -87,7 +88,6 @@ class LogDatabase private constructor(
if (instance == null) {
SqlCipherLibraryLoader.load()
instance = LogDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context))
- instance!!.setWriteAheadLoggingEnabled(true)
}
}
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MegaphoneDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MegaphoneDatabase.java
index 7dbe29faa..8965df544 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MegaphoneDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MegaphoneDatabase.java
@@ -58,7 +58,6 @@ public class MegaphoneDatabase extends SQLiteOpenHelper implements SignalDatabas
if (instance == null) {
SqlCipherLibraryLoader.load();
instance = new MegaphoneDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context));
- instance.setWriteAheadLoggingEnabled(true);
}
}
}
@@ -66,7 +65,7 @@ public class MegaphoneDatabase extends SQLiteOpenHelper implements SignalDatabas
}
public MegaphoneDatabase(@NonNull Application application, @NonNull DatabaseSecret databaseSecret) {
- super(application, DATABASE_NAME, databaseSecret.asString(), null, DATABASE_VERSION, 0, new SqlCipherErrorHandler(DATABASE_NAME), new SqlCipherDatabaseHook());
+ super(application, DATABASE_NAME, databaseSecret.asString(), null, DATABASE_VERSION, 0, new SqlCipherErrorHandler(DATABASE_NAME), new SqlCipherDatabaseHook(), true);
this.application = application;
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt
index 93b964389..fad296fd7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt
@@ -34,7 +34,8 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
SignalDatabaseMigrations.DATABASE_VERSION,
0,
SqlCipherErrorHandler(DATABASE_NAME),
- SqlCipherDatabaseHook()
+ SqlCipherDatabaseHook(),
+ true
),
SignalDatabaseOpenHelper {
@@ -227,7 +228,6 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
synchronized(SignalDatabase::class.java) {
if (instance == null) {
instance = SignalDatabase(application, databaseSecret, attachmentSecret)
- instance!!.setWriteAheadLoggingEnabled(true)
}
}
}
diff --git a/dependencies.gradle b/dependencies.gradle
index 9b2ac3b09..ccdbd5d57 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -98,7 +98,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.24.0')
- alias('signal-android-database-sqlcipher').to('org.signal:android-database-sqlcipher:4.5.1-S1')
+ alias('signal-android-database-sqlcipher').to('org.signal:sqlcipher-android:4.5.3-FTS-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 b4671313c..34189cc88 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -5038,6 +5038,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+