Introduce SignalDatabase as the main database entrypoint.

app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java

@@ -28,7 +28,7 @@ import com.airbnb.lottie.model.KeyPath;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
@@ -360,8 +360,11 @@ public class ConversationItemFooter extends ConstraintLayout {
           long                   id                = messageRecord.getId();
           boolean                mms               = messageRecord.isMms();
 
-          if (mms) DatabaseFactory.getMmsDatabase(getContext()).markExpireStarted(id);
-          else DatabaseFactory.getSmsDatabase(getContext()).markExpireStarted(id);
+          if (mms) {
+            SignalDatabase.mms().markExpireStarted(id);
+          } else {
+            SignalDatabase.mms().markExpireStarted(id);
+          }
 
           expirationManager.scheduleDeletion(id, mms, messageRecord.getExpiresIn());
         });

app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java

@@ -10,8 +10,6 @@ import androidx.appcompat.app.AlertDialog;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;

app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java

@@ -9,7 +9,6 @@ import androidx.appcompat.app.AlertDialog;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt

@@ -5,7 +5,7 @@ import androidx.annotation.WorkerThread
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.CertificateType
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -59,7 +59,7 @@ class ChangeNumberRepository(private val context: Context) {
 
   @WorkerThread
   fun changeLocalNumber(e164: String): Single<Unit> {
-    DatabaseFactory.getRecipientDatabase(context).updateSelfPhone(e164)
+    SignalDatabase.recipients.updateSelfPhone(e164)
 
     SignalStore.account().setE164(e164)
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsRepository.kt

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components.settings.app.chats
 
 import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -19,7 +19,7 @@ class ChatsSettingsRepository {
     SignalExecutors.BOUNDED.execute {
       val isLinkPreviewsEnabled = SignalStore.settings().isLinkPreviewsEnabled
 
-      DatabaseFactory.getRecipientDatabase(context).markNeedsSync(Recipient.self().id)
+      SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
       StorageSyncHelper.scheduleSyncForDataChange()
       ApplicationDependencies.getJobManager().add(
         MultiDeviceConfigurationUpdateJob(

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsRepository.kt

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components.settings.app.data
 
 import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 
 class DataAndStorageSettingsRepository {
@@ -11,7 +11,7 @@ class DataAndStorageSettingsRepository {
 
   fun getTotalStorageUse(consumer: (Long) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val breakdown = DatabaseFactory.getMediaDatabase(context).storageBreakdown
+      val breakdown = SignalDatabase.media.storageBreakdown
 
       consumer(listOf(breakdown.audioSize, breakdown.documentSize, breakdown.photoSize, breakdown.videoSize).sum())
     }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt

@@ -15,8 +15,8 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.LocalMetricsDatabase
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
@@ -399,13 +399,13 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
   }
 
   private fun clearAllSenderKeyState() {
-    DatabaseFactory.getSenderKeyDatabase(requireContext()).deleteAll()
-    DatabaseFactory.getSenderKeySharedDatabase(requireContext()).deleteAll()
+    SignalDatabase.senderKeys.deleteAll()
+    SignalDatabase.senderKeyShared.deleteAll()
     Toast.makeText(context, "Deleted all sender key state.", Toast.LENGTH_SHORT).show()
   }
 
   private fun clearAllSenderKeySharedState() {
-    DatabaseFactory.getSenderKeySharedDatabase(requireContext()).deleteAll()
+    SignalDatabase.senderKeyShared.deleteAll()
     Toast.makeText(context, "Deleted all sender key shared state.", Toast.LENGTH_SHORT).show()
   }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsRepository.kt

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components.settings.app.privacy
 
 import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -16,7 +16,7 @@ class PrivacySettingsRepository {
 
   fun getBlockedCount(consumer: (Int) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val recipientDatabase = DatabaseFactory.getRecipientDatabase(context)
+      val recipientDatabase = SignalDatabase.recipients
 
       consumer(recipientDatabase.blocked.count)
     }
@@ -24,7 +24,7 @@ class PrivacySettingsRepository {
 
   fun syncReadReceiptState() {
     SignalExecutors.BOUNDED.execute {
-      DatabaseFactory.getRecipientDatabase(context).markNeedsSync(Recipient.self().id)
+      SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
       StorageSyncHelper.scheduleSyncForDataChange()
       ApplicationDependencies.getJobManager().add(
         MultiDeviceConfigurationUpdateJob(
@@ -40,7 +40,7 @@ class PrivacySettingsRepository {
   fun syncTypingIndicatorsState() {
     val enabled = TextSecurePreferences.isTypingIndicatorsEnabled(context)
 
-    DatabaseFactory.getRecipientDatabase(context).markNeedsSync(Recipient.self().id)
+    SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
     StorageSyncHelper.scheduleSyncForDataChange()
     ApplicationDependencies.getJobManager().add(
       MultiDeviceConfigurationUpdateJob(

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsRepository.kt

@@ -5,7 +5,7 @@ import com.google.android.gms.tasks.Tasks
 import com.google.firebase.installations.FirebaseInstallations
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -51,7 +51,7 @@ class AdvancedPrivacySettingsRepository(private val context: Context) {
 
   fun syncShowSealedSenderIconState() {
     SignalExecutors.BOUNDED.execute {
-      DatabaseFactory.getRecipientDatabase(context).markNeedsSync(Recipient.self().id)
+      SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
       StorageSyncHelper.scheduleSyncForDataChange()
       ApplicationDependencies.getJobManager().add(
         MultiDeviceConfigurationUpdateJob(

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsRepository.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import androidx.annotation.WorkerThread
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.groups.GroupChangeException
 import org.thoughtcrime.securesms.groups.GroupManager
@@ -36,7 +36,7 @@ class ExpireTimerSettingsRepository(val context: Context) {
           consumer.invoke(Result.failure(e))
         }
       } else {
-        DatabaseFactory.getRecipientDatabase(context).setExpireMessages(recipientId, newExpirationTime)
+        SignalDatabase.recipients.setExpireMessages(recipientId, newExpirationTime)
         val outgoingMessage = OutgoingExpirationUpdateMessage(Recipient.resolved(recipientId), System.currentTimeMillis(), newExpirationTime * 1000L)
         MessageSender.send(context, outgoingMessage, getThreadId(recipientId), false, null, null)
         consumer.invoke(Result.success(newExpirationTime))
@@ -46,7 +46,7 @@ class ExpireTimerSettingsRepository(val context: Context) {
 
   @WorkerThread
   private fun getThreadId(recipientId: RecipientId): Long {
-    val threadDatabase: ThreadDatabase = DatabaseFactory.getThreadDatabase(context)
+    val threadDatabase: ThreadDatabase = SignalDatabase.threads
     val recipient: Recipient = Recipient.resolved(recipientId)
     return threadDatabase.getOrCreateThreadIdFor(recipient)
   }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt

@@ -13,7 +13,7 @@ import org.signal.donations.GooglePayApi
 import org.signal.donations.GooglePayPaymentSource
 import org.signal.donations.StripeApi
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobmanager.JobTracker
 import org.thoughtcrime.securesms.jobs.BoostReceiptRequestResponseJob
@@ -65,7 +65,7 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
   }
 
   private fun scheduleSyncForAccountRecordChangeSync() {
-    DatabaseFactory.getRecipientDatabase(application).markNeedsSync(Recipient.self().id)
+    SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
     StorageSyncHelper.scheduleSyncForDataChange()
   }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsRepository.kt

@@ -9,9 +9,9 @@ import org.signal.core.util.logging.Log
 import org.signal.storageservice.protos.groups.local.DecryptedGroup
 import org.signal.storageservice.protos.groups.local.DecryptedPendingMember
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper
-import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.GroupDatabase
 import org.thoughtcrime.securesms.database.MediaDatabase
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.IdentityRecord
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.groups.GroupId
@@ -40,27 +40,27 @@ class ConversationSettingsRepository(
     return if (threadId <= 0) {
       Optional.absent()
     } else {
-      Optional.of(DatabaseFactory.getMediaDatabase(context).getGalleryMediaForThread(threadId, MediaDatabase.Sorting.Newest))
+      Optional.of(SignalDatabase.media.getGalleryMediaForThread(threadId, MediaDatabase.Sorting.Newest))
     }
   }
 
   fun getThreadId(recipientId: RecipientId, consumer: (Long) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      consumer(DatabaseFactory.getThreadDatabase(context).getThreadIdIfExistsFor(recipientId))
+      consumer(SignalDatabase.threads.getThreadIdIfExistsFor(recipientId))
     }
   }
 
   fun getThreadId(groupId: GroupId, consumer: (Long) -> Unit) {
     SignalExecutors.BOUNDED.execute {
       val recipientId = Recipient.externalGroupExact(context, groupId).id
-      consumer(DatabaseFactory.getThreadDatabase(context).getThreadIdIfExistsFor(recipientId))
+      consumer(SignalDatabase.threads.getThreadIdIfExistsFor(recipientId))
     }
   }
 
   fun isInternalRecipientDetailsEnabled(): Boolean = SignalStore.internalValues().recipientDetails()
 
   fun hasGroups(consumer: (Boolean) -> Unit) {
-    SignalExecutors.BOUNDED.execute { consumer(DatabaseFactory.getGroupDatabase(context).activeGroupCount > 0) }
+    SignalExecutors.BOUNDED.execute { consumer(SignalDatabase.groups.activeGroupCount > 0) }
   }
 
   fun getIdentity(recipientId: RecipientId, consumer: (IdentityRecord?) -> Unit) {
@@ -72,8 +72,8 @@ class ConversationSettingsRepository(
   fun getGroupsInCommon(recipientId: RecipientId, consumer: (List<Recipient>) -> Unit) {
     SignalExecutors.BOUNDED.execute {
       consumer(
-        DatabaseFactory
-          .getGroupDatabase(context)
+        SignalDatabase
+          .groups
           .getPushGroupsContainingMember(recipientId)
           .asSequence()
           .filter { it.members.contains(Recipient.self().id) }
@@ -87,7 +87,7 @@ class ConversationSettingsRepository(
 
   fun getGroupMembership(recipientId: RecipientId, consumer: (List<RecipientId>) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val groupDatabase = DatabaseFactory.getGroupDatabase(context)
+      val groupDatabase = SignalDatabase.groups
       val groupRecords = groupDatabase.getPushGroupsContainingMember(recipientId)
       val groupRecipients = ArrayList<RecipientId>(groupRecords.size)
       for (groupRecord in groupRecords) {
@@ -109,13 +109,13 @@ class ConversationSettingsRepository(
 
   fun setMuteUntil(recipientId: RecipientId, until: Long) {
     SignalExecutors.BOUNDED.execute {
-      DatabaseFactory.getRecipientDatabase(context).setMuted(recipientId, until)
+      SignalDatabase.recipients.setMuted(recipientId, until)
     }
   }
 
   fun getGroupCapacity(groupId: GroupId, consumer: (GroupCapacityResult) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val groupRecord: GroupDatabase.GroupRecord = DatabaseFactory.getGroupDatabase(context).getGroup(groupId).get()
+      val groupRecord: GroupDatabase.GroupRecord = SignalDatabase.groups.getGroup(groupId).get()
       consumer(
         if (groupRecord.isV2Group) {
           val decryptedGroup: DecryptedGroup = groupRecord.requireV2GroupProperties().decryptedGroup
@@ -138,7 +138,7 @@ class ConversationSettingsRepository(
 
   fun addMembers(groupId: GroupId, selected: List<RecipientId>, consumer: (GroupAddMembersResult) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val record: GroupDatabase.GroupRecord = DatabaseFactory.getGroupDatabase(context).getGroup(groupId).get()
+      val record: GroupDatabase.GroupRecord = SignalDatabase.groups.getGroup(groupId).get()
 
       if (record.isAnnouncementGroup) {
         val needsResolve = selected
@@ -171,7 +171,7 @@ class ConversationSettingsRepository(
   fun setMuteUntil(groupId: GroupId, until: Long) {
     SignalExecutors.BOUNDED.execute {
       val recipientId = Recipient.externalGroupExact(context, groupId).id
-      DatabaseFactory.getRecipientDatabase(context).setMuted(recipientId, until)
+      SignalDatabase.recipients.setMuted(recipientId, until)
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt

@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.components.settings.conversation
 
-import android.content.Context
 import android.graphics.Color
 import android.text.TextUtils
 import android.widget.Toast
@@ -15,8 +14,7 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -134,7 +132,7 @@ class InternalConversationSettingsFragment : DSLSettingsFragment(
             MaterialAlertDialogBuilder(requireContext())
               .setTitle("Are you sure?")
               .setNegativeButton(android.R.string.cancel) { d, _ -> d.dismiss() }
-              .setPositiveButton(android.R.string.ok) { _, _ -> DatabaseFactory.getRecipientDatabase(requireContext()).setProfileSharing(recipient.id, false) }
+              .setPositiveButton(android.R.string.ok) { _, _ -> SignalDatabase.recipients.setProfileSharing(recipient.id, false) }
               .show()
           }
         )
@@ -148,10 +146,10 @@ class InternalConversationSettingsFragment : DSLSettingsFragment(
               .setNegativeButton(android.R.string.cancel) { d, _ -> d.dismiss() }
               .setPositiveButton(android.R.string.ok) { _, _ ->
                 if (recipient.hasAci()) {
-                  DatabaseFactory.getSessionDatabase(context).deleteAllFor(recipient.requireAci().toString())
+                  SignalDatabase.sessions.deleteAllFor(recipient.requireAci().toString())
                 }
                 if (recipient.hasE164()) {
-                  DatabaseFactory.getSessionDatabase(context).deleteAllFor(recipient.requireE164())
+                  SignalDatabase.sessions.deleteAllFor(recipient.requireE164())
                 }
               }
               .show()
@@ -230,9 +228,8 @@ class InternalConversationSettingsFragment : DSLSettingsFragment(
       liveRecipient.observeForever(this)
 
       SignalExecutors.BOUNDED.execute {
-        val context: Context = ApplicationDependencies.getApplication()
-        val threadId: Long? = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(recipientId)
-        val groupId: GroupId? = DatabaseFactory.getGroupDatabase(context).getGroup(recipientId).transform { it.id }.orNull()
+        val threadId: Long? = SignalDatabase.threads.getThreadIdFor(recipientId)
+        val groupId: GroupId? = SignalDatabase.groups.getGroup(recipientId).transform { it.id }.orNull()
         store.update { state -> state.copy(threadId = threadId, groupId = groupId) }
       }
     }

app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/SoundsAndNotificationsSettingsRepository.kt

@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.components.settings.conversation.sounds
 
 import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
-import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.RecipientDatabase
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -12,13 +12,13 @@ class SoundsAndNotificationsSettingsRepository(private val context: Context) {
 
   fun setMuteUntil(recipientId: RecipientId, muteUntil: Long) {
     SignalExecutors.BOUNDED.execute {
-      DatabaseFactory.getRecipientDatabase(context).setMuted(recipientId, muteUntil)
+      SignalDatabase.recipients.setMuted(recipientId, muteUntil)
     }
   }
 
   fun setMentionSetting(recipientId: RecipientId, mentionSetting: RecipientDatabase.MentionSetting) {
     SignalExecutors.BOUNDED.execute {
-      DatabaseFactory.getRecipientDatabase(context).setMentionSetting(recipientId, mentionSetting)
+      SignalDatabase.recipients.setMentionSetting(recipientId, mentionSetting)
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsRepository.kt

@@ -4,8 +4,8 @@ import android.content.Context
 import android.net.Uri
 import androidx.annotation.WorkerThread
 import org.signal.core.util.concurrent.SignalExecutors
-import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.RecipientDatabase
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -20,7 +20,7 @@ class CustomNotificationsSettingsRepository(context: Context) {
   fun initialize(recipientId: RecipientId, onInitializationComplete: () -> Unit) {
     executor.execute {
       val recipient = Recipient.resolved(recipientId)
-      val database = DatabaseFactory.getRecipientDatabase(context)
+      val database = SignalDatabase.recipients
 
       if (NotificationChannels.supported() && recipient.notificationChannel != null) {
         database.setMessageRingtone(recipient.id, NotificationChannels.getMessageRingtone(context, recipient))
@@ -47,14 +47,14 @@ class CustomNotificationsSettingsRepository(context: Context) {
     executor.execute {
       val recipient: Recipient = Recipient.resolved(recipientId)
 
-      DatabaseFactory.getRecipientDatabase(context).setMessageVibrate(recipient.id, vibrateState)
+      SignalDatabase.recipients.setMessageVibrate(recipient.id, vibrateState)
       NotificationChannels.updateMessageVibrate(context, recipient, vibrateState)
     }
   }
 
   fun setCallingVibrate(recipientId: RecipientId, vibrateState: RecipientDatabase.VibrateState) {
     executor.execute {
-      DatabaseFactory.getRecipientDatabase(context).setCallVibrate(recipientId, vibrateState)
+      SignalDatabase.recipients.setCallVibrate(recipientId, vibrateState)
     }
   }
 
@@ -64,7 +64,7 @@ class CustomNotificationsSettingsRepository(context: Context) {
       val defaultValue = SignalStore.settings().messageNotificationSound
       val newValue: Uri? = if (defaultValue == sound) null else sound ?: Uri.EMPTY
 
-      DatabaseFactory.getRecipientDatabase(context).setMessageRingtone(recipient.id, newValue)
+      SignalDatabase.recipients.setMessageRingtone(recipient.id, newValue)
       NotificationChannels.updateMessageRingtone(context, recipient, newValue)
     }
   }
@@ -74,7 +74,7 @@ class CustomNotificationsSettingsRepository(context: Context) {
       val defaultValue = SignalStore.settings().callRingtone
       val newValue: Uri? = if (defaultValue == sound) null else sound ?: Uri.EMPTY
 
-      DatabaseFactory.getRecipientDatabase(context).setCallRingtone(recipientId, newValue)
+      SignalDatabase.recipients.setCallRingtone(recipientId, newValue)
     }
   }
 
@@ -82,13 +82,13 @@ class CustomNotificationsSettingsRepository(context: Context) {
   private fun createCustomNotificationChannel(recipientId: RecipientId) {
     val recipient: Recipient = Recipient.resolved(recipientId)
     val channelId = NotificationChannels.createChannelFor(context, recipient)
-    DatabaseFactory.getRecipientDatabase(context).setNotificationChannel(recipient.id, channelId)
+    SignalDatabase.recipients.setNotificationChannel(recipient.id, channelId)
   }
 
   @WorkerThread
   private fun deleteCustomNotificationChannel(recipientId: RecipientId) {
     val recipient: Recipient = Recipient.resolved(recipientId)
-    DatabaseFactory.getRecipientDatabase(context).setNotificationChannel(recipient.id, null)
+    SignalDatabase.recipients.setNotificationChannel(recipient.id, null)
     NotificationChannels.deleteChannelFor(context, recipient)
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaItemFactory.java

@@ -14,7 +14,7 @@ import com.google.android.exoplayer2.MediaMetadata;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -52,7 +52,7 @@ class VoiceNoteMediaItemFactory {
                                   @NonNull Uri draftUri)
   {
 
-    Recipient threadRecipient = DatabaseFactory.getThreadDatabase(context).getRecipientForThreadId(threadId);
+    Recipient threadRecipient = SignalDatabase.threads().getRecipientForThreadId(threadId);
     if (threadRecipient == null) {
       threadRecipient = Recipient.UNKNOWN;
     }
@@ -80,11 +80,11 @@ class VoiceNoteMediaItemFactory {
   @Nullable static MediaItem buildMediaItem(@NonNull Context context,
                                             @NonNull MessageRecord messageRecord)
   {
-    int startingPosition = DatabaseFactory.getMmsSmsDatabase(context)
+    int startingPosition = SignalDatabase.mmsSms()
                                           .getMessagePositionInConversation(messageRecord.getThreadId(),
                                                                             messageRecord.getDateReceived());
 
-    Recipient threadRecipient = Objects.requireNonNull(DatabaseFactory.getThreadDatabase(context)
+    Recipient threadRecipient = Objects.requireNonNull(SignalDatabase.threads()
                                                                       .getRecipientForThreadId(messageRecord.getThreadId()));
     Recipient  sender          = messageRecord.isOutgoing() ? Recipient.self() : messageRecord.getIndividualRecipient();
     Recipient  avatarRecipient = threadRecipient.isGroup() ? threadRecipient : sender;

app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackPreparer.java

@@ -23,8 +23,8 @@ import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
 import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.util.MessageRecordUtil;
 import org.thoughtcrime.securesms.util.Util;
@@ -240,8 +240,8 @@ final class VoiceNotePlaybackPreparer implements MediaSessionConnector.PlaybackP
 
   private @NonNull List<MediaItem> loadMediaItemsForSinglePlayback(long messageId) {
     try {
-      MessageRecord messageRecord = DatabaseFactory.getMmsDatabase(context)
-                                                   .getMessageRecord(messageId);
+      MessageRecord messageRecord = SignalDatabase.mms()
+                                                  .getMessageRecord(messageId);
 
       if (!MessageRecordUtil.hasAudio(messageRecord)) {
         Log.w(TAG, "Message does not contain audio.");
@@ -268,7 +268,7 @@ final class VoiceNotePlaybackPreparer implements MediaSessionConnector.PlaybackP
   @WorkerThread
   private @NonNull List<MediaItem> loadMediaItemsForConsecutivePlayback(long messageId) {
     try {
-      List<MessageRecord> recordsAfter = DatabaseFactory.getMmsSmsDatabase(context)
+      List<MessageRecord> recordsAfter = SignalDatabase.mmsSms()
                                                         .getMessagesAfterVoiceNoteInclusive(messageId, LIMIT);
 
       return buildFilteredMessageRecordList(recordsAfter).stream()

app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java

@@ -29,8 +29,8 @@ import com.google.android.exoplayer2.ui.PlayerNotificationManager;
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessageDatabase;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.MultiDeviceViewedUpdateJob;
@@ -241,7 +241,7 @@ public class VoiceNotePlaybackService extends MediaBrowserServiceCompat {
         }
         long            messageId       = extras.getLong(VoiceNoteMediaItemFactory.EXTRA_MESSAGE_ID);
         RecipientId     recipientId     = RecipientId.from(extras.getString(VoiceNoteMediaItemFactory.EXTRA_INDIVIDUAL_RECIPIENT_ID));
-        MessageDatabase messageDatabase = DatabaseFactory.getMmsDatabase(this);
+        MessageDatabase messageDatabase = SignalDatabase.mms();
 
         MessageDatabase.MarkedMessageInfo markedMessageInfo = messageDatabase.setIncomingMessageViewed(messageId);
 

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallRepository.java

@@ -7,8 +7,8 @@ import androidx.annotation.WorkerThread;
 import androidx.core.util.Consumer;
 
 import org.signal.core.util.concurrent.SignalExecutors;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.identity.IdentityRecordList;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -30,7 +30,7 @@ class WebRtcCallRepository {
       List<Recipient> recipients;
 
       if (recipient.isGroup()) {
-        recipients = DatabaseFactory.getGroupDatabase(context).getGroupMembers(recipient.requireGroupId(), GroupDatabase.MemberSet.FULL_MEMBERS_EXCLUDING_SELF);
+        recipients = SignalDatabase.groups().getGroupMembers(recipient.requireGroupId(), GroupDatabase.MemberSet.FULL_MEMBERS_EXCLUDING_SELF);
       } else {
         recipients = Collections.singletonList(recipient);
       }