From 9eeecaa73d10a4a1f700eda65310fdfafc914bb6 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 15 Jun 2022 10:31:01 -0400 Subject: [PATCH] Initialize WAL mode earlier. --- .../java/org/thoughtcrime/securesms/database/JobDatabase.java | 2 +- .../org/thoughtcrime/securesms/database/KeyValueDatabase.java | 2 +- .../org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt | 2 +- .../java/org/thoughtcrime/securesms/database/LogDatabase.kt | 2 +- .../org/thoughtcrime/securesms/database/MegaphoneDatabase.java | 2 +- .../java/org/thoughtcrime/securesms/database/SignalDatabase.kt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 5be573d92e..4a83284f99 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java @@ -95,6 +95,7 @@ public class JobDatabase extends SQLiteOpenHelper implements SignalDatabaseOpenH if (instance == null) { SqlCipherLibraryLoader.load(); instance = new JobDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context)); + instance.setWriteAheadLoggingEnabled(true); } } } @@ -140,7 +141,6 @@ public class JobDatabase extends SQLiteOpenHelper implements SignalDatabaseOpenH public void onOpen(SQLiteDatabase db) { Log.i(TAG, "onOpen()"); - db.enableWriteAheadLogging(); db.setForeignKeyConstraintsEnabled(true); SignalExecutors.BOUNDED.execute(() -> { 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 75d5d6d229..d4184b0b5f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java @@ -55,6 +55,7 @@ public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabase if (instance == null) { SqlCipherLibraryLoader.load(); instance = new KeyValueDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context)); + instance.setWriteAheadLoggingEnabled(true); } } } @@ -93,7 +94,6 @@ public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabase public void onOpen(SQLiteDatabase db) { Log.i(TAG, "onOpen()"); - db.enableWriteAheadLogging(); db.setForeignKeyConstraintsEnabled(true); SignalExecutors.BOUNDED.execute(() -> { 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 5025910971..1c5de1e846 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt @@ -83,6 +83,7 @@ class LocalMetricsDatabase private constructor( if (instance == null) { SqlCipherLibraryLoader.load() instance = LocalMetricsDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context)) + instance!!.setWriteAheadLoggingEnabled(true) } } } @@ -114,7 +115,6 @@ class LocalMetricsDatabase private constructor( } override fun onOpen(db: SQLiteDatabase) { - db.enableWriteAheadLogging() db.setForeignKeyConstraintsEnabled(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 d6217fe057..374a9c44e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt @@ -87,6 +87,7 @@ class LogDatabase private constructor( if (instance == null) { SqlCipherLibraryLoader.load() instance = LogDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context)) + instance!!.setWriteAheadLoggingEnabled(true) } } } @@ -112,7 +113,6 @@ class LogDatabase private constructor( } override fun onOpen(db: SQLiteDatabase) { - db.enableWriteAheadLogging() db.setForeignKeyConstraintsEnabled(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 5e34856059..7dbe29faaa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MegaphoneDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MegaphoneDatabase.java @@ -58,6 +58,7 @@ public class MegaphoneDatabase extends SQLiteOpenHelper implements SignalDatabas if (instance == null) { SqlCipherLibraryLoader.load(); instance = new MegaphoneDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context)); + instance.setWriteAheadLoggingEnabled(true); } } } @@ -91,7 +92,6 @@ public class MegaphoneDatabase extends SQLiteOpenHelper implements SignalDatabas public void onOpen(SQLiteDatabase db) { Log.i(TAG, "onOpen()"); - db.enableWriteAheadLogging(); db.setForeignKeyConstraintsEnabled(true); SignalExecutors.BOUNDED.execute(() -> { 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 102541a45f..1110f1765a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt @@ -75,7 +75,6 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data val remoteMegaphoneDatabase: RemoteMegaphoneDatabase = RemoteMegaphoneDatabase(context, this) override fun onOpen(db: net.zetetic.database.sqlcipher.SQLiteDatabase) { - db.enableWriteAheadLogging() db.setForeignKeyConstraintsEnabled(true) } @@ -213,6 +212,7 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data synchronized(SignalDatabase::class.java) { if (instance == null) { instance = SignalDatabase(application, databaseSecret, attachmentSecret) + instance!!.setWriteAheadLoggingEnabled(true) } } }