From f36aa09a81ff846cef34029122dd4d3271523305 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 24 Aug 2022 16:08:38 -0400
Subject: [PATCH] Revert "Ensure main database is updated before opening
 secondary ones."

This reverts commit e0e3f7dfecd9cf67985aa255f47fb2472a2fbea4.
---
 .../java/org/thoughtcrime/securesms/database/JobDatabase.java    | 1 -
 .../org/thoughtcrime/securesms/database/KeyValueDatabase.java    | 1 -
 .../org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt  | 1 -
 .../main/java/org/thoughtcrime/securesms/database/LogDatabase.kt | 1 -
 .../org/thoughtcrime/securesms/database/MegaphoneDatabase.java   | 1 -
 5 files changed, 5 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 60daa4fec..4a83284f9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
@@ -94,7 +94,6 @@ public class JobDatabase extends SQLiteOpenHelper implements SignalDatabaseOpenH
       synchronized (JobDatabase.class) {
         if (instance == null) {
           SqlCipherLibraryLoader.load();
-          SignalDatabase.triggerDatabaseAccess(); // Ensures that our main database is up-to-date before this one is accessed
           instance = new JobDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context));
           instance.setWriteAheadLoggingEnabled(true);
         }
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 bbb4b8241..d4184b0b5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java
@@ -54,7 +54,6 @@ public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabase
       synchronized (KeyValueDatabase.class) {
         if (instance == null) {
           SqlCipherLibraryLoader.load();
-          SignalDatabase.triggerDatabaseAccess(); // Ensures that our main database is up-to-date before this one is accessed
           instance = new KeyValueDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context));
           instance.setWriteAheadLoggingEnabled(true);
         }
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 4ded9e1b9..1c5de1e84 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt
@@ -82,7 +82,6 @@ class LocalMetricsDatabase private constructor(
         synchronized(LocalMetricsDatabase::class.java) {
           if (instance == null) {
             SqlCipherLibraryLoader.load()
-            SignalDatabase.triggerDatabaseAccess() // Ensures that our main database is up-to-date before this one is accessed
             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 f2c0e9664..35e311445 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt
@@ -86,7 +86,6 @@ class LogDatabase private constructor(
         synchronized(LogDatabase::class.java) {
           if (instance == null) {
             SqlCipherLibraryLoader.load()
-            SignalDatabase.triggerDatabaseAccess() // Ensures that our main database is up-to-date before this one is accessed
             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 75a2d031b..7dbe29faa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MegaphoneDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MegaphoneDatabase.java
@@ -57,7 +57,6 @@ public class MegaphoneDatabase extends SQLiteOpenHelper implements SignalDatabas
       synchronized (MegaphoneDatabase.class) {
         if (instance == null) {
           SqlCipherLibraryLoader.load();
-          SignalDatabase.triggerDatabaseAccess(); // Ensures that our main database is up-to-date before this one is accessed
           instance = new MegaphoneDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context));
           instance.setWriteAheadLoggingEnabled(true);
         }