Introduce SignalDatabase as the main database entrypoint.

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest.kt

@@ -1,8 +1,6 @@
 package org.thoughtcrime.securesms.database
 
-import android.app.Application
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotEquals
@@ -24,7 +22,7 @@ class RecipientDatabaseTest {
 
   @Before
   fun setup() {
-    recipientDatabase = DatabaseFactory.getRecipientDatabase(context)
+    recipientDatabase = SignalDatabase.recipients
     ensureDbEmpty()
   }
 
@@ -347,11 +345,8 @@ class RecipientDatabaseTest {
     recipientDatabase.getAndPossiblyMerge(null, null, true)
   }
 
-  private val context: Application
-    get() = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as Application
-
   private fun ensureDbEmpty() {
-    DatabaseFactory.getInstance(context).rawDatabase.rawQuery("SELECT COUNT(*) FROM ${RecipientDatabase.TABLE_NAME}", null).use { cursor ->
+    SignalDatabase.rawDatabase.rawQuery("SELECT COUNT(*) FROM ${RecipientDatabase.TABLE_NAME}", null).use { cursor ->
       assertTrue(cursor.moveToFirst())
       assertEquals(0, cursor.getLong(0))
     }

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_merges.kt

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.database
 import android.app.Application
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import net.zetetic.database.sqlcipher.SQLiteDatabase
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertNotNull
@@ -49,16 +48,16 @@ class RecipientDatabaseTest_merges {
 
   @Before
   fun setup() {
-    recipientDatabase = DatabaseFactory.getRecipientDatabase(context)
-    identityDatabase = DatabaseFactory.getIdentityDatabase(context)
-    groupReceiptDatabase = DatabaseFactory.getGroupReceiptDatabase(context)
-    groupDatabase = DatabaseFactory.getGroupDatabase(context)
-    threadDatabase = DatabaseFactory.getThreadDatabase(context)
-    smsDatabase = DatabaseFactory.getSmsDatabase(context)
-    mmsDatabase = DatabaseFactory.getMmsDatabase(context)
-    sessionDatabase = DatabaseFactory.getSessionDatabase(context)
-    mentionDatabase = DatabaseFactory.getMentionDatabase(context)
-    reactionDatabase = DatabaseFactory.getReactionDatabase(context)
+    recipientDatabase = SignalDatabase.recipients
+    identityDatabase = SignalDatabase.identities
+    groupReceiptDatabase = SignalDatabase.groupReceipts
+    groupDatabase = SignalDatabase.groups
+    threadDatabase = SignalDatabase.threads
+    smsDatabase = SignalDatabase.sms
+    mmsDatabase = SignalDatabase.mms
+    sessionDatabase = SignalDatabase.sessions
+    mentionDatabase = SignalDatabase.mentions
+    reactionDatabase = SignalDatabase.reactions
 
     ensureDbEmpty()
   }
@@ -178,7 +177,7 @@ class RecipientDatabaseTest_merges {
     get() = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as Application
 
   private fun ensureDbEmpty() {
-    DatabaseFactory.getInstance(context).rawDatabase.rawQuery("SELECT COUNT(*) FROM ${RecipientDatabase.TABLE_NAME}", null).use { cursor ->
+    SignalDatabase.rawDatabase.rawQuery("SELECT COUNT(*) FROM ${RecipientDatabase.TABLE_NAME}", null).use { cursor ->
       assertTrue(cursor.moveToFirst())
       assertEquals(0, cursor.getLong(0))
     }
@@ -212,8 +211,7 @@ class RecipientDatabaseTest_merges {
   }
 
   private fun getMention(messageId: Long): MentionModel {
-    val db: SQLiteDatabase = DatabaseFactory.getInstance(context).rawDatabase
-    db.rawQuery("SELECT * FROM ${MentionDatabase.TABLE_NAME}").use { cursor ->
+    SignalDatabase.rawDatabase.rawQuery("SELECT * FROM ${MentionDatabase.TABLE_NAME} WHERE ${MentionDatabase.MESSAGE_ID} = $messageId").use { cursor ->
       cursor.moveToFirst()
       return MentionModel(
         recipientId = RecipientId.from(CursorUtil.requireLong(cursor, MentionDatabase.RECIPIENT_ID)),

app/src/flipper/java/org/thoughtcrime/securesms/database/FlipperSqlCipherAdapter.java

@@ -16,7 +16,6 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase;
 import net.zetetic.database.sqlcipher.SQLiteStatement;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.util.Hex;
 
 import java.lang.reflect.Field;
@@ -43,14 +42,11 @@ public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdap
   @Override
   public List<Descriptor> getDatabases() {
     try {
-      Field databaseHelperField = DatabaseFactory.class.getDeclaredField("databaseHelper");
-      databaseHelperField.setAccessible(true);
-
-      SignalDatabase mainOpenHelper       = Objects.requireNonNull((SQLCipherOpenHelper) databaseHelperField.get(DatabaseFactory.getInstance(getContext())));
-      SignalDatabase keyValueOpenHelper   = KeyValueDatabase.getInstance((Application) getContext());
-      SignalDatabase megaphoneOpenHelper  = MegaphoneDatabase.getInstance((Application) getContext());
-      SignalDatabase jobManagerOpenHelper = JobDatabase.getInstance((Application) getContext());
-      SignalDatabase metricsOpenHelper    = LocalMetricsDatabase.getInstance((Application) getContext());
+      SignalDatabaseOpenHelper mainOpenHelper       = Objects.requireNonNull(SignalDatabase.getInstance());
+      SignalDatabaseOpenHelper keyValueOpenHelper   = KeyValueDatabase.getInstance((Application) getContext());
+      SignalDatabaseOpenHelper megaphoneOpenHelper  = MegaphoneDatabase.getInstance((Application) getContext());
+      SignalDatabaseOpenHelper jobManagerOpenHelper = JobDatabase.getInstance((Application) getContext());
+      SignalDatabaseOpenHelper metricsOpenHelper    = LocalMetricsDatabase.getInstance((Application) getContext());
 
       return Arrays.asList(new Descriptor(mainOpenHelper),
                            new Descriptor(keyValueOpenHelper),
@@ -253,9 +249,9 @@ public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdap
   }
 
   static class Descriptor implements DatabaseDescriptor {
-    private final SignalDatabase sqlCipherOpenHelper;
+    private final SignalDatabaseOpenHelper sqlCipherOpenHelper;
 
-    Descriptor(@NonNull SignalDatabase sqlCipherOpenHelper) {
+    Descriptor(@NonNull SignalDatabaseOpenHelper sqlCipherOpenHelper) {
       this.sqlCipherOpenHelper = sqlCipherOpenHelper;
     }
 

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

@@ -37,10 +37,11 @@ import org.signal.core.util.tracing.Tracer;
 import org.signal.glide.SignalGlideCodecs;
 import org.signal.ringrtc.CallManager;
 import org.thoughtcrime.securesms.avatar.AvatarPickerStorage;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
+import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider;
 import org.thoughtcrime.securesms.database.LogDatabase;
 import org.thoughtcrime.securesms.database.SqlCipherLibraryLoader;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider;
 import org.thoughtcrime.securesms.emoji.EmojiSource;
@@ -123,7 +124,12 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     super.onCreate();
 
     AppStartup.getInstance().addBlocking("security-provider", this::initializeSecurityProvider)
-                            .addBlocking("sqlcipher-init", () -> SqlCipherLibraryLoader.load())
+                            .addBlocking("sqlcipher-init", () -> {
+                              SqlCipherLibraryLoader.load();
+                              SignalDatabase.init(this,
+                                                  DatabaseSecretProvider.getOrCreateDatabaseSecret(this),
+                                                  AttachmentSecretProvider.getInstance(this).getOrCreateAttachmentSecret());
+                            })
                             .addBlocking("logging", () -> {
                               initializeLogging();
                               Log.i(TAG, "onCreate()");
@@ -176,7 +182,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addPostRender(() -> SignalStore.settings().setDefaultSms(Util.isDefaultSmsProvider(this)))
                             .addPostRender(() -> DownloadLatestEmojiDataJob.scheduleIfNecessary(this))
                             .addPostRender(EmojiSearchIndexDownloadJob::scheduleIfNecessary)
-                            .addPostRender(() -> DatabaseFactory.getMessageLogDatabase(this).trimOldMessages(System.currentTimeMillis(), FeatureFlags.retryRespondMaxAge()))
+                            .addPostRender(() -> SignalDatabase.messageLog().trimOldMessages(System.currentTimeMillis(), FeatureFlags.retryRespondMaxAge()))
                             .execute();
 
     Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
@@ -284,7 +290,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   private void initializeFirstEverAppLaunch() {
     if (TextSecurePreferences.getFirstInstallVersion(this) == -1) {
-      if (!SQLCipherOpenHelper.databaseFileExists(this) || VersionTracker.getDaysSinceFirstInstalled(this) < 365) {
+      if (!SignalDatabase.databaseFileExists(this) || VersionTracker.getDaysSinceFirstInstalled(this) < 365) {
         Log.i(TAG, "First ever app launch!");
         AppInitialization.onFirstEverAppLaunch(this);
       }
@@ -389,7 +395,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   @WorkerThread
   private void initializeCleanup() {
-    int deleted = DatabaseFactory.getAttachmentDatabase(this).deleteAbandonedPreuploadedAttachments();
+    int deleted = SignalDatabase.attachments().deleteAbandonedPreuploadedAttachments();
     Log.i(TAG, "Deleted " + deleted + " abandoned attachments.");
   }
 

app/src/main/java/org/thoughtcrime/securesms/BlockUnblockDialog.java

@@ -11,7 +11,7 @@ import androidx.lifecycle.Lifecycle;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 
@@ -65,7 +65,7 @@ public final class BlockUnblockDialog {
     Resources           resources = context.getResources();
 
     if (recipient.isGroup()) {
-      if (DatabaseFactory.getGroupDatabase(context).isActive(recipient.requireGroupId())) {
+      if (SignalDatabase.groups().isActive(recipient.requireGroupId())) {
         builder.setTitle(resources.getString(R.string.BlockUnblockDialog_block_and_leave_s, recipient.getDisplayName(context)));
         builder.setMessage(R.string.BlockUnblockDialog_you_will_no_longer_receive_messages_or_updates);
         builder.setPositiveButton(R.string.BlockUnblockDialog_block_and_leave, ((dialog, which) -> onBlock.run()));
@@ -104,7 +104,7 @@ public final class BlockUnblockDialog {
     Resources           resources = context.getResources();
 
     if (recipient.isGroup()) {
-      if (DatabaseFactory.getGroupDatabase(context).isActive(recipient.requireGroupId())) {
+      if (SignalDatabase.groups().isActive(recipient.requireGroupId())) {
         builder.setTitle(resources.getString(R.string.BlockUnblockDialog_unblock_s, recipient.getDisplayName(context)));
         builder.setMessage(R.string.BlockUnblockDialog_group_members_will_be_able_to_add_you);
         builder.setPositiveButton(R.string.RecipientPreferenceActivity_unblock, ((dialog, which) -> onUnblock.run()));

app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java

@@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.components.ContactFilterView;
 import org.thoughtcrime.securesms.components.ContactFilterView.OnFilterChangedListener;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.contacts.SelectedContact;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.groups.SelectionLimits;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -255,7 +255,7 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
         MessageSender.send(context, new OutgoingTextMessage(recipient, message, subscriptionId), -1L, true, null, null);
 
         if (recipient.getContactUri() != null) {
-          DatabaseFactory.getRecipientDatabase(context).setHasSentInvite(recipient.getId());
+          SignalDatabase.recipients().setHasSentInvite(recipient.getId());
         }
       }
 

app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java

@@ -26,13 +26,12 @@ import androidx.appcompat.app.AlertDialog;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -104,7 +103,7 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   private void launch(Recipient recipient) {
-    long   existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient.getId());
+    long   existingThread = SignalDatabase.threads().getThreadIdIfExistsFor(recipient.getId());
     Intent intent         = ConversationIntents.createBuilder(this, recipient.getId(), existingThread)
                                                .withDraftText(getIntent().getStringExtra(Intent.EXTRA_TEXT))
                                                .withDataUri(getIntent().getData())

app/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java

@@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Rfc5724Uri;
 
@@ -48,7 +48,7 @@ public class SmsSendtoActivity extends Activity {
       Toast.makeText(this, R.string.ConversationActivity_specify_recipient, Toast.LENGTH_LONG).show();
     } else {
       Recipient recipient = Recipient.external(this, destination.getDestination());
-      long      threadId  = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient.getId());
+      long      threadId  = SignalDatabase.threads().getThreadIdIfExistsFor(recipient.getId());
 
       nextIntent = ConversationIntents.createBuilder(this, recipient.getId(), threadId)
                                       .withDraftText(destination.getBody())

app/src/main/java/org/thoughtcrime/securesms/audio/AudioWaveForm.java

@@ -22,7 +22,7 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
 import org.thoughtcrime.securesms.media.DecryptableUriMediaInput;
 import org.thoughtcrime.securesms.media.MediaInput;
@@ -100,7 +100,7 @@ public final class AudioWaveForm {
 
       if (attachment instanceof DatabaseAttachment) {
         try {
-          AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
+          AttachmentDatabase attachmentDatabase = SignalDatabase.attachments();
           DatabaseAttachment dbAttachment       = (DatabaseAttachment) attachment;
           long               startTime          = System.currentTimeMillis();
 

app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarBundler.kt

@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.avatar
 
 import android.os.Bundle
-import java.lang.IllegalStateException
 
 /**
  * Utility class which encapsulates reading and writing Avatar objects to and from Bundles.

app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarPickerStorage.kt

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.avatar
 import android.content.Context
 import android.net.Uri
 import android.webkit.MimeTypeMap
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.mms.PartAuthority
 import org.thoughtcrime.securesms.util.MediaUtil
@@ -33,7 +33,7 @@ object AvatarPickerStorage {
   @JvmStatic
   fun cleanOrphans(context: Context) {
     val avatarFiles = FileStorage.getAllFiles(context, DIRECTORY, FILENAME_BASE)
-    val database = DatabaseFactory.getAvatarPickerDatabase(context)
+    val database = SignalDatabase.avatarPicker
     val photoAvatars = database
       .getAllAvatars()
       .filterIsInstance<Avatar.Photo>()

app/src/main/java/org/thoughtcrime/securesms/avatar/photo/PhotoEditorFragment.kt

@@ -11,7 +11,7 @@ import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.avatar.AvatarBundler
 import org.thoughtcrime.securesms.avatar.AvatarPickerStorage
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.scribbles.ImageEditorFragment
 
@@ -44,7 +44,7 @@ class PhotoEditorFragment : Fragment(R.layout.avatar_photo_editor_fragment), Ima
       val inputStream = BlobProvider.getInstance().getStream(applicationContext, editedImageUri)
       val onDiskUri = AvatarPickerStorage.save(applicationContext, inputStream)
       val photo = AvatarBundler.extractPhoto(args.photoAvatar)
-      val database = DatabaseFactory.getAvatarPickerDatabase(applicationContext)
+      val database = SignalDatabase.avatarPicker
       val newPhoto = photo.copy(uri = onDiskUri, size = size)
 
       database.update(newPhoto)

app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerRepository.kt

@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.avatar.AvatarPickerStorage
 import org.thoughtcrime.securesms.avatar.AvatarRenderer
 import org.thoughtcrime.securesms.avatar.Avatars
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.profiles.AvatarHelper
@@ -70,11 +70,11 @@ class AvatarPickerRepository(context: Context) {
   }
 
   fun getPersistedAvatarsForSelf(): Single<List<Avatar>> = Single.fromCallable {
-    DatabaseFactory.getAvatarPickerDatabase(applicationContext).getAvatarsForSelf()
+    SignalDatabase.avatarPicker.getAvatarsForSelf()
   }
 
   fun getPersistedAvatarsForGroup(groupId: GroupId): Single<List<Avatar>> = Single.fromCallable {
-    DatabaseFactory.getAvatarPickerDatabase(applicationContext).getAvatarsForGroup(groupId)
+    SignalDatabase.avatarPicker.getAvatarsForGroup(groupId)
   }
 
   fun getDefaultAvatarsForSelf(): Single<List<Avatar>> = Single.fromCallable {
@@ -97,7 +97,7 @@ class AvatarPickerRepository(context: Context) {
 
   fun persistAvatarForSelf(avatar: Avatar, onPersisted: (Avatar) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val avatarDatabase = DatabaseFactory.getAvatarPickerDatabase(applicationContext)
+      val avatarDatabase = SignalDatabase.avatarPicker
       val savedAvatar = avatarDatabase.saveAvatarForSelf(avatar)
       avatarDatabase.markUsage(savedAvatar)
       onPersisted(savedAvatar)
@@ -106,7 +106,7 @@ class AvatarPickerRepository(context: Context) {
 
   fun persistAvatarForGroup(avatar: Avatar, groupId: GroupId, onPersisted: (Avatar) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val avatarDatabase = DatabaseFactory.getAvatarPickerDatabase(applicationContext)
+      val avatarDatabase = SignalDatabase.avatarPicker
       val savedAvatar = avatarDatabase.saveAvatarForGroup(avatar, groupId)
       avatarDatabase.markUsage(savedAvatar)
       onPersisted(savedAvatar)
@@ -180,7 +180,7 @@ class AvatarPickerRepository(context: Context) {
   fun delete(avatar: Avatar, onDelete: () -> Unit) {
     SignalExecutors.BOUNDED.execute {
       if (avatar.databaseId is Avatar.DatabaseId.Saved) {
-        val avatarDatabase = DatabaseFactory.getAvatarPickerDatabase(applicationContext)
+        val avatarDatabase = SignalDatabase.avatarPicker
         avatarDatabase.deleteAvatar(avatar)
       }
       onDelete()

app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java

@@ -43,7 +43,6 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
-import org.thoughtcrime.securesms.service.PendingRetryReceiptManager;
 import org.thoughtcrime.securesms.util.SetUtil;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;

app/src/main/java/org/thoughtcrime/securesms/badges/BadgeRepository.kt

@@ -4,8 +4,8 @@ import android.content.Context
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.thoughtcrime.securesms.badges.models.Badge
-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.recipients.Recipient
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
@@ -19,7 +19,7 @@ class BadgeRepository(context: Context) {
     displayBadgesOnProfile: Boolean,
     selfBadges: List<Badge> = Recipient.self().badges
   ): Completable = Completable.fromAction {
-    val recipientDatabase: RecipientDatabase = DatabaseFactory.getRecipientDatabase(context)
+    val recipientDatabase: RecipientDatabase = SignalDatabase.recipients
     val badges = selfBadges.map { it.copy(visible = displayBadgesOnProfile) }
 
     ProfileUtil.uploadProfileWithBadges(context, badges)
@@ -35,7 +35,7 @@ class BadgeRepository(context: Context) {
     val reOrderedBadges = listOf(featuredBadge.copy(visible = true)) + (badges.filterNot { it.id == featuredBadge.id })
     ProfileUtil.uploadProfileWithBadges(context, reOrderedBadges)
 
-    val recipientDatabase: RecipientDatabase = DatabaseFactory.getRecipientDatabase(context)
+    val recipientDatabase: RecipientDatabase = SignalDatabase.recipients
     recipientDatabase.setBadges(Recipient.self().id, reOrderedBadges)
   }.subscribeOn(Schedulers.io())
 }

app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersRepository.java

@@ -7,8 +7,8 @@ import androidx.core.util.Consumer;
 
 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.RecipientDatabase;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.groups.GroupChangeBusyException;
 import org.thoughtcrime.securesms.groups.GroupChangeFailedException;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -32,7 +32,7 @@ class BlockedUsersRepository {
 
   void getBlocked(@NonNull Consumer<List<Recipient>> blockedUsers) {
     SignalExecutors.BOUNDED.execute(() -> {
-      RecipientDatabase db = DatabaseFactory.getRecipientDatabase(context);
+      RecipientDatabase db = SignalDatabase.recipients();
       try (RecipientDatabase.RecipientReader reader = db.readerForBlocked(db.getBlocked())) {
         int count = reader.getCount();
         if (count == 0) {

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);
       }

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactAccessor.java

@@ -26,39 +26,18 @@ import android.os.Parcelable;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.PhoneLookup;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 
-import androidx.annotation.NonNull;
-
-import com.annimon.stream.Stream;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.contactshare.Contact;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.GroupDatabase;
-import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
-import org.thoughtcrime.securesms.profiles.ProfileName;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.CursorUtil;
 import org.thoughtcrime.securesms.util.SqlUtil;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Util;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
-import static org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
-
 /**
  * This class was originally a layer of indirection between
  * ContactAccessorNewApi and ContactAccessorOldApi, which corresponded

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactRepository.java

@@ -11,8 +11,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.WorkerThread;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.CursorUtil;
@@ -102,7 +102,7 @@ public class ContactRepository {
   }};
 
   public ContactRepository(@NonNull Context context) {
-    this.recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
+    this.recipientDatabase = SignalDatabase.recipients();
     this.noteToSelfTitle   = context.getString(R.string.note_to_self);
     this.context           = context.getApplicationContext();
   }

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java

@@ -24,8 +24,8 @@ import androidx.annotation.NonNull;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.phonenumbers.NumberUtil;
@@ -181,7 +181,7 @@ public class ContactsCursorLoader extends AbstractContactsCursorLoader {
   }
 
   private Cursor getRecentConversationsCursor(boolean groupsOnly) {
-    ThreadDatabase threadDatabase = DatabaseFactory.getThreadDatabase(getContext());
+    ThreadDatabase threadDatabase = SignalDatabase.threads();
 
     MatrixCursor recentConversations = ContactsCursorRows.createMatrixCursor(RECENT_CONVERSATION_MAX);
     try (Cursor rawConversations = threadDatabase.getRecentConversationList(RECENT_CONVERSATION_MAX, flagSet(mode, DisplayMode.FLAG_INACTIVE_GROUPS), groupsOnly, hideGroupsV1(mode), !smsEnabled(mode))) {
@@ -210,7 +210,7 @@ public class ContactsCursorLoader extends AbstractContactsCursorLoader {
 
   private Cursor getGroupsCursor() {
     MatrixCursor groupContacts = ContactsCursorRows.createMatrixCursor();
-    try (GroupDatabase.Reader reader = DatabaseFactory.getGroupDatabase(getContext()).getGroupsFilteredByTitle(getFilter(), flagSet(mode, DisplayMode.FLAG_INACTIVE_GROUPS), hideGroupsV1(mode), !smsEnabled(mode))) {
+    try (GroupDatabase.Reader reader = SignalDatabase.groups().getGroupsFilteredByTitle(getFilter(), flagSet(mode, DisplayMode.FLAG_INACTIVE_GROUPS), hideGroupsV1(mode), !smsEnabled(mode))) {
       GroupDatabase.GroupRecord groupRecord;
       while ((groupRecord = reader.getNext()) != null) {
         groupContacts.addRow(ContactsCursorRows.forGroup(groupRecord));

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java

@@ -7,23 +7,20 @@ import android.content.Context;
 import android.content.SyncResult;
 import android.os.Bundle;
 
-import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.SetUtil;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 public class ContactsSyncAdapter extends AbstractThreadedSyncAdapter {
@@ -51,7 +48,7 @@ public class ContactsSyncAdapter extends AbstractThreadedSyncAdapter {
     }
 
     Set<String> allSystemNumbers     = ContactAccessor.getInstance().getAllContactsWithNumbers(context);
-    Set<String> knownSystemNumbers   = DatabaseFactory.getRecipientDatabase(context).getAllPhoneNumbers();
+    Set<String> knownSystemNumbers   = SignalDatabase.recipients().getAllPhoneNumbers();
     Set<String> unknownSystemNumbers = SetUtil.difference(allSystemNumbers, knownSystemNumbers);
 
     if (unknownSystemNumbers.size() > FULL_SYNC_THRESHOLD) {

app/src/main/java/org/thoughtcrime/securesms/contacts/TurnOffContactJoinedNotificationsActivity.java

@@ -9,13 +9,12 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessageDatabase;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.notifications.MarkReadReceiver;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 
 import java.util.List;
@@ -53,7 +52,7 @@ public class TurnOffContactJoinedNotificationsActivity extends AppCompatActivity
 
   private void handlePositiveAction(@NonNull DialogInterface dialog) {
     SimpleTask.run(getLifecycle(), () -> {
-      ThreadDatabase threadDatabase = DatabaseFactory.getThreadDatabase(this);
+      ThreadDatabase threadDatabase = SignalDatabase.threads();
 
       List<MessageDatabase.MarkedMessageInfo> marked = threadDatabase.setRead(getIntent().getLongExtra(EXTRA_THREAD_ID, -1), false);
       MarkReadReceiver.process(this, marked);

app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java

@@ -8,8 +8,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.Conversions;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -30,7 +30,7 @@ public final class GroupRecordContactPhoto implements ContactPhoto {
 
   @Override
   public InputStream openInputStream(Context context) throws IOException {
-    GroupDatabase                       groupDatabase = DatabaseFactory.getGroupDatabase(context);
+    GroupDatabase                       groupDatabase = SignalDatabase.groups();
     Optional<GroupDatabase.GroupRecord> groupRecord   = groupDatabase.getGroup(groupId);
 
     if (!groupRecord.isPresent() || !AvatarHelper.hasAvatar(context, groupRecord.get().getRecipientId())) {

app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java

@@ -24,11 +24,11 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.contacts.ContactAccessor;
 import org.thoughtcrime.securesms.contacts.ContactsDatabase;
 import org.thoughtcrime.securesms.crypto.SessionUtil;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessageDatabase.InsertResult;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.database.RecipientDatabase.BulkOperationsHandle;
 import org.thoughtcrime.securesms.database.RecipientDatabase.RegisteredState;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.whispersystems.signalservice.api.push.ACI;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
@@ -98,7 +98,7 @@ public class DirectoryHelper {
       return;
     }
 
-    RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
+    RecipientDatabase recipientDatabase = SignalDatabase.recipients();
     Set<String>       databaseNumbers   = sanitizeNumbers(recipientDatabase.getAllPhoneNumbers());
     Set<String>       systemNumbers     = sanitizeNumbers(ContactAccessor.getInstance().getAllContactsWithNumbers(context));
 
@@ -109,7 +109,7 @@ public class DirectoryHelper {
 
   @WorkerThread
   public static void refreshDirectoryFor(@NonNull Context context, @NonNull List<Recipient> recipients, boolean notifyOfNewUsers) throws IOException {
-    RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
+    RecipientDatabase recipientDatabase = SignalDatabase.recipients();
 
     for (Recipient recipient : recipients) {
       if (recipient.hasAci() && !recipient.hasE164()) {
@@ -132,7 +132,7 @@ public class DirectoryHelper {
   @WorkerThread
   public static RegisteredState refreshDirectoryFor(@NonNull Context context, @NonNull Recipient recipient, boolean notifyOfNewUsers) throws IOException {
     Stopwatch         stopwatch               = new Stopwatch("single");
-    RecipientDatabase recipientDatabase       = DatabaseFactory.getRecipientDatabase(context);
+    RecipientDatabase recipientDatabase       = SignalDatabase.recipients();
     RegisteredState   originalRegisteredState = recipient.resolve().getRegistered();
     RegisteredState   newRegisteredState;
 
@@ -221,7 +221,7 @@ public class DirectoryHelper {
 
   @WorkerThread
   private static void refreshNumbers(@NonNull Context context, @NonNull Set<String> databaseNumbers, @NonNull Set<String> systemNumbers, boolean notifyOfNewUsers, boolean removeSystemContactEntryForMissing) throws IOException {
-    RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
+    RecipientDatabase recipientDatabase = SignalDatabase.recipients();
     Set<String>       allNumbers        = SetUtil.union(databaseNumbers, systemNumbers);
 
     if (allNumbers.isEmpty()) {
@@ -325,7 +325,7 @@ public class DirectoryHelper {
     }
 
     try {
-      ContactsDatabase  contactsDatabase = DatabaseFactory.getContactsDatabase(context);
+      ContactsDatabase  contactsDatabase = SignalDatabase.contacts();
       List<String>      activeAddresses  = Stream.of(activeIds)
                                                  .map(Recipient::resolved)
                                                  .filter(Recipient::hasE164)
@@ -342,7 +342,7 @@ public class DirectoryHelper {
   }
 
   private static void syncRecipientInfoWithSystemContacts(@NonNull Context context, @NonNull Map<String, String> rewrites) {
-    RecipientDatabase     recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
+    RecipientDatabase     recipientDatabase = SignalDatabase.recipients();
     BulkOperationsHandle  handle            = recipientDatabase.beginBulkSystemContactUpdate();
 
     try (Cursor cursor = ContactAccessor.getInstance().getAllSystemContacts(context)) {
@@ -406,7 +406,7 @@ public class DirectoryHelper {
     }
 
     if (NotificationChannels.supported()) {
-      try (RecipientDatabase.RecipientReader recipients = DatabaseFactory.getRecipientDatabase(context).getRecipientsWithNotificationChannels()) {
+      try (RecipientDatabase.RecipientReader recipients = SignalDatabase.recipients().getRecipientsWithNotificationChannels()) {
         Recipient recipient;
         while ((recipient = recipients.getNext()) != null) {
           NotificationChannels.updateContactChannelName(context, recipient);
@@ -480,7 +480,7 @@ public class DirectoryHelper {
           recipient.hasAUserSetDisplayName(context))
       {
         IncomingJoinedMessage  message      = new IncomingJoinedMessage(recipient.getId());
-        Optional<InsertResult> insertResult = DatabaseFactory.getSmsDatabase(context).insertMessageInbox(message);
+        Optional<InsertResult> insertResult = SignalDatabase.sms().insertMessageInbox(message);
 
         if (insertResult.isPresent()) {
           int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
@@ -549,9 +549,9 @@ public class DirectoryHelper {
   }
 
   private static boolean hasCommunicatedWith(@NonNull Context context, @NonNull Recipient recipient) {
-    return DatabaseFactory.getThreadDatabase(context).hasThread(recipient.getId()) ||
-           (recipient.hasAci() && DatabaseFactory.getSessionDatabase(context).hasSessionFor(recipient.requireAci().toString())) ||
-           (recipient.hasE164() && DatabaseFactory.getSessionDatabase(context).hasSessionFor(recipient.requireE164()));
+    return SignalDatabase.threads().hasThread(recipient.getId()) ||
+           (recipient.hasAci() && SignalDatabase.sessions().hasSessionFor(recipient.requireAci().toString())) ||
+           (recipient.hasE164() && SignalDatabase.sessions().hasSessionFor(recipient.requireE164()));
   }
 
   static class DirectoryResult {

app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java

@@ -17,7 +17,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import org.thoughtcrime.securesms.PassphraseRequiredActivity;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
@@ -78,8 +78,8 @@ public class ContactShareEditActivity extends PassphraseRequiredActivity impleme
     contactList.setAdapter(contactAdapter);
 
     SharedContactRepository contactRepository = new SharedContactRepository(this,
-                                                                AsyncTask.THREAD_POOL_EXECUTOR,
-                                                                DatabaseFactory.getContactsDatabase(this));
+                                                                            AsyncTask.THREAD_POOL_EXECUTOR,
+                                                                            SignalDatabase.contacts());
 
     viewModel = ViewModelProviders.of(this, new Factory(contactUris, contactRepository)).get(ContactShareEditViewModel.class);
     viewModel.getContacts().observe(this, contacts -> {

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -152,7 +152,6 @@ import org.thoughtcrime.securesms.conversation.ui.groupcall.GroupCallViewModel;
 import org.thoughtcrime.securesms.conversation.ui.mentions.MentionsPickerViewModel;
 import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
 import org.thoughtcrime.securesms.crypto.SecurityEvent;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.DraftDatabase;
 import org.thoughtcrime.securesms.database.DraftDatabase.Draft;
 import org.thoughtcrime.securesms.database.DraftDatabase.Drafts;
@@ -163,6 +162,7 @@ import org.thoughtcrime.securesms.database.MentionUtil.UpdatedBodyAndMentions;
 import org.thoughtcrime.securesms.database.MmsSmsColumns.Types;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.database.RecipientDatabase.RegisteredState;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.database.identity.IdentityRecordList;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
@@ -1195,8 +1195,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
       new AsyncTask<Void, Void, Void>() {
         @Override
         protected Void doInBackground(Void... params) {
-          DatabaseFactory.getRecipientDatabase(ConversationActivity.this)
-                         .setMuted(recipient.getId(), until);
+         SignalDatabase.recipients().setMuted(recipient.getId(), until);
 
           return null;
         }
@@ -1222,9 +1221,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
     new AsyncTask<Void, Void, Void>() {
       @Override
       protected Void doInBackground(Void... params) {
-        DatabaseFactory.getRecipientDatabase(ConversationActivity.this)
-                       .setMuted(recipient.getId(), 0);
-
+        SignalDatabase.recipients().setMuted(recipient.getId(), 0);
         return null;
       }
     }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -1358,8 +1355,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
       new AsyncTask<Void, Void, Void>() {
         @Override
         protected Void doInBackground(Void... params) {
-          DatabaseFactory.getThreadDatabase(ConversationActivity.this)
-                         .setDistributionType(threadId, ThreadDatabase.DistributionTypes.BROADCAST);
+          SignalDatabase.threads().setDistributionType(threadId, ThreadDatabase.DistributionTypes.BROADCAST);
           return null;
         }
       }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -1374,8 +1370,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
       new AsyncTask<Void, Void, Void>() {
         @Override
         protected Void doInBackground(Void... params) {
-          DatabaseFactory.getThreadDatabase(ConversationActivity.this)
-                         .setDistributionType(threadId, ThreadDatabase.DistributionTypes.CONVERSATION);
+          SignalDatabase.threads().setDistributionType(threadId, ThreadDatabase.DistributionTypes.CONVERSATION);
           return null;
         }
       }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -1692,7 +1687,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
       @Override
       protected Pair<Drafts, CharSequence> doInBackground(Void... params) {
         Context       context       = ConversationActivity.this;
-        DraftDatabase draftDatabase = DatabaseFactory.getDraftDatabase(context);
+        DraftDatabase draftDatabase = SignalDatabase.drafts();
         Drafts        results       = draftDatabase.getDrafts(threadId);
         Draft         mentionsDraft = results.getDraftOfType(Draft.MENTION);
         Spannable     updatedText   = null;
@@ -1925,8 +1920,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
         List<Recipient> recipients;
 
         if (params[0].isGroup()) {
-          recipients = DatabaseFactory.getGroupDatabase(ConversationActivity.this)
-                                      .getGroupMembers(params[0].requireGroupId(), GroupDatabase.MemberSet.FULL_MEMBERS_EXCLUDING_SELF);
+          recipients = SignalDatabase.groups().getGroupMembers(params[0].requireGroupId(), GroupDatabase.MemberSet.FULL_MEMBERS_EXCLUDING_SELF);
         } else {
           recipients = Collections.singletonList(params[0]);
         }
@@ -2456,7 +2450,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
     }
 
     if (this.threadId == -1) {
-      SimpleTask.run(() -> DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient.getId()), threadId -> {
+      SimpleTask.run(() -> SignalDatabase.threads().getThreadIdIfExistsFor(recipient.getId()), threadId -> {
         if (this.threadId != threadId) {
           Log.d(TAG, "Thread id changed via recipient change");
           this.threadId = threadId;
@@ -2636,8 +2630,8 @@ public class ConversationActivity extends PassphraseRequiredActivity
           }
         }
 
-        ThreadDatabase threadDatabase = DatabaseFactory.getThreadDatabase(ConversationActivity.this);
-        DraftDatabase  draftDatabase  = DatabaseFactory.getDraftDatabase(ConversationActivity.this);
+        ThreadDatabase threadDatabase = SignalDatabase.threads();
+        DraftDatabase  draftDatabase  = SignalDatabase.drafts();
         long           threadId       = params[0];
 
         if (drafts.size() > 0) {
@@ -2732,7 +2726,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
   private boolean isActiveGroup() {
     if (!isGroupConversation()) return false;
 
-    Optional<GroupRecord> record = DatabaseFactory.getGroupDatabase(this).getGroup(getRecipient().getId());
+    Optional<GroupRecord> record = SignalDatabase.groups().getGroup(getRecipient().getId());
     return record.isPresent() && record.get().isActive();
   }
 
@@ -2779,7 +2773,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
     new AsyncTask<Long, Void, Void>() {
       @Override
       protected Void doInBackground(Long... params) {
-        DatabaseFactory.getThreadDatabase(ConversationActivity.this).setLastSeen(params[0]);
+        SignalDatabase.threads().setLastSeen(params[0]);
         return null;
       }
     }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, threadId);
@@ -2885,7 +2879,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
     SimpleTask.run(() -> {
       long resultId = MessageSender.sendPushWithPreUploadedMedia(this, secureMessage, result.getPreUploadResults(), thread, null);
 
-      int deleted = DatabaseFactory.getAttachmentDatabase(this).deleteAbandonedPreuploadedAttachments();
+      int deleted = SignalDatabase.attachments().deleteAbandonedPreuploadedAttachments();
       Log.i(TAG, "Deleted " + deleted + " abandoned attachments.");
 
       return resultId;
@@ -3083,7 +3077,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
     new AsyncTask<Void, Void, Void>() {
       @Override
       protected Void doInBackground(Void... params) {
-        RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(ConversationActivity.this);
+        RecipientDatabase recipientDatabase = SignalDatabase.recipients();
 
         recipientDatabase.setDefaultSubscriptionId(recipient.getId(), transportOption.getSimSubscriptionId().or(-1));
 
@@ -3258,7 +3252,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
     sendSticker(new StickerLocator(stickerRecord.getPackId(), stickerRecord.getPackKey(), stickerRecord.getStickerId(), stickerRecord.getEmoji()), stickerRecord.getContentType(), stickerRecord.getUri(), stickerRecord.getSize(), clearCompose);
 
     SignalExecutors.BOUNDED.execute(() ->
-     DatabaseFactory.getStickerDatabase(getApplicationContext())
+     SignalDatabase.stickers()
                     .updateStickerLastUsedTime(stickerRecord.getRowId(), System.currentTimeMillis())
     );
   }
@@ -3688,8 +3682,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
 
     SimpleTask.run(() -> {
           //noinspection CodeBlock2Expr
-          return DatabaseFactory.getMmsSmsDatabase(this)
-                                .checkMessageExists(reactionDelegate.getMessageRecord());
+          return SignalDatabase.mmsSms().checkMessageExists(reactionDelegate.getMessageRecord());
         }, messageExists -> {
           if (!messageExists) {
             reactionDelegate.hide();
@@ -3956,7 +3949,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
 
       Context context = getApplicationContext();
 
-      MessageRecord messageRecord = DatabaseFactory.getMmsSmsDatabase(context).getMessageFor(quoteId.getId(), quoteId.getAuthor());
+      MessageRecord messageRecord = SignalDatabase.mmsSms().getMessageFor(quoteId.getId(), quoteId.getAuthor());
       if (messageRecord == null) {
         return null;
       }

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationBannerView.java

@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
@@ -70,8 +70,7 @@ public class ConversationBannerView extends ConstraintLayout {
     if (recipient != null && recipient.shouldBlurAvatar() && recipient.getContactPhoto() != null) {
       tapToView.setVisibility(VISIBLE);
       tapToView.setOnClickListener(v -> {
-        SignalExecutors.BOUNDED.execute(() -> DatabaseFactory.getRecipientDatabase(getContext().getApplicationContext())
-                                                             .manuallyShowAvatar(recipient.getId()));
+        SignalExecutors.BOUNDED.execute(() -> SignalDatabase.recipients().manuallyShowAvatar(recipient.getId()));
       });
     } else {
       tapToView.setVisibility(GONE);

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java

@@ -12,9 +12,9 @@ import org.signal.paging.PagedDataSource;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.conversation.ConversationData.MessageRequestData;
 import org.thoughtcrime.securesms.conversation.ConversationMessage.ConversationMessageFactory;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessageDatabase;
 import org.thoughtcrime.securesms.database.MmsSmsDatabase;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.InMemoryMessageRecord;
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.Mention;
@@ -57,7 +57,7 @@ class ConversationDataSource implements PagedDataSource<MessageId, ConversationM
   @Override
   public int size() {
     long startTime = System.currentTimeMillis();
-    int  size      = DatabaseFactory.getMmsSmsDatabase(context).getConversationCount(threadId) +
+    int  size      = SignalDatabase.mmsSms().getConversationCount(threadId) +
                      (messageRequestData.includeWarningUpdateMessage() ? 1 : 0) +
                      (showUniversalExpireTimerUpdate ? 1 : 0);
 
@@ -69,7 +69,7 @@ class ConversationDataSource implements PagedDataSource<MessageId, ConversationM
   @Override
   public @NonNull List<ConversationMessage> load(int start, int length, @NonNull CancellationSignal cancellationSignal) {
     Stopwatch           stopwatch        = new Stopwatch("load(" + start + ", " + length + "), thread " + threadId);
-    MmsSmsDatabase      db               = DatabaseFactory.getMmsSmsDatabase(context);
+    MmsSmsDatabase      db               = SignalDatabase.mmsSms();
     List<MessageRecord> records          = new ArrayList<>(length);
     MentionHelper       mentionHelper    = new MentionHelper();
     AttachmentHelper    attachmentHelper = new AttachmentHelper();
@@ -123,7 +123,7 @@ class ConversationDataSource implements PagedDataSource<MessageId, ConversationM
   @Override
   public @Nullable ConversationMessage load(@NonNull MessageId messageId) {
     Stopwatch       stopwatch = new Stopwatch("load(" + messageId + "), thread " + threadId);
-    MessageDatabase database  = messageId.isMms() ? DatabaseFactory.getMmsDatabase(context) : DatabaseFactory.getSmsDatabase(context);
+    MessageDatabase database  = messageId.isMms() ? SignalDatabase.mms() : SignalDatabase.sms();
     MessageRecord   record    = database.getMessageRecordOrNull(messageId.getId());
 
     stopwatch.split("message");
@@ -132,20 +132,20 @@ class ConversationDataSource implements PagedDataSource<MessageId, ConversationM
       if (record != null) {
         List<Mention> mentions;
         if (messageId.isMms()) {
-          mentions = DatabaseFactory.getMentionDatabase(context).getMentionsForMessage(messageId.getId());
+          mentions = SignalDatabase.mentions().getMentionsForMessage(messageId.getId());
         } else {
           mentions = Collections.emptyList();
         }
 
         stopwatch.split("mentions");
 
-        List<ReactionRecord> reactions = DatabaseFactory.getReactionDatabase(context).getReactions(messageId);
+        List<ReactionRecord> reactions = SignalDatabase.reactions().getReactions(messageId);
         record = ReactionHelper.recordWithReactions(record, reactions);
 
         stopwatch.split("reactions");
 
         if (messageId.isMms()) {
-          List<DatabaseAttachment> attachments = DatabaseFactory.getAttachmentDatabase(context).getAttachmentsForMessage(messageId.getId());
+          List<DatabaseAttachment> attachments = SignalDatabase.attachments().getAttachmentsForMessage(messageId.getId());
           if (attachments.size() > 0) {
             record = ((MediaMmsMessageRecord) record).withAttachments(context, attachments);
           }
@@ -179,7 +179,7 @@ class ConversationDataSource implements PagedDataSource<MessageId, ConversationM
     }
 
     void fetchMentions(Context context) {
-      messageIdToMentions = DatabaseFactory.getMentionDatabase(context).getMentionsForMessages(messageIds);
+      messageIdToMentions = SignalDatabase.mentions().getMentionsForMessages(messageIds);
     }
 
     @Nullable List<Mention> getMentions(long id) {
@@ -199,7 +199,7 @@ class ConversationDataSource implements PagedDataSource<MessageId, ConversationM
     }
 
     void fetchAttachments(Context context) {
-      messageIdToAttachments = DatabaseFactory.getAttachmentDatabase(context).getAttachmentsForMessages(messageIds);
+      messageIdToAttachments = SignalDatabase.attachments().getAttachmentsForMessages(messageIds);
     }
 
     @NonNull List<MessageRecord> buildUpdatedModels(@NonNull Context context, @NonNull List<MessageRecord> records) {
@@ -229,7 +229,7 @@ class ConversationDataSource implements PagedDataSource<MessageId, ConversationM
     }
 
     void fetchReactions(Context context) {
-      messageIdToReactions = DatabaseFactory.getReactionDatabase(context).getReactionsForMessages(messageIds);
+      messageIdToReactions = SignalDatabase.reactions().getReactionsForMessages(messageIds);
     }
 
     @NonNull List<MessageRecord> buildUpdatedModels(@NonNull Context context, @NonNull List<MessageRecord> records) {

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java

@@ -94,9 +94,9 @@ import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectFor
 import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragmentArgs;
 import org.thoughtcrime.securesms.conversation.ui.error.EnableCallNotificationSettingsDialog;
 import org.thoughtcrime.securesms.conversation.ui.error.SafetyNumberChangeDialog;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessageDatabase;
 import org.thoughtcrime.securesms.database.MmsDatabase;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.model.InMemoryMessageRecord;
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
@@ -439,7 +439,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
     } else {
       lastVisibleMessageTimestamp = 0;
     }
-    SignalExecutors.BOUNDED.submit(() -> DatabaseFactory.getThreadDatabase(requireContext()).setLastScrolled(threadId, lastVisibleMessageTimestamp));
+    SignalExecutors.BOUNDED.submit(() -> SignalDatabase.threads().setLastScrolled(threadId, lastVisibleMessageTimestamp));
   }
 
   @Override
@@ -860,9 +860,9 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
             boolean threadDeleted;
 
             if (messageRecord.isMms()) {
-              threadDeleted = DatabaseFactory.getMmsDatabase(context).deleteMessage(messageRecord.getId());
+              threadDeleted = SignalDatabase.mms().deleteMessage(messageRecord.getId());
             } else {
-              threadDeleted = DatabaseFactory.getSmsDatabase(context).deleteMessage(messageRecord.getId());
+              threadDeleted = SignalDatabase.sms().deleteMessage(messageRecord.getId());
             }
 
             if (threadDeleted) {
@@ -1076,8 +1076,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
   @SuppressWarnings("CodeBlock2Expr")
   public void jumpToMessage(@NonNull RecipientId author, long timestamp, @Nullable Runnable onMessageNotFound) {
     SimpleTask.run(getLifecycle(), () -> {
-      return DatabaseFactory.getMmsSmsDatabase(getContext())
-                            .getMessagePositionInConversation(threadId, timestamp, author);
+      return SignalDatabase.mmsSms().getMessagePositionInConversation(threadId, timestamp, author);
     }, p -> moveToPosition(p + (isTypingIndicatorShowing() ? 1 : 0), onMessageNotFound));
   }
 
@@ -1142,8 +1141,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
 
   private void scrollToNextMention() {
     SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
-      MessageDatabase mmsDatabase = DatabaseFactory.getMmsDatabase(ApplicationDependencies.getApplication());
-      return mmsDatabase.getOldestUnreadMentionDetails(threadId);
+      return SignalDatabase.mms().getOldestUnreadMentionDetails(threadId);
     }, (pair) -> {
       if (pair != null) {
         jumpToMessage(pair.first(), pair.second(), () -> {});
@@ -1366,10 +1364,9 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
       }
 
       SimpleTask.run(getLifecycle(), () -> {
-        return DatabaseFactory.getMmsSmsDatabase(getContext())
-                              .getQuotedMessagePosition(threadId,
-                                                        messageRecord.getQuote().getId(),
-                                                        messageRecord.getQuote().getAuthor());
+        return SignalDatabase.mmsSms().getQuotedMessagePosition(threadId,
+                                                                messageRecord.getQuote().getId(),
+                                                                messageRecord.getQuote().getAuthor());
       }, p -> moveToPosition(p + (isTypingIndicatorShowing() ? 1 : 0), () -> {
         Toast.makeText(getContext(), R.string.ConversationFragment_quoted_message_no_longer_available, Toast.LENGTH_SHORT).show();
       }));
@@ -1419,7 +1416,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
                                                                  .withMimeType(thumbnailSlide.getContentType())
                                                                  .createForSingleSessionOnDisk(requireContext());
 
-          DatabaseFactory.getAttachmentDatabase(requireContext()).deleteAttachmentFilesForViewOnceMessage(messageRecord.getId());
+          SignalDatabase.attachments().deleteAttachmentFilesForViewOnceMessage(messageRecord.getId());
 
           ApplicationDependencies.getViewOnceMessageManager().scheduleIfNecessary();
 
@@ -1435,7 +1432,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
         } else {
           Log.w(TAG, "Failed to open view-once photo. Showing a toast and deleting the attachments for the message just in case.");
           Toast.makeText(requireContext(), R.string.ConversationFragment_failed_to_open_message, Toast.LENGTH_SHORT).show();
-          SignalExecutors.BOUNDED.execute(() -> DatabaseFactory.getAttachmentDatabase(requireContext()).deleteAttachmentFilesForViewOnceMessage(messageRecord.getId()));
+          SignalExecutors.BOUNDED.execute(() -> SignalDatabase.attachments().deleteAttachmentFilesForViewOnceMessage(messageRecord.getId()));
         }
       });
     }

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationGroupViewModel.java

@@ -15,9 +15,9 @@ import androidx.lifecycle.ViewModelProvider;
 import com.annimon.stream.Stream;
 
 import org.signal.core.util.concurrent.SignalExecutors;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.groups.GroupChangeBusyException;
 import org.thoughtcrime.securesms.groups.GroupChangeFailedException;
@@ -81,7 +81,7 @@ final class ConversationGroupViewModel extends ViewModel {
   void onSuggestedMembersBannerDismissed(@NonNull GroupId groupId, @NonNull List<RecipientId> suggestions) {
     SignalExecutors.BOUNDED.execute(() -> {
       if (groupId.isV2()) {
-        DatabaseFactory.getGroupDatabase(ApplicationDependencies.getApplication()).removeUnmigratedV1Members(groupId.requireV2(), suggestions);
+        SignalDatabase.groups().removeUnmigratedV1Members(groupId.requireV2(), suggestions);
         liveRecipient.postValue(liveRecipient.getValue());
       }
     });
@@ -118,7 +118,7 @@ final class ConversationGroupViewModel extends ViewModel {
   private static @Nullable GroupRecord getGroupRecordForRecipient(@Nullable Recipient recipient) {
     if (recipient != null && recipient.isGroup()) {
       Application context         = ApplicationDependencies.getApplication();
-      GroupDatabase groupDatabase = DatabaseFactory.getGroupDatabase(context);
+      GroupDatabase groupDatabase = SignalDatabase.groups();
       return groupDatabase.getGroup(recipient.getId()).orNull();
     } else {
       return null;
@@ -198,9 +198,9 @@ final class ConversationGroupViewModel extends ViewModel {
 
     firstTimeInviteFriendsTriggered = true;
 
-    SimpleTask.run(() -> DatabaseFactory.getGroupDatabase(ApplicationDependencies.getApplication())
-                                        .requireGroup(groupId)
-                                        .getMembers().equals(Collections.singletonList(Recipient.self().getId())),
+    SimpleTask.run(() -> SignalDatabase.groups()
+                                       .requireGroup(groupId)
+                                       .getMembers().equals(Collections.singletonList(Recipient.self().getId())),
                    justSelf -> {
                      if (justSelf) {
                        inviteFriends(supportFragmentManager, groupId);

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java

@@ -88,8 +88,8 @@ import org.thoughtcrime.securesms.conversation.colors.Colorizer;
 import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectCollection;
 import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectPart;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessageDatabase;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
@@ -2108,8 +2108,8 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
     if (message > -1) builder.setMessage(message);
 
     builder.setPositiveButton(R.string.yes, (dialogInterface, i) -> {
-      MessageDatabase db = messageRecord.isMms() ? DatabaseFactory.getMmsDatabase(context)
-                                                 : DatabaseFactory.getSmsDatabase(context);
+      MessageDatabase db = messageRecord.isMms() ? SignalDatabase.mms()
+                                                 : SignalDatabase.sms();
 
       db.markAsInsecure(messageRecord.getId());
       db.markAsOutbox(messageRecord.getId());
@@ -2127,9 +2127,9 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
 
     builder.setNegativeButton(R.string.no, (dialogInterface, i) -> {
       if (messageRecord.isMms()) {
-        DatabaseFactory.getMmsDatabase(context).markAsSentFailed(messageRecord.getId());
+        SignalDatabase.mms().markAsSentFailed(messageRecord.getId());
       } else {
-        DatabaseFactory.getSmsDatabase(context).markAsSentFailed(messageRecord.getId());
+        SignalDatabase.sms().markAsSentFailed(messageRecord.getId());
       }
     });
     builder.show();

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java

@@ -12,8 +12,8 @@ import org.signal.core.util.Conversions;
 import org.thoughtcrime.securesms.components.mention.MentionAnnotation;
 import org.thoughtcrime.securesms.conversation.mutiselect.Multiselect;
 import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectCollection;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MentionUtil;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.Mention;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 
@@ -149,7 +149,7 @@ public class ConversationMessage {
     @WorkerThread
     public static @NonNull ConversationMessage createWithUnresolvedData(@NonNull Context context, @NonNull MessageRecord messageRecord, @NonNull CharSequence body) {
       if (messageRecord.isMms()) {
-        List<Mention> mentions = DatabaseFactory.getMentionDatabase(context).getMentionsForMessage(messageRecord.getId());
+        List<Mention> mentions = SignalDatabase.mentions().getMentionsForMessage(messageRecord.getId());
         if (!mentions.isEmpty()) {
           MentionUtil.UpdatedBodyAndMentions updated = MentionUtil.updateBodyAndMentionsWithDisplayNames(context, body, mentions);
           return new ConversationMessage(messageRecord, updated.getBody(), updated.getMentions());

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java

@@ -9,8 +9,8 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 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.ThreadDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -46,7 +46,7 @@ class ConversationRepository {
   @WorkerThread
   boolean canShowAsBubble(long threadId) {
     if (Build.VERSION.SDK_INT >= ConversationUtil.CONVERSATION_SUPPORT_VERSION) {
-      Recipient recipient = DatabaseFactory.getThreadDatabase(context).getRecipientForThreadId(threadId);
+      Recipient recipient = SignalDatabase.threads().getRecipientForThreadId(threadId);
 
       return recipient != null && BubbleUtil.canBubble(context, recipient.getId(), threadId);
     } else {
@@ -55,8 +55,8 @@ class ConversationRepository {
   }
 
   private @NonNull ConversationData getConversationDataInternal(long threadId, @NonNull Recipient conversationRecipient, int jumpToPosition) {
-    ThreadDatabase.ConversationMetadata metadata                       = DatabaseFactory.getThreadDatabase(context).getConversationMetadata(threadId);
-    int                                 threadSize                     = DatabaseFactory.getMmsSmsDatabase(context).getConversationCount(threadId);
+    ThreadDatabase.ConversationMetadata metadata                       = SignalDatabase.threads().getConversationMetadata(threadId);
+    int                                 threadSize                     = SignalDatabase.mmsSms().getConversationCount(threadId);
     long                                lastSeen                       = metadata.getLastSeen();
     boolean                             hasSent                        = metadata.hasSent();
     int                                 lastSeenPosition               = 0;
@@ -67,7 +67,7 @@ class ConversationRepository {
     boolean                             showUniversalExpireTimerUpdate = false;
 
     if (lastSeen > 0) {
-      lastSeenPosition = DatabaseFactory.getMmsSmsDatabase(context).getMessagePositionOnOrAfterTimestamp(threadId, lastSeen);
+      lastSeenPosition = SignalDatabase.mmsSms().getMessagePositionOnOrAfterTimestamp(threadId, lastSeen);
     }
 
     if (lastSeenPosition <= 0) {
@@ -75,14 +75,14 @@ class ConversationRepository {
     }
 
     if (lastSeen == 0 && lastScrolled > 0) {
-      lastScrolledPosition = DatabaseFactory.getMmsSmsDatabase(context).getMessagePositionOnOrAfterTimestamp(threadId, lastScrolled);
+      lastScrolledPosition = SignalDatabase.mmsSms().getMessagePositionOnOrAfterTimestamp(threadId, lastScrolled);
     }
 
     if (!isMessageRequestAccepted) {
       boolean isGroup                             = false;
       boolean recipientIsKnownOrHasGroupsInCommon = false;
       if (conversationRecipient.isGroup()) {
-        Optional<GroupDatabase.GroupRecord> group = DatabaseFactory.getGroupDatabase(context).getGroup(conversationRecipient.getId());
+        Optional<GroupDatabase.GroupRecord> group = SignalDatabase.groups().getGroup(conversationRecipient.getId());
         if (group.isPresent()) {
           List<Recipient> recipients = Recipient.resolvedList(group.get().getMembers());
           for (Recipient recipient : recipients) {
@@ -103,7 +103,7 @@ class ConversationRepository {
         conversationRecipient.getExpiresInSeconds() == 0 &&
         !conversationRecipient.isGroup() &&
         conversationRecipient.isRegistered() &&
-        (threadId == -1 || !DatabaseFactory.getMmsSmsDatabase(context).hasMeaningfulMessage(threadId)))
+        (threadId == -1 || !SignalDatabase.mmsSms().hasMeaningfulMessage(threadId)))
     {
       showUniversalExpireTimerUpdate = true;
     }

app/src/main/java/org/thoughtcrime/securesms/conversation/MarkReadHelper.java

@@ -8,8 +8,8 @@ import androidx.lifecycle.LifecycleOwner;
 
 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.ThreadDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.notifications.MarkReadReceiver;
@@ -46,7 +46,7 @@ class MarkReadHelper {
 
     debouncer.publish(() -> {
       EXECUTOR.execute(() -> {
-        ThreadDatabase                          threadDatabase = DatabaseFactory.getThreadDatabase(context);
+        ThreadDatabase                          threadDatabase = SignalDatabase.threads();
         List<MessageDatabase.MarkedMessageInfo> infos          = threadDatabase.setReadSince(threadId, false, timestamp);
 
         Log.d(TAG, "Marking " + infos.size() + " messages as read.");

app/src/main/java/org/thoughtcrime/securesms/conversation/MessageCountsViewModel.java

@@ -10,8 +10,8 @@ import androidx.lifecycle.Transformations;
 import androidx.lifecycle.ViewModel;
 
 import org.signal.core.util.concurrent.SignalExecutors;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.DatabaseObserver;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.util.concurrent.SerialMonoLifoExecutor;
@@ -80,12 +80,12 @@ public class MessageCountsViewModel extends ViewModel {
   }
 
   private int getUnreadCount(@NonNull Context context, long threadId) {
-    ThreadRecord threadRecord = DatabaseFactory.getThreadDatabase(context).getThreadRecord(threadId);
+    ThreadRecord threadRecord = SignalDatabase.threads().getThreadRecord(threadId);
     return threadRecord != null ? threadRecord.getUnreadCount() : 0;
   }
 
   private int getUnreadMentionsCount(@NonNull Context context, long threadId) {
-    return DatabaseFactory.getMmsDatabase(context).getUnreadMentionCount(threadId);
+    return SignalDatabase.mms().getUnreadMentionCount(threadId);
   }
 
   @Override

app/src/main/java/org/thoughtcrime/securesms/conversation/ShowAdminsBottomSheetDialog.java

@@ -15,8 +15,8 @@ import androidx.fragment.app.FragmentManager;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.groups.ParcelableGroupId;
 import org.thoughtcrime.securesms.groups.ui.GroupMemberListView;
@@ -93,9 +93,9 @@ public final class ShowAdminsBottomSheetDialog extends BottomSheetDialogFragment
 
   @WorkerThread
   private static @NonNull List<Recipient> getAdmins(@NonNull Context context, @NonNull GroupId groupId) {
-    return DatabaseFactory.getGroupDatabase(context)
-                          .getGroup(groupId)
-                          .transform(GroupDatabase.GroupRecord::getAdmins)
-                          .or(Collections.emptyList());
+    return SignalDatabase.groups()
+                         .getGroup(groupId)
+                         .transform(GroupDatabase.GroupRecord::getAdmins)
+                         .or(Collections.emptyList());
   }
 }

app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionRepository.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.conversation.colors.ChatColors
 import org.thoughtcrime.securesms.conversation.colors.ChatColorsPalette
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -21,19 +21,19 @@ sealed class ChatColorSelectionRepository(context: Context) {
   fun duplicate(chatColors: ChatColors) {
     SignalExecutors.BOUNDED.execute {
       val duplicate = chatColors.withId(ChatColors.Id.NotSet)
-      DatabaseFactory.getChatColorsDatabase(context).saveChatColors(duplicate)
+      SignalDatabase.chatColors.saveChatColors(duplicate)
     }
   }
 
   fun getUsageCount(chatColorsId: ChatColors.Id, consumer: (Int) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      consumer(DatabaseFactory.getRecipientDatabase(context).getColorUsageCount(chatColorsId))
+      consumer(SignalDatabase.recipients.getColorUsageCount(chatColorsId))
     }
   }
 
   fun delete(chatColors: ChatColors, onDeleted: () -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      DatabaseFactory.getChatColorsDatabase(context).deleteChatColors(chatColors)
+      SignalDatabase.chatColors.deleteChatColors(chatColors)
       onDeleted()
     }
   }
@@ -84,7 +84,7 @@ sealed class ChatColorSelectionRepository(context: Context) {
 
     override fun save(chatColors: ChatColors, onSaved: () -> Unit) {
       SignalExecutors.BOUNDED.execute {
-        val recipientDatabase = DatabaseFactory.getRecipientDatabase(context)
+        val recipientDatabase = SignalDatabase.recipients
         recipientDatabase.setColor(recipientId, chatColors)
         onSaved()
       }

app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorsOptionsLiveData.kt

@@ -5,14 +5,14 @@ import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.conversation.colors.ChatColors
 import org.thoughtcrime.securesms.conversation.colors.ChatColorsPalette
 import org.thoughtcrime.securesms.database.ChatColorsDatabase
-import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.DatabaseObserver
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.util.concurrent.SerialMonoLifoExecutor
 import java.util.concurrent.Executor
 
 class ChatColorsOptionsLiveData : LiveData<List<ChatColors>>() {
-  private val chatColorsDatabase: ChatColorsDatabase = DatabaseFactory.getChatColorsDatabase(ApplicationDependencies.getApplication())
+  private val chatColorsDatabase: ChatColorsDatabase = SignalDatabase.chatColors
   private val observer: DatabaseObserver.Observer = DatabaseObserver.Observer { refreshChatColors() }
   private val executor: Executor = SerialMonoLifoExecutor(SignalExecutors.BOUNDED)
 

app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorCreatorRepository.kt

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.conversation.colors.ui.custom
 import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.conversation.colors.ChatColors
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -12,9 +12,7 @@ import org.thoughtcrime.securesms.wallpaper.ChatWallpaper
 class CustomChatColorCreatorRepository(private val context: Context) {
   fun loadColors(chatColorsId: ChatColors.Id, consumer: (ChatColors) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val chatColorsDatabase = DatabaseFactory.getChatColorsDatabase(context)
-      val chatColors = chatColorsDatabase.getById(chatColorsId)
-
+      val chatColors = SignalDatabase.chatColors.getById(chatColorsId)
       consumer(chatColors)
     }
   }
@@ -32,16 +30,14 @@ class CustomChatColorCreatorRepository(private val context: Context) {
 
   fun setChatColors(chatColors: ChatColors, consumer: (ChatColors) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val chatColorsDatabase = DatabaseFactory.getChatColorsDatabase(context)
-      val savedColors = chatColorsDatabase.saveChatColors(chatColors)
-
+      val savedColors = SignalDatabase.chatColors.saveChatColors(chatColors)
       consumer(savedColors)
     }
   }
 
   fun getUsageCount(chatColorsId: ChatColors.Id, consumer: (Int) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val recipientsDatabase = DatabaseFactory.getRecipientDatabase(context)
+      val recipientsDatabase = SignalDatabase.recipients
 
       consumer(recipientsDatabase.getColorUsageCount(chatColorsId))
     }

app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardRepository.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import androidx.core.util.Consumer
 import io.reactivex.rxjava3.core.Single
 import org.signal.core.util.concurrent.SignalExecutors
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.database.identity.IdentityRecordList
 import org.thoughtcrime.securesms.database.model.IdentityRecord
@@ -44,7 +44,7 @@ class MultiselectForwardRepository(context: Context) {
     return Single.fromCallable {
       val recipient = Recipient.resolved(recipientId.get())
       if (recipient.isPushV2Group) {
-        val record = DatabaseFactory.getGroupDatabase(context).getGroup(recipient.requireGroupId())
+        val record = SignalDatabase.groups.getGroup(recipient.requireGroupId())
         !(record.isPresent && record.get().isAnnouncementGroup && !record.get().isAdmin(Recipient.self()))
       } else {
         true
@@ -59,7 +59,7 @@ class MultiselectForwardRepository(context: Context) {
     resultHandlers: MultiselectForwardResultHandlers
   ) {
     SignalExecutors.BOUNDED.execute {
-      val threadDatabase: ThreadDatabase = DatabaseFactory.getThreadDatabase(context)
+      val threadDatabase: ThreadDatabase = SignalDatabase.threads
 
       val sharedContactsAndThreads: Set<ShareContactAndThread> = shareContacts
         .asSequence()

app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeRepository.java

@@ -15,8 +15,8 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.crypto.SessionUtil;
 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.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
 import org.thoughtcrime.securesms.database.MessageDatabase;
 import org.thoughtcrime.securesms.database.MmsSmsDatabase;
@@ -82,9 +82,9 @@ final class SafetyNumberChangeRepository {
     try {
       switch (messageType) {
         case MmsSmsDatabase.SMS_TRANSPORT:
-          return DatabaseFactory.getSmsDatabase(context).getMessageRecord(messageId);
+          return SignalDatabase.sms().getMessageRecord(messageId);
         case MmsSmsDatabase.MMS_TRANSPORT:
-          return DatabaseFactory.getMmsDatabase(context).getMessageRecord(messageId);
+          return SignalDatabase.mms().getMessageRecord(messageId);
         default:
           throw new AssertionError("no valid message type specified");
       }
@@ -136,7 +136,7 @@ final class SafetyNumberChangeRepository {
           Log.i(TAG, "Archiving sessions explicitly as they appear to be out of sync.");
           SessionUtil.archiveSession(changedRecipient.getRecipient().getId(), SignalServiceAddress.DEFAULT_DEVICE_ID);
           SessionUtil.archiveSiblingSessions(mismatchAddress);
-          DatabaseFactory.getSenderKeySharedDatabase(context).deleteAllFor(changedRecipient.getRecipient().getId());
+          SignalDatabase.senderKeyShared().deleteAllFor(changedRecipient.getRecipient().getId());
         }
       }
     }
@@ -151,8 +151,8 @@ final class SafetyNumberChangeRepository {
   @WorkerThread
   private void processOutgoingMessageRecord(@NonNull List<ChangedRecipient> changedRecipients, @NonNull MessageRecord messageRecord) {
     Log.d(TAG, "processOutgoingMessageRecord");
-    MessageDatabase smsDatabase = DatabaseFactory.getSmsDatabase(context);
-    MessageDatabase mmsDatabase = DatabaseFactory.getMmsDatabase(context);
+    MessageDatabase smsDatabase = SignalDatabase.sms();
+    MessageDatabase mmsDatabase = SignalDatabase.mms();
 
     for (ChangedRecipient changedRecipient : changedRecipients) {
       RecipientId id          = changedRecipient.getRecipient().getId();

app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerRepository.java

@@ -8,9 +8,9 @@ import androidx.annotation.WorkerThread;
 
 import com.annimon.stream.Stream;
 
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 
@@ -23,8 +23,8 @@ final class MentionsPickerRepository {
   private final GroupDatabase     groupDatabase;
 
   MentionsPickerRepository(@NonNull Context context) {
-    recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
-    groupDatabase     = DatabaseFactory.getGroupDatabase(context);
+    recipientDatabase = SignalDatabase.recipients();
+    groupDatabase     = SignalDatabase.groups();
   }
 
   @WorkerThread

app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java

@@ -36,7 +36,7 @@ import com.google.android.material.snackbar.Snackbar;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.util.task.SnackbarAsyncTask;
 import org.thoughtcrime.securesms.util.views.Stub;
 
@@ -112,13 +112,13 @@ public class ConversationListArchiveFragment extends ConversationListFragment im
   @Override
   @WorkerThread
   protected void archiveThreads(Set<Long> threadIds) {
-    DatabaseFactory.getThreadDatabase(getActivity()).setArchived(threadIds, false);
+    SignalDatabase.threads().setArchived(threadIds, false);
   }
 
   @Override
   @WorkerThread
   protected void reverseArchiveThreads(Set<Long> threadIds) {
-    DatabaseFactory.getThreadDatabase(getActivity()).setArchived(threadIds, true);
+    SignalDatabase.threads().setArchived(threadIds, true);
   }
 
   @SuppressLint("StaticFieldLeak")
@@ -137,12 +137,12 @@ public class ConversationListArchiveFragment extends ConversationListFragment im
     {
       @Override
       protected void executeAction(@Nullable Long parameter) {
-        DatabaseFactory.getThreadDatabase(getActivity()).unarchiveConversation(threadId);
+        SignalDatabase.threads().unarchiveConversation(threadId);
       }
 
       @Override
       protected void reverseAction(@Nullable Long parameter) {
-        DatabaseFactory.getThreadDatabase(getActivity()).archiveConversation(threadId);
+        SignalDatabase.threads().archiveConversation(threadId);
       }
     }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, threadId);
   }

app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java

@@ -13,7 +13,7 @@ import org.signal.core.util.logging.Log;
 import org.signal.paging.PagedDataSource;
 import org.thoughtcrime.securesms.conversationlist.model.Conversation;
 import org.thoughtcrime.securesms.conversationlist.model.ConversationReader;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
@@ -31,7 +31,7 @@ abstract class ConversationListDataSource implements PagedDataSource<Long, Conve
   protected final ThreadDatabase threadDatabase;
 
   protected ConversationListDataSource(@NonNull Context context) {
-    this.threadDatabase = DatabaseFactory.getThreadDatabase(context);
+    this.threadDatabase = SignalDatabase.threads();
   }
 
   public static ConversationListDataSource create(@NonNull Context context, boolean isArchived) {

app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java

@@ -107,8 +107,8 @@ import org.thoughtcrime.securesms.components.voice.VoiceNotePlayerView;
 import org.thoughtcrime.securesms.conversation.ConversationFragment;
 import org.thoughtcrime.securesms.conversationlist.model.Conversation;
 import org.thoughtcrime.securesms.conversationlist.model.UnreadPayments;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessageDatabase.MarkedMessageInfo;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
@@ -447,7 +447,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
   @Override
   public void onContactClicked(@NonNull Recipient contact) {
     SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
-      return DatabaseFactory.getThreadDatabase(getContext()).getThreadIdIfExistsFor(contact.getId());
+      return SignalDatabase.threads().getThreadIdIfExistsFor(contact.getId());
     }, threadId -> {
       hideKeyboard();
       getNavigator().goToConversation(contact.getId(),
@@ -460,7 +460,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
   @Override
   public void onMessageClicked(@NonNull MessageResult message) {
     SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
-      int startingPosition = DatabaseFactory.getMmsSmsDatabase(getContext()).getMessagePositionInConversation(message.getThreadId(), message.getReceivedTimestampMs());
+      int startingPosition = SignalDatabase.mmsSms().getMessagePositionInConversation(message.getThreadId(), message.getReceivedTimestampMs());
       return Math.max(0, startingPosition);
     }, startingPosition -> {
       hideKeyboard();
@@ -798,7 +798,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
     Context context = requireContext();
 
     SignalExecutors.BOUNDED.execute(() -> {
-      List<MarkedMessageInfo> messageIds = DatabaseFactory.getThreadDatabase(context).setAllThreadsRead();
+      List<MarkedMessageInfo> messageIds = SignalDatabase.threads().setAllThreadsRead();
 
       ApplicationDependencies.getMessageNotifier().updateNotification(context);
       MarkReadReceiver.process(context, messageIds);
@@ -809,7 +809,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
     Context context = requireContext();
 
     SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
-      List<MarkedMessageInfo> messageIds = DatabaseFactory.getThreadDatabase(context).setRead(ids, false);
+      List<MarkedMessageInfo> messageIds = SignalDatabase.threads().setRead(ids, false);
 
       ApplicationDependencies.getMessageNotifier().updateNotification(context);
       MarkReadReceiver.process(context, messageIds);
@@ -824,7 +824,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
     Context context = requireContext();
 
     SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
-      DatabaseFactory.getThreadDatabase(context).setForcedUnread(ids);
+      SignalDatabase.threads().setForcedUnread(ids);
       StorageSyncHelper.scheduleSyncForDataChange();
       return null;
     }, none -> {
@@ -902,7 +902,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
 
           @Override
           protected Void doInBackground(Void... params) {
-            DatabaseFactory.getThreadDatabase(getActivity()).deleteConversations(selectedConversations);
+            SignalDatabase.threads().deleteConversations(selectedConversations);
             ApplicationDependencies.getMessageNotifier().updateNotification(requireActivity());
             return null;
           }
@@ -937,7 +937,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
     }
 
     SimpleTask.run(SignalExecutors.BOUNDED, () -> {
-      ThreadDatabase db = DatabaseFactory.getThreadDatabase(ApplicationDependencies.getApplication());
+      ThreadDatabase db = SignalDatabase.threads();
 
       db.pinConversations(toPin);
 
@@ -949,7 +949,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
 
   private void handleUnpin(@NonNull Collection<Long> ids) {
     SimpleTask.run(SignalExecutors.BOUNDED, () -> {
-      ThreadDatabase db = DatabaseFactory.getThreadDatabase(ApplicationDependencies.getApplication());
+      ThreadDatabase db = SignalDatabase.threads();
 
       db.unpinConversations(ids);
 
@@ -978,7 +978,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
                                                     .filter(r -> r.getMuteUntil() != until)
                                                     .map(Recipient::getId)
                                                     .collect(Collectors.toList());
-      DatabaseFactory.getRecipientDatabase(requireContext()).setMuted(recipientIds, until);
+      SignalDatabase.recipients().setMuted(recipientIds, until);
       return null;
     }, unused -> {
       endActionModeIfActive();
@@ -1264,12 +1264,12 @@ public class ConversationListFragment extends MainFragment implements ActionMode
 
   @WorkerThread
   protected void archiveThreads(Set<Long> threadIds) {
-    DatabaseFactory.getThreadDatabase(getActivity()).setArchived(threadIds, true);
+    SignalDatabase.threads().setArchived(threadIds, true);
   }
 
   @WorkerThread
   protected void reverseArchiveThreads(Set<Long> threadIds) {
-    DatabaseFactory.getThreadDatabase(getActivity()).setArchived(threadIds, false);
+    SignalDatabase.threads().setArchived(threadIds, false);
   }
 
   @SuppressLint("StaticFieldLeak")
@@ -1285,7 +1285,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
                                 Snackbar.LENGTH_LONG,
                                 false)
     {
-      private final ThreadDatabase threadDatabase = DatabaseFactory.getThreadDatabase(getActivity());
+      private final ThreadDatabase threadDatabase = SignalDatabase.threads();
 
       private List<Long> pinnedThreadIds;
 

app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.java

@@ -17,8 +17,8 @@ import org.signal.paging.PagingController;
 import org.thoughtcrime.securesms.conversationlist.model.Conversation;
 import org.thoughtcrime.securesms.conversationlist.model.UnreadPayments;
 import org.thoughtcrime.securesms.conversationlist.model.UnreadPaymentsLiveData;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.DatabaseObserver;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.megaphone.Megaphone;
 import org.thoughtcrime.securesms.megaphone.MegaphoneRepository;
@@ -88,12 +88,12 @@ class ConversationListViewModel extends ViewModel {
     };
 
     this.hasNoConversations = LiveDataUtil.mapAsync(pagedData.getData(), conversations -> {
-      pinnedCount = DatabaseFactory.getThreadDatabase(application).getPinnedConversationListCount();
+      pinnedCount = SignalDatabase.threads().getPinnedConversationListCount();
 
       if (conversations.size() > 0) {
         return false;
       } else {
-        return DatabaseFactory.getThreadDatabase(application).getArchivedConversationListCount() == 0;
+        return SignalDatabase.threads().getArchivedConversationListCount() == 0;
       }
     });
 

app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/UnreadPaymentsLiveData.java

@@ -5,9 +5,9 @@ import androidx.annotation.WorkerThread;
 import androidx.lifecycle.LiveData;
 
 import org.signal.core.util.concurrent.SignalExecutors;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.DatabaseObserver;
 import org.thoughtcrime.securesms.database.PaymentDatabase;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.concurrent.SerialMonoLifoExecutor;
@@ -28,7 +28,7 @@ public final class UnreadPaymentsLiveData extends LiveData<Optional<UnreadPaymen
   private final Executor                  executor;
 
   public UnreadPaymentsLiveData() {
-    this.paymentDatabase = DatabaseFactory.getPaymentDatabase(ApplicationDependencies.getApplication());
+    this.paymentDatabase = SignalDatabase.payments();
     this.observer        = this::refreshUnreadPayments;
     this.executor        = new SerialMonoLifoExecutor(SignalExecutors.BOUNDED);
   }

app/src/main/java/org/thoughtcrime/securesms/crypto/SenderKeyUtil.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.storage.SignalSenderKeyStore;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.whispersystems.libsignal.SignalProtocolAddress;
@@ -22,7 +22,7 @@ public final class SenderKeyUtil {
   public static void rotateOurKey(@NonNull Context context, @NonNull DistributionId distributionId) {
     try (SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
       ApplicationDependencies.getSenderKeyStore().deleteAllFor(Recipient.self().requireServiceId(), distributionId);
-      DatabaseFactory.getSenderKeySharedDatabase(context).deleteAllFor(distributionId);
+      SignalDatabase.senderKeyShared().deleteAllFor(distributionId);
     }
   }
 
@@ -31,7 +31,7 @@ public final class SenderKeyUtil {
    */
   public static long getCreateTimeForOurKey(@NonNull Context context, @NonNull DistributionId distributionId) {
     SignalProtocolAddress address = new SignalProtocolAddress(Recipient.self().requireServiceId(), SignalServiceAddress.DEFAULT_DEVICE_ID);
-    return DatabaseFactory.getSenderKeyDatabase(context).getCreatedTime(address, distributionId);
+    return SignalDatabase.senderKeys().getCreatedTime(address, distributionId);
   }
 
   /**
@@ -40,7 +40,7 @@ public final class SenderKeyUtil {
   public static void clearAllState(@NonNull Context context) {
     try (SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
       ApplicationDependencies.getSenderKeyStore().deleteAll();
-      DatabaseFactory.getSenderKeySharedDatabase(context).deleteAll();
+      SignalDatabase.senderKeyShared().deleteAll();
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalProtocolStoreImpl.java

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.crypto.storage;
 
 import android.content.Context;
 
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.libsignal.IdentityKey;
@@ -191,10 +191,10 @@ public class SignalProtocolStoreImpl implements SignalServiceDataStore {
 
   @Override
   public Transaction beginTransaction() {
-    DatabaseFactory.getInstance(context).getRawDatabase().beginTransaction();
+    SignalDatabase.getRawDatabase().beginTransaction();
     return () -> {
-      DatabaseFactory.getInstance(context).getRawDatabase().setTransactionSuccessful();
-      DatabaseFactory.getInstance(context).getRawDatabase().endTransaction();
+      SignalDatabase.getRawDatabase().setTransactionSuccessful();
+      SignalDatabase.getRawDatabase().endTransaction();
     };
   }
 }

app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalSenderKeyStore.java

@@ -4,7 +4,7 @@ import android.content.Context;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.whispersystems.signalservice.api.SignalServiceSenderKeyStore;
 import org.whispersystems.signalservice.api.push.DistributionId;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -34,35 +34,35 @@ public final class SignalSenderKeyStore implements SignalServiceSenderKeyStore {
   @Override
   public void storeSenderKey(@NonNull SignalProtocolAddress sender, @NonNull UUID distributionId, @NonNull SenderKeyRecord record) {
     synchronized (LOCK) {
-      DatabaseFactory.getSenderKeyDatabase(context).store(sender, DistributionId.from(distributionId), record);
+      SignalDatabase.senderKeys().store(sender, DistributionId.from(distributionId), record);
     }
   }
 
   @Override
   public @Nullable SenderKeyRecord loadSenderKey(@NonNull SignalProtocolAddress sender, @NonNull UUID distributionId) {
     synchronized (LOCK) {
-      return DatabaseFactory.getSenderKeyDatabase(context).load(sender, DistributionId.from(distributionId));
+      return SignalDatabase.senderKeys().load(sender, DistributionId.from(distributionId));
     }
   }
 
   @Override
   public Set<SignalProtocolAddress> getSenderKeySharedWith(DistributionId distributionId) {
     synchronized (LOCK) {
-      return DatabaseFactory.getSenderKeySharedDatabase(context).getSharedWith(distributionId);
+      return SignalDatabase.senderKeyShared().getSharedWith(distributionId);
     }
   }
 
   @Override
   public void markSenderKeySharedWith(DistributionId distributionId, Collection<SignalProtocolAddress> addresses) {
     synchronized (LOCK) {
-      DatabaseFactory.getSenderKeySharedDatabase(context).markAsShared(distributionId, addresses);
+      SignalDatabase.senderKeyShared().markAsShared(distributionId, addresses);
     }
   }
 
   @Override
   public void clearSenderKeySharedWith(Collection<SignalProtocolAddress> addresses) {
     synchronized (LOCK) {
-      DatabaseFactory.getSenderKeySharedDatabase(context).deleteAllFor(addresses);
+      SignalDatabase.senderKeyShared().deleteAllFor(addresses);
     }
   }
 
@@ -71,7 +71,7 @@ public final class SignalSenderKeyStore implements SignalServiceSenderKeyStore {
    */
   public void deleteAllFor(@NonNull String addressName, @NonNull DistributionId distributionId) {
     synchronized (LOCK) {
-      DatabaseFactory.getSenderKeyDatabase(context).deleteAllFor(addressName, distributionId);
+      SignalDatabase.senderKeys().deleteAllFor(addressName, distributionId);
     }
   }
 
@@ -80,7 +80,7 @@ public final class SignalSenderKeyStore implements SignalServiceSenderKeyStore {
    */
   public void deleteAll() {
     synchronized (LOCK) {
-      DatabaseFactory.getSenderKeyDatabase(context).deleteAll();
+      SignalDatabase.senderKeys().deleteAll();
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java

@@ -8,9 +8,9 @@ import androidx.annotation.Nullable;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.SessionUtil;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.identity.IdentityRecordList;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
 import org.thoughtcrime.securesms.database.model.IdentityStoreRecord;
@@ -43,7 +43,7 @@ public class TextSecureIdentityKeyStore implements IdentityKeyStore {
   private final Cache   cache;
 
   public TextSecureIdentityKeyStore(Context context) {
-    this(context, DatabaseFactory.getIdentityDatabase(context));
+    this(context, SignalDatabase.identities());
   }
 
   TextSecureIdentityKeyStore(@NonNull Context context, @NonNull IdentityDatabase identityDatabase) {
@@ -92,7 +92,7 @@ public class TextSecureIdentityKeyStore implements IdentityKeyStore {
         cache.save(address.getName(), recipientId, identityKey, verifiedStatus, false, System.currentTimeMillis(), nonBlockingApproval);
         IdentityUtil.markIdentityUpdate(context, recipientId);
         SessionUtil.archiveSiblingSessions(address);
-        DatabaseFactory.getSenderKeySharedDatabase(context).deleteAllFor(recipientId);
+        SignalDatabase.senderKeyShared().deleteAllFor(recipientId);
         return SaveResult.UPDATE;
       }
 

app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.whispersystems.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.state.PreKeyRecord;
 import org.whispersystems.libsignal.state.PreKeyStore;
@@ -31,7 +31,7 @@ public class TextSecurePreKeyStore implements PreKeyStore, SignedPreKeyStore {
   @Override
   public PreKeyRecord loadPreKey(int preKeyId) throws InvalidKeyIdException {
     synchronized (LOCK) {
-      PreKeyRecord preKeyRecord = DatabaseFactory.getPreKeyDatabase(context).getPreKey(preKeyId);
+      PreKeyRecord preKeyRecord = SignalDatabase.preKeys().getPreKey(preKeyId);
 
       if (preKeyRecord == null) throw new InvalidKeyIdException("No such key: " + preKeyId);
       else                      return preKeyRecord;
@@ -41,7 +41,7 @@ public class TextSecurePreKeyStore implements PreKeyStore, SignedPreKeyStore {
   @Override
   public SignedPreKeyRecord loadSignedPreKey(int signedPreKeyId) throws InvalidKeyIdException {
     synchronized (LOCK) {
-      SignedPreKeyRecord signedPreKeyRecord = DatabaseFactory.getSignedPreKeyDatabase(context).getSignedPreKey(signedPreKeyId);
+      SignedPreKeyRecord signedPreKeyRecord = SignalDatabase.signedPreKeys().getSignedPreKey(signedPreKeyId);
 
       if (signedPreKeyRecord == null) throw new InvalidKeyIdException("No such signed prekey: " + signedPreKeyId);
       else                            return signedPreKeyRecord;
@@ -51,41 +51,41 @@ public class TextSecurePreKeyStore implements PreKeyStore, SignedPreKeyStore {
   @Override
   public List<SignedPreKeyRecord> loadSignedPreKeys() {
     synchronized (LOCK) {
-      return DatabaseFactory.getSignedPreKeyDatabase(context).getAllSignedPreKeys();
+      return SignalDatabase.signedPreKeys().getAllSignedPreKeys();
     }
   }
 
   @Override
   public void storePreKey(int preKeyId, PreKeyRecord record) {
     synchronized (LOCK) {
-      DatabaseFactory.getPreKeyDatabase(context).insertPreKey(preKeyId, record);
+      SignalDatabase.preKeys().insertPreKey(preKeyId, record);
     }
   }
 
   @Override
   public void storeSignedPreKey(int signedPreKeyId, SignedPreKeyRecord record) {
     synchronized (LOCK) {
-      DatabaseFactory.getSignedPreKeyDatabase(context).insertSignedPreKey(signedPreKeyId, record);
+      SignalDatabase.signedPreKeys().insertSignedPreKey(signedPreKeyId, record);
     }
   }
 
   @Override
   public boolean containsPreKey(int preKeyId) {
-    return DatabaseFactory.getPreKeyDatabase(context).getPreKey(preKeyId) != null;
+    return SignalDatabase.preKeys().getPreKey(preKeyId) != null;
   }
 
   @Override
   public boolean containsSignedPreKey(int signedPreKeyId) {
-    return DatabaseFactory.getSignedPreKeyDatabase(context).getSignedPreKey(signedPreKeyId) != null;
+    return SignalDatabase.signedPreKeys().getSignedPreKey(signedPreKeyId) != null;
   }
 
   @Override
   public void removePreKey(int preKeyId) {
-    DatabaseFactory.getPreKeyDatabase(context).removePreKey(preKeyId);
+    SignalDatabase.preKeys().removePreKey(preKeyId);
   }
 
   @Override
   public void removeSignedPreKey(int signedPreKeyId) {
-    DatabaseFactory.getSignedPreKeyDatabase(context).removeSignedPreKey(signedPreKeyId);
+    SignalDatabase.signedPreKeys().removeSignedPreKey(signedPreKeyId);
   }
 }

app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java

@@ -6,8 +6,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.SessionDatabase;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.whispersystems.libsignal.NoSessionException;
@@ -36,7 +36,7 @@ public class TextSecureSessionStore implements SignalServiceSessionStore {
   @Override
   public SessionRecord loadSession(@NonNull SignalProtocolAddress address) {
     synchronized (LOCK) {
-      SessionRecord sessionRecord = DatabaseFactory.getSessionDatabase(context).load(address);
+      SessionRecord sessionRecord = SignalDatabase.sessions().load(address);
 
       if (sessionRecord == null) {
         Log.w(TAG, "No existing session information found for " + address);
@@ -50,7 +50,7 @@ public class TextSecureSessionStore implements SignalServiceSessionStore {
   @Override
   public List<SessionRecord> loadExistingSessions(List<SignalProtocolAddress> addresses) throws NoSessionException {
     synchronized (LOCK) {
-      List<SessionRecord> sessionRecords = DatabaseFactory.getSessionDatabase(context).load(addresses);
+      List<SessionRecord> sessionRecords = SignalDatabase.sessions().load(addresses);
 
       if (sessionRecords.size() != addresses.size()) {
         String message = "Mismatch! Asked for " + addresses.size() + " sessions, but only found " + sessionRecords.size() + "!";
@@ -69,14 +69,14 @@ public class TextSecureSessionStore implements SignalServiceSessionStore {
   @Override
   public void storeSession(@NonNull SignalProtocolAddress address, @NonNull SessionRecord record) {
     synchronized (LOCK) {
-      DatabaseFactory.getSessionDatabase(context).store(address, record);
+      SignalDatabase.sessions().store(address, record);
     }
   }
 
   @Override
   public boolean containsSession(SignalProtocolAddress address) {
     synchronized (LOCK) {
-      SessionRecord sessionRecord = DatabaseFactory.getSessionDatabase(context).load(address);
+      SessionRecord sessionRecord = SignalDatabase.sessions().load(address);
 
       return sessionRecord != null &&
              sessionRecord.hasSenderChain() &&
@@ -88,7 +88,7 @@ public class TextSecureSessionStore implements SignalServiceSessionStore {
   public void deleteSession(SignalProtocolAddress address) {
     synchronized (LOCK) {
       Log.w(TAG, "Deleting session for " + address);
-      DatabaseFactory.getSessionDatabase(context).delete(address);
+      SignalDatabase.sessions().delete(address);
     }
   }
 
@@ -96,36 +96,36 @@ public class TextSecureSessionStore implements SignalServiceSessionStore {
   public void deleteAllSessions(String name) {
     synchronized (LOCK) {
       Log.w(TAG, "Deleting all sessions for " + name);
-      DatabaseFactory.getSessionDatabase(context).deleteAllFor(name);
+      SignalDatabase.sessions().deleteAllFor(name);
     }
   }
 
   @Override
   public List<Integer> getSubDeviceSessions(String name) {
     synchronized (LOCK) {
-      return DatabaseFactory.getSessionDatabase(context).getSubDevices(name);
+      return SignalDatabase.sessions().getSubDevices(name);
     }
   }
 
   @Override
   public Set<SignalProtocolAddress> getAllAddressesWithActiveSessions(List<String> addressNames) {
     synchronized (LOCK) {
-      return DatabaseFactory.getSessionDatabase(context)
-                            .getAllFor(addressNames)
-                            .stream()
-                            .filter(row -> isActive(row.getRecord()))
-                            .map(row -> new SignalProtocolAddress(row.getAddress(), row.getDeviceId()))
-                            .collect(Collectors.toSet());
+      return SignalDatabase.sessions()
+                           .getAllFor(addressNames)
+                           .stream()
+                           .filter(row -> isActive(row.getRecord()))
+                           .map(row -> new SignalProtocolAddress(row.getAddress(), row.getDeviceId()))
+                           .collect(Collectors.toSet());
     }
   }
 
   @Override
   public void archiveSession(SignalProtocolAddress address) {
     synchronized (LOCK) {
-      SessionRecord session = DatabaseFactory.getSessionDatabase(context).load(address);
+      SessionRecord session = SignalDatabase.sessions().load(address);
       if (session != null) {
         session.archiveCurrentState();
-        DatabaseFactory.getSessionDatabase(context).store(address, session);
+        SignalDatabase.sessions().store(address, session);
       }
     }
   }
@@ -146,7 +146,7 @@ public class TextSecureSessionStore implements SignalServiceSessionStore {
 
   public void archiveSiblingSessions(@NonNull SignalProtocolAddress address) {
     synchronized (LOCK) {
-      List<SessionDatabase.SessionRow> sessions = DatabaseFactory.getSessionDatabase(context).getAllFor(address.getName());
+      List<SessionDatabase.SessionRow> sessions = SignalDatabase.sessions().getAllFor(address.getName());
 
       for (SessionDatabase.SessionRow row : sessions) {
         if (row.getDeviceId() != address.getDeviceId()) {
@@ -159,7 +159,7 @@ public class TextSecureSessionStore implements SignalServiceSessionStore {
 
   public void archiveAllSessions() {
     synchronized (LOCK) {
-      List<SessionDatabase.SessionRow> sessions = DatabaseFactory.getSessionDatabase(context).getAll();
+      List<SessionDatabase.SessionRow> sessions = SignalDatabase.sessions().getAll();
 
       for (SessionDatabase.SessionRow row : sessions) {
         row.getRecord().archiveCurrentState();

app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java

@@ -47,7 +47,6 @@ import org.thoughtcrime.securesms.crypto.AttachmentSecret;
 import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream;
 import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream;
 import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
 import org.thoughtcrime.securesms.mms.MediaStream;
 import org.thoughtcrime.securesms.mms.MmsException;
@@ -196,7 +195,7 @@ public class AttachmentDatabase extends Database {
 
   private final AttachmentSecret attachmentSecret;
 
-  public AttachmentDatabase(Context context, SQLCipherOpenHelper databaseHelper, AttachmentSecret attachmentSecret) {
+  public AttachmentDatabase(Context context, SignalDatabase databaseHelper, AttachmentSecret attachmentSecret) {
     super(context, databaseHelper);
     this.attachmentSecret = attachmentSecret;
   }
@@ -227,7 +226,7 @@ public class AttachmentDatabase extends Database {
     values.put(TRANSFER_STATE, TRANSFER_PROGRESS_FAILED);
 
     database.update(TABLE_NAME, values, PART_ID_WHERE, attachmentId.toStrings());
-    notifyConversationListeners(DatabaseFactory.getMmsDatabase(context).getThreadIdForMessage(mmsId));
+    notifyConversationListeners(SignalDatabase.mms().getThreadIdForMessage(mmsId));
   }
 
   public @Nullable DatabaseAttachment getAttachment(@NonNull AttachmentId attachmentId)
@@ -425,7 +424,7 @@ public class AttachmentDatabase extends Database {
     database.update(TABLE_NAME, values, MMS_ID + " = ?", new String[] {mmsId + ""});
     notifyAttachmentListeners();
 
-    long threadId = DatabaseFactory.getMmsDatabase(context).getThreadIdForMessage(mmsId);
+    long threadId = SignalDatabase.mms().getThreadIdForMessage(mmsId);
     if (threadId > 0) {
       notifyConversationListeners(threadId);
     }
@@ -487,7 +486,7 @@ public class AttachmentDatabase extends Database {
       }
     }
 
-    filesInDb.addAll(DatabaseFactory.getStickerDatabase(context).getAllStickerFiles());
+    filesInDb.addAll(SignalDatabase.stickers().getAllStickerFiles());
 
     Set<String> onDiskButNotInDatabase = SetUtil.difference(filesOnDisk, filesInDb);
 
@@ -618,8 +617,8 @@ public class AttachmentDatabase extends Database {
       //noinspection ResultOfMethodCallIgnored
       dataInfo.file.delete();
     } else {
-      long threadId = DatabaseFactory.getMmsDatabase(context).getThreadIdForMessage(mmsId);
-      DatabaseFactory.getThreadDatabase(context).updateSnippetUriSilently(threadId, PartAuthority.getAttachmentDataUri(attachmentId));
+      long threadId = SignalDatabase.mms().getThreadIdForMessage(mmsId);
+      SignalDatabase.threads().updateSnippetUriSilently(threadId, PartAuthority.getAttachmentDataUri(attachmentId));
 
       notifyConversationListeners(threadId);
       notifyConversationListListeners();
@@ -938,7 +937,7 @@ public class AttachmentDatabase extends Database {
     values.put(TRANSFER_STATE, TRANSFER_PROGRESS_DONE);
     database.update(TABLE_NAME, values, PART_ID_WHERE, ((DatabaseAttachment)attachment).getAttachmentId().toStrings());
 
-    notifyConversationListeners(DatabaseFactory.getMmsDatabase(context).getThreadIdForMessage(messageId));
+    notifyConversationListeners(SignalDatabase.mms().getThreadIdForMessage(messageId));
   }
 
   public void setTransferState(long messageId, @NonNull Attachment attachment, int transferState) {
@@ -955,7 +954,7 @@ public class AttachmentDatabase extends Database {
 
     values.put(TRANSFER_STATE, transferState);
     database.update(TABLE_NAME, values, PART_ID_WHERE, attachmentId.toStrings());
-    notifyConversationListeners(DatabaseFactory.getMmsDatabase(context).getThreadIdForMessage(messageId));
+    notifyConversationListeners(SignalDatabase.mms().getThreadIdForMessage(messageId));
   }
 
   /**

app/src/main/java/org/thoughtcrime/securesms/database/ChatColorsDatabase.kt

@@ -4,14 +4,13 @@ import android.content.ContentValues
 import android.content.Context
 import android.database.Cursor
 import org.thoughtcrime.securesms.conversation.colors.ChatColors
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.database.model.databaseprotos.ChatColor
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.CursorUtil
 import org.thoughtcrime.securesms.util.SqlUtil
 
-class ChatColorsDatabase(context: Context, databaseHelper: SQLCipherOpenHelper) : Database(context, databaseHelper) {
+class ChatColorsDatabase(context: Context, databaseHelper: SignalDatabase) : Database(context, databaseHelper) {
 
   companion object {
     private const val TABLE_NAME = "chat_colors"
@@ -103,8 +102,7 @@ class ChatColorsDatabase(context: Context, databaseHelper: SQLCipherOpenHelper)
       SignalStore.chatColorsValues().chatColors = chatColors
     }
 
-    val recipientDatabase = DatabaseFactory.getRecipientDatabase(context)
-    recipientDatabase.onUpdatedChatColors(chatColors)
+    SignalDatabase.recipients.onUpdatedChatColors(chatColors)
     notifyListeners()
 
     return chatColors
@@ -122,8 +120,7 @@ class ChatColorsDatabase(context: Context, databaseHelper: SQLCipherOpenHelper)
       SignalStore.chatColorsValues().chatColors = null
     }
 
-    val recipientDatabase = DatabaseFactory.getRecipientDatabase(context)
-    recipientDatabase.onDeletedChatColors(chatColors)
+    SignalDatabase.recipients.onDeletedChatColors(chatColors)
     notifyListeners()
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/Database.java

@@ -17,12 +17,7 @@
 package org.thoughtcrime.securesms.database;
 
 import android.content.Context;
-import android.database.ContentObserver;
-import android.database.Cursor;
 
-import androidx.annotation.NonNull;
-
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 
 import java.util.Set;
@@ -32,10 +27,10 @@ public abstract class Database {
   protected static final String   ID_WHERE = "_id = ?";
   protected static final String[] COUNT    = new String[] { "COUNT(*)" };
 
-  protected       SQLCipherOpenHelper databaseHelper;
-  protected final Context             context;
+  protected       SignalDatabase databaseHelper;
+  protected final Context        context;
 
-  public Database(Context context, SQLCipherOpenHelper databaseHelper) {
+  public Database(Context context, SignalDatabase databaseHelper) {
     this.context        = context;
     this.databaseHelper = databaseHelper;
   }
@@ -76,7 +71,7 @@ public abstract class Database {
     ApplicationDependencies.getDatabaseObserver().notifyAttachmentObservers();
   }
 
-  public void reset(SQLCipherOpenHelper databaseHelper) {
+  public void reset(SignalDatabase databaseHelper) {
     this.databaseHelper = databaseHelper;
   }
 }

app/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java

@@ -1,333 +0,0 @@
-/*
- * Copyright (C) 2018 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms.database;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-import net.zetetic.database.sqlcipher.SQLiteDatabase;
-
-import org.thoughtcrime.securesms.contacts.ContactsDatabase;
-import org.thoughtcrime.securesms.crypto.AttachmentSecret;
-import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
-import org.thoughtcrime.securesms.crypto.DatabaseSecret;
-import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider;
-import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.database.helpers.ClassicOpenHelper;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherMigrationHelper;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
-import org.thoughtcrime.securesms.database.model.AvatarPickerDatabase;
-import org.thoughtcrime.securesms.migrations.LegacyMigrationJob;
-import org.thoughtcrime.securesms.util.SqlUtil;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-
-import java.io.Closeable;
-import java.io.IOException;
-
-public class DatabaseFactory {
-
-  private static final Object lock = new Object();
-
-  private static volatile DatabaseFactory instance;
-
-  private final SQLCipherOpenHelper         databaseHelper;
-  private final SmsDatabase                 sms;
-  private final MmsDatabase                 mms;
-  private final AttachmentDatabase          attachments;
-  private final MediaDatabase               media;
-  private final ThreadDatabase              thread;
-  private final MmsSmsDatabase              mmsSmsDatabase;
-  private final IdentityDatabase            identityDatabase;
-  private final DraftDatabase               draftDatabase;
-  private final PushDatabase                pushDatabase;
-  private final GroupDatabase               groupDatabase;
-  private final RecipientDatabase           recipientDatabase;
-  private final ContactsDatabase            contactsDatabase;
-  private final GroupReceiptDatabase        groupReceiptDatabase;
-  private final OneTimePreKeyDatabase       preKeyDatabase;
-  private final SignedPreKeyDatabase        signedPreKeyDatabase;
-  private final SessionDatabase             sessionDatabase;
-  private final SenderKeyDatabase           senderKeyDatabase;
-  private final SenderKeySharedDatabase     senderKeySharedDatabase;
-  private final PendingRetryReceiptDatabase pendingRetryReceiptDatabase;
-  private final SearchDatabase              searchDatabase;
-  private final StickerDatabase             stickerDatabase;
-  private final UnknownStorageIdDatabase    storageIdDatabase;
-  private final RemappedRecordsDatabase     remappedRecordsDatabase;
-  private final MentionDatabase             mentionDatabase;
-  private final PaymentDatabase             paymentDatabase;
-  private final ChatColorsDatabase          chatColorsDatabase;
-  private final EmojiSearchDatabase         emojiSearchDatabase;
-  private final MessageSendLogDatabase      messageSendLogDatabase;
-  private final AvatarPickerDatabase        avatarPickerDatabase;
-  private final GroupCallRingDatabase       groupCallRingDatabase;
-  private final ReactionDatabase            reactionDatabase;
-
-  public static DatabaseFactory getInstance(Context context) {
-    if (instance == null) {
-      synchronized (lock) {
-        if (instance == null) {
-          instance = new DatabaseFactory(context.getApplicationContext());
-        }
-      }
-    }
-    return instance;
-  }
-
-  public static MmsSmsDatabase getMmsSmsDatabase(Context context) {
-    return getInstance(context).mmsSmsDatabase;
-  }
-
-  public static ThreadDatabase getThreadDatabase(Context context) {
-    return getInstance(context).thread;
-  }
-
-  public static MessageDatabase getSmsDatabase(Context context) {
-    return getInstance(context).sms;
-  }
-
-  public static MessageDatabase getMmsDatabase(Context context) {
-    return getInstance(context).mms;
-  }
-
-  public static AttachmentDatabase getAttachmentDatabase(Context context) {
-    return getInstance(context).attachments;
-  }
-
-  public static MediaDatabase getMediaDatabase(Context context) {
-    return getInstance(context).media;
-  }
-
-  public static IdentityDatabase getIdentityDatabase(Context context) {
-    return getInstance(context).identityDatabase;
-  }
-
-  public static DraftDatabase getDraftDatabase(Context context) {
-    return getInstance(context).draftDatabase;
-  }
-
-  /**
-   * @deprecated You probably shouldn't be using this anymore. It used to store encrypted envelopes,
-   *             but now it's skipped over in favor of other mechanisms. It's only accessible to
-   *             support old migrations and stuff.
-   */
-  @Deprecated
-  public static PushDatabase getPushDatabase(Context context) {
-    return getInstance(context).pushDatabase;
-  }
-
-  public static GroupDatabase getGroupDatabase(Context context) {
-    return getInstance(context).groupDatabase;
-  }
-
-  public static RecipientDatabase getRecipientDatabase(Context context) {
-    return getInstance(context).recipientDatabase;
-  }
-
-  public static ContactsDatabase getContactsDatabase(Context context) {
-    return getInstance(context).contactsDatabase;
-  }
-
-  public static GroupReceiptDatabase getGroupReceiptDatabase(Context context) {
-    return getInstance(context).groupReceiptDatabase;
-  }
-
-  public static OneTimePreKeyDatabase getPreKeyDatabase(Context context) {
-    return getInstance(context).preKeyDatabase;
-  }
-
-  public static SignedPreKeyDatabase getSignedPreKeyDatabase(Context context) {
-    return getInstance(context).signedPreKeyDatabase;
-  }
-
-  public static SessionDatabase getSessionDatabase(Context context) {
-    return getInstance(context).sessionDatabase;
-  }
-
-  public static SenderKeyDatabase getSenderKeyDatabase(Context context) {
-    return getInstance(context).senderKeyDatabase;
-  }
-
-  public static SenderKeySharedDatabase getSenderKeySharedDatabase(Context context) {
-    return getInstance(context).senderKeySharedDatabase;
-  }
-
-  public static PendingRetryReceiptDatabase getPendingRetryReceiptDatabase(Context context) {
-    return getInstance(context).pendingRetryReceiptDatabase;
-  }
-
-  public static SearchDatabase getSearchDatabase(Context context) {
-    return getInstance(context).searchDatabase;
-  }
-
-  public static StickerDatabase getStickerDatabase(Context context) {
-    return getInstance(context).stickerDatabase;
-  }
-
-  public static UnknownStorageIdDatabase getUnknownStorageIdDatabase(Context context) {
-    return getInstance(context).storageIdDatabase;
-  }
-
-  public static RemappedRecordsDatabase getRemappedRecordsDatabase(Context context) {
-    return getInstance(context).remappedRecordsDatabase;
-  }
-
-  public static MentionDatabase getMentionDatabase(Context context) {
-    return getInstance(context).mentionDatabase;
-  }
-
-  public static PaymentDatabase getPaymentDatabase(Context context) {
-    return getInstance(context).paymentDatabase;
-  }
-
-  public static ChatColorsDatabase getChatColorsDatabase(Context context) {
-    return getInstance(context).chatColorsDatabase;
-  }
-
-  public static EmojiSearchDatabase getEmojiSearchDatabase(Context context) {
-    return getInstance(context).emojiSearchDatabase;
-  }
-
-  public static MessageSendLogDatabase getMessageLogDatabase(Context context) {
-    return getInstance(context).messageSendLogDatabase;
-  }
-
-  public static AvatarPickerDatabase getAvatarPickerDatabase(Context context) {
-    return getInstance(context).avatarPickerDatabase;
-  }
-
-  public static GroupCallRingDatabase getGroupCallRingDatabase(Context context) {
-    return getInstance(context).groupCallRingDatabase;
-  }
-
-  public static ReactionDatabase getReactionDatabase(Context context) {
-    return getInstance(context).reactionDatabase;
-  }
-
-  public static net.zetetic.database.sqlcipher.SQLiteDatabase getBackupDatabase(Context context) {
-    return getInstance(context).databaseHelper.getRawReadableDatabase();
-  }
-
-  public static void upgradeRestored(Context context, SQLiteDatabase database){
-    synchronized (lock) {
-      getInstance(context).databaseHelper.onUpgrade(database, database.getVersion(), -1);
-      getInstance(context).databaseHelper.markCurrent(database);
-      getInstance(context).sms.deleteAbandonedMessages();
-      getInstance(context).mms.deleteAbandonedMessages();
-      getInstance(context).mms.trimEntriesForExpiredMessages();
-      getInstance(context).getRawDatabase().execSQL("DROP TABLE IF EXISTS key_value");
-      getInstance(context).getRawDatabase().execSQL("DROP TABLE IF EXISTS megaphone");
-      getInstance(context).getRawDatabase().execSQL("DROP TABLE IF EXISTS job_spec");
-      getInstance(context).getRawDatabase().execSQL("DROP TABLE IF EXISTS constraint_spec");
-      getInstance(context).getRawDatabase().execSQL("DROP TABLE IF EXISTS dependency_spec");
-    }
-  }
-
-  public static boolean inTransaction(Context context) {
-    return getInstance(context).databaseHelper.getSignalWritableDatabase().inTransaction();
-  }
-
-  private DatabaseFactory(@NonNull Context context) {
-    SqlCipherLibraryLoader.load();
-
-    DatabaseSecret   databaseSecret   = DatabaseSecretProvider.getOrCreateDatabaseSecret(context);
-    AttachmentSecret attachmentSecret = AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret();
-
-    this.databaseHelper              = new SQLCipherOpenHelper(context, databaseSecret);
-    this.sms                         = new SmsDatabase(context, databaseHelper);
-    this.mms                         = new MmsDatabase(context, databaseHelper);
-    this.attachments                 = new AttachmentDatabase(context, databaseHelper, attachmentSecret);
-    this.media                       = new MediaDatabase(context, databaseHelper);
-    this.thread                      = new ThreadDatabase(context, databaseHelper);
-    this.mmsSmsDatabase              = new MmsSmsDatabase(context, databaseHelper);
-    this.identityDatabase            = new IdentityDatabase(context, databaseHelper);
-    this.draftDatabase               = new DraftDatabase(context, databaseHelper);
-    this.pushDatabase                = new PushDatabase(context, databaseHelper);
-    this.groupDatabase               = new GroupDatabase(context, databaseHelper);
-    this.recipientDatabase           = new RecipientDatabase(context, databaseHelper);
-    this.groupReceiptDatabase        = new GroupReceiptDatabase(context, databaseHelper);
-    this.contactsDatabase            = new ContactsDatabase(context);
-    this.preKeyDatabase              = new OneTimePreKeyDatabase(context, databaseHelper);
-    this.signedPreKeyDatabase        = new SignedPreKeyDatabase(context, databaseHelper);
-    this.sessionDatabase             = new SessionDatabase(context, databaseHelper);
-    this.senderKeyDatabase           = new SenderKeyDatabase(context, databaseHelper);
-    this.senderKeySharedDatabase     = new SenderKeySharedDatabase(context, databaseHelper);
-    this.pendingRetryReceiptDatabase = new PendingRetryReceiptDatabase(context, databaseHelper);
-    this.searchDatabase              = new SearchDatabase(context, databaseHelper);
-    this.stickerDatabase             = new StickerDatabase(context, databaseHelper, attachmentSecret);
-    this.storageIdDatabase           = new UnknownStorageIdDatabase(context, databaseHelper);
-    this.remappedRecordsDatabase     = new RemappedRecordsDatabase(context, databaseHelper);
-    this.mentionDatabase             = new MentionDatabase(context, databaseHelper);
-    this.paymentDatabase             = new PaymentDatabase(context, databaseHelper);
-    this.chatColorsDatabase          = new ChatColorsDatabase(context, databaseHelper);
-    this.emojiSearchDatabase         = new EmojiSearchDatabase(context, databaseHelper);
-    this.messageSendLogDatabase      = new MessageSendLogDatabase(context, databaseHelper);
-    this.avatarPickerDatabase        = new AvatarPickerDatabase(context, databaseHelper);
-    this.groupCallRingDatabase       = new GroupCallRingDatabase(context, databaseHelper);
-    this.reactionDatabase            = new ReactionDatabase(context, databaseHelper);
-  }
-
-  public void onApplicationLevelUpgrade(@NonNull Context context, @NonNull MasterSecret masterSecret,
-                                        int fromVersion, LegacyMigrationJob.DatabaseUpgradeListener listener)
-  {
-    databaseHelper.getSignalWritableDatabase();
-
-    ClassicOpenHelper legacyOpenHelper = null;
-
-    if (fromVersion < LegacyMigrationJob.ASYMMETRIC_MASTER_SECRET_FIX_VERSION) {
-      legacyOpenHelper = new ClassicOpenHelper(context);
-      legacyOpenHelper.onApplicationLevelUpgrade(context, masterSecret, fromVersion, listener);
-    }
-
-    if (fromVersion < LegacyMigrationJob.SQLCIPHER && TextSecurePreferences.getNeedsSqlCipherMigration(context)) {
-      if (legacyOpenHelper == null) {
-        legacyOpenHelper = new ClassicOpenHelper(context);
-      }
-
-      SQLCipherMigrationHelper.migrateCiphertext(context, masterSecret,
-                                                 legacyOpenHelper.getWritableDatabase(),
-                                                 databaseHelper.getRawWritableDatabase(),
-                                                 listener);
-    }
-  }
-
-  public void triggerDatabaseAccess() {
-    databaseHelper.getSignalWritableDatabase();
-  }
-
-  public net.zetetic.database.sqlcipher.SQLiteDatabase getRawDatabase() {
-    return databaseHelper.getRawWritableDatabase();
-  }
-
-  public boolean hasTable(String table) {
-    return SqlUtil.tableExists(databaseHelper.getRawReadableDatabase(), table);
-  }
-
-  public @NonNull Transaction transaction() {
-    getRawDatabase().beginTransaction();
-    return () -> {
-      getRawDatabase().setTransactionSuccessful();
-      getRawDatabase().endTransaction();
-    };
-  }
-
-  public interface Transaction extends Closeable {
-    @Override
-    void close();
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/database/DraftDatabase.java

@@ -10,7 +10,6 @@ import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.util.CursorUtil;
 import org.thoughtcrime.securesms.util.SqlUtil;
 
@@ -35,7 +34,7 @@ public class DraftDatabase extends Database {
     "CREATE INDEX IF NOT EXISTS draft_thread_index ON " + TABLE_NAME + " (" + THREAD_ID + ");",
   };
 
-  public DraftDatabase(Context context, SQLCipherOpenHelper databaseHelper) {
+  public DraftDatabase(Context context, SignalDatabase databaseHelper) {
     super(context, databaseHelper);
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/EmojiSearchDatabase.java

@@ -7,7 +7,6 @@ import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.EmojiSearchData;
 import org.thoughtcrime.securesms.util.CursorUtil;
 import org.thoughtcrime.securesms.util.FtsUtil;
@@ -28,7 +27,7 @@ public class EmojiSearchDatabase extends Database {
 
   public static final String CREATE_TABLE = "CREATE VIRTUAL TABLE " + TABLE_NAME + " USING fts5(" + LABEL + ", " + EMOJI + " UNINDEXED)";
 
-  public EmojiSearchDatabase(@NonNull Context context, @NonNull SQLCipherOpenHelper databaseHelper) {
+  public EmojiSearchDatabase(@NonNull Context context, @NonNull SignalDatabase databaseHelper) {
     super(context, databaseHelper);
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/GroupCallRingDatabase.kt

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.database
 import android.content.ContentValues
 import android.content.Context
 import org.signal.ringrtc.CallManager
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.util.CursorUtil
 import org.thoughtcrime.securesms.util.SqlUtil
 import java.util.concurrent.TimeUnit
@@ -11,7 +10,7 @@ import java.util.concurrent.TimeUnit
 /**
  * Track state of Group Call ring cancellations.
  */
-class GroupCallRingDatabase(context: Context, databaseHelper: SQLCipherOpenHelper) : Database(context, databaseHelper) {
+class GroupCallRingDatabase(context: Context, databaseHelper: SignalDatabase) : Database(context, databaseHelper) {
 
   companion object {
     private val VALID_RING_DURATION = TimeUnit.MINUTES.toMillis(30)

app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java

@@ -22,7 +22,6 @@ import org.signal.storageservice.protos.groups.local.EnabledState;
 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.groups.GroupMasterKey;
 import org.thoughtcrime.securesms.crypto.SenderKeyUtil;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.groups.v2.processing.GroupsV2StateProcessor;
 import org.thoughtcrime.securesms.jobs.RequestGroupV2InfoJob;
@@ -124,7 +123,7 @@ private static final String[] GROUP_PROJECTION = {
 
   static final List<String> TYPED_GROUP_PROJECTION = Stream.of(GROUP_PROJECTION).map(columnName -> TABLE_NAME + "." + columnName).toList();
 
-  public GroupDatabase(Context context, SQLCipherOpenHelper databaseHelper) {
+  public GroupDatabase(Context context, SignalDatabase databaseHelper) {
     super(context, databaseHelper);
   }
 
@@ -145,11 +144,11 @@ private static final String[] GROUP_PROJECTION = {
       if (cursor != null && cursor.moveToNext()) {
         Optional<GroupRecord> groupRecord = getGroup(cursor);
 
-        if (groupRecord.isPresent() && RemappedRecords.getInstance().areAnyRemapped(context, groupRecord.get().getMembers())) {
-          String remaps = RemappedRecords.getInstance().buildRemapDescription(context, groupRecord.get().getMembers());
+        if (groupRecord.isPresent() && RemappedRecords.getInstance().areAnyRemapped(groupRecord.get().getMembers())) {
+          String remaps = RemappedRecords.getInstance().buildRemapDescription(groupRecord.get().getMembers());
           Log.w(TAG, "Found a group with remapped recipients in it's membership list! Updating the list. GroupId: " + groupId + ", Remaps: " + remaps, true);
 
-          Collection<RecipientId> remapped = RemappedRecords.getInstance().remap(context, groupRecord.get().getMembers());
+          Collection<RecipientId> remapped = RemappedRecords.getInstance().remap(groupRecord.get().getMembers());
 
           ContentValues values = new ContentValues();
           values.put(MEMBERS, RecipientId.toSerializedList(remapped));
@@ -540,7 +539,7 @@ private static final String[] GROUP_PROJECTION = {
                       @Nullable GroupMasterKey groupMasterKey,
                       @Nullable DecryptedGroup groupState)
   {
-    RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
+    RecipientDatabase recipientDatabase = SignalDatabase.recipients();
     RecipientId       groupRecipientId  = recipientDatabase.getOrInsertFromGroupId(groupId);
     List<RecipientId> members           = new ArrayList<>(new HashSet<>(memberCollection));
 
@@ -628,7 +627,7 @@ private static final String[] GROUP_PROJECTION = {
                                                 GROUP_ID + " = ?",
                                                 new String[] {groupId.toString()});
 
-    RecipientId groupRecipient = DatabaseFactory.getRecipientDatabase(context).getOrInsertFromGroupId(groupId);
+    RecipientId groupRecipient = SignalDatabase.recipients().getOrInsertFromGroupId(groupId);
     Recipient.live(groupRecipient).refresh();
 
     notifyConversationListListeners();
@@ -674,13 +673,13 @@ private static final String[] GROUP_PROJECTION = {
         throw new AssertionError();
       }
 
-      DatabaseFactory.getRecipientDatabase(context).updateGroupId(groupIdV1, groupIdV2);
+      SignalDatabase.recipients().updateGroupId(groupIdV1, groupIdV2);
 
       update(groupMasterKey, decryptedGroup);
 
-      DatabaseFactory.getSmsDatabase(context).insertGroupV1MigrationEvents(record.getRecipientId(),
-                                                                           threadId,
-                                                                           new GroupMigrationMembershipChange(pendingMembers, droppedMembers));
+      SignalDatabase.sms().insertGroupV1MigrationEvents(record.getRecipientId(),
+                                                        threadId,
+                                                        new GroupMigrationMembershipChange(pendingMembers, droppedMembers));
 
       db.setTransactionSuccessful();
     } finally {
@@ -695,7 +694,7 @@ private static final String[] GROUP_PROJECTION = {
   }
 
   public void update(@NonNull GroupId.V2 groupId, @NonNull DecryptedGroup decryptedGroup) {
-    RecipientDatabase     recipientDatabase   = DatabaseFactory.getRecipientDatabase(context);
+    RecipientDatabase     recipientDatabase   = SignalDatabase.recipients();
     RecipientId           groupRecipientId    = recipientDatabase.getOrInsertFromGroupId(groupId);
     Optional<GroupRecord> existingGroup       = getGroup(groupId);
     String                title               = decryptedGroup.getTitle();
@@ -775,7 +774,7 @@ private static final String[] GROUP_PROJECTION = {
     databaseHelper.getSignalWritableDatabase().update(TABLE_NAME, contentValues, GROUP_ID +  " = ?",
                                                 new String[] {groupId.toString()});
 
-    RecipientId groupRecipient = DatabaseFactory.getRecipientDatabase(context).getOrInsertFromGroupId(groupId);
+    RecipientId groupRecipient = SignalDatabase.recipients().getOrInsertFromGroupId(groupId);
     Recipient.live(groupRecipient).refresh();
   }
 
@@ -789,7 +788,7 @@ private static final String[] GROUP_PROJECTION = {
     databaseHelper.getSignalWritableDatabase().update(TABLE_NAME, contentValues, GROUP_ID +  " = ?",
                                                 new String[] {groupId.toString()});
 
-    RecipientId groupRecipient = DatabaseFactory.getRecipientDatabase(context).getOrInsertFromGroupId(groupId);
+    RecipientId groupRecipient = SignalDatabase.recipients().getOrInsertFromGroupId(groupId);
     Recipient.live(groupRecipient).refresh();
   }
 
@@ -803,7 +802,7 @@ private static final String[] GROUP_PROJECTION = {
     databaseHelper.getSignalWritableDatabase().update(TABLE_NAME, contents, GROUP_ID + " = ?",
                                                 new String[] {groupId.toString()});
 
-    RecipientId groupRecipient = DatabaseFactory.getRecipientDatabase(context).getOrInsertFromGroupId(groupId);
+    RecipientId groupRecipient = SignalDatabase.recipients().getOrInsertFromGroupId(groupId);
     Recipient.live(groupRecipient).refresh();
   }
 
@@ -817,7 +816,7 @@ private static final String[] GROUP_PROJECTION = {
     databaseHelper.getSignalWritableDatabase().update(TABLE_NAME, contents, GROUP_ID + " = ?",
                                                 new String[] {groupId.toString()});
 
-    RecipientId groupRecipient = DatabaseFactory.getRecipientDatabase(context).getOrInsertFromGroupId(groupId);
+    RecipientId groupRecipient = SignalDatabase.recipients().getOrInsertFromGroupId(groupId);
     Recipient.live(groupRecipient).refresh();
   }
 
@@ -899,7 +898,7 @@ private static final String[] GROUP_PROJECTION = {
     List<UUID>        uuids = DecryptedGroupUtil.membersToUuidList(decryptedGroup.getMembersList());
     List<RecipientId> ids   = uuidsToRecipientIds(uuids);
 
-    if (RemappedRecords.getInstance().areAnyRemapped(context, ids)) {
+    if (RemappedRecords.getInstance().areAnyRemapped(ids)) {
       throw new IllegalStateException("Remapped records in group membership!");
     } else {
       return ids;

app/src/main/java/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java

@@ -7,7 +7,6 @@ import android.database.Cursor;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.SqlUtil;
 import org.whispersystems.libsignal.util.Pair;
@@ -16,7 +15,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 
@@ -44,7 +42,7 @@ public class GroupReceiptDatabase extends Database {
       "CREATE INDEX IF NOT EXISTS group_receipt_mms_id_index ON " + TABLE_NAME + " (" + MMS_ID + ");",
   };
 
-  public GroupReceiptDatabase(Context context, SQLCipherOpenHelper databaseHelper) {
+  public GroupReceiptDatabase(Context context, SignalDatabase databaseHelper) {
     super(context, databaseHelper);
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java

@@ -25,7 +25,6 @@ import androidx.annotation.Nullable;
 
 import org.greenrobot.eventbus.EventBus;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
 import org.thoughtcrime.securesms.database.model.IdentityStoreRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
@@ -86,7 +85,7 @@ public class IdentityDatabase extends Database {
     }
   }
 
-  IdentityDatabase(Context context, SQLCipherOpenHelper databaseHelper) {
+  IdentityDatabase(Context context, SignalDatabase databaseHelper) {
     super(context, databaseHelper);
   }
 
@@ -110,7 +109,7 @@ public class IdentityDatabase extends Database {
                                        timestamp,
                                        nonblockingApproval);
       } else if (UuidUtil.isUuid(addressName)) {
-        if (DatabaseFactory.getRecipientDatabase(context).containsPhoneOrUuid(addressName)) {
+        if (SignalDatabase.recipients().containsPhoneOrUuid(addressName)) {
           Recipient recipient = Recipient.external(context, addressName);
 
           if (recipient.hasE164() && !UuidUtil.isUuid(recipient.requireE164())) {
@@ -141,7 +140,7 @@ public class IdentityDatabase extends Database {
                            boolean nonBlockingApproval)
   {
     saveIdentityInternal(addressName, recipientId, identityKey, verifiedStatus, firstUse, timestamp, nonBlockingApproval);
-    DatabaseFactory.getRecipientDatabase(context).markNeedsSync(recipientId);
+    SignalDatabase.recipients().markNeedsSync(recipientId);
   }
 
   public void setApproval(@NonNull String addressName, @NonNull RecipientId recipientId, boolean nonBlockingApproval) {
@@ -152,7 +151,7 @@ public class IdentityDatabase extends Database {
 
     database.update(TABLE_NAME, contentValues, ADDRESS + " = ?", SqlUtil.buildArgs(addressName));
 
-    DatabaseFactory.getRecipientDatabase(context).markNeedsSync(recipientId);
+    SignalDatabase.recipients().markNeedsSync(recipientId);
   }
 
   public void setVerified(@NonNull String addressName, @NonNull RecipientId recipientId, IdentityKey identityKey, VerifiedStatus verifiedStatus) {
@@ -169,7 +168,7 @@ public class IdentityDatabase extends Database {
     if (updated > 0) {
       Optional<IdentityRecord> record = getIdentityRecord(addressName);
       if (record.isPresent()) EventBus.getDefault().post(record.get());
-      DatabaseFactory.getRecipientDatabase(context).markNeedsSync(recipientId);
+      SignalDatabase.recipients().markNeedsSync(recipientId);
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java

@@ -2,14 +2,12 @@ package org.thoughtcrime.securesms.database;
 
 import android.app.Application;
 import android.content.ContentValues;
-import android.content.Context;
 import android.database.Cursor;
 
 import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 
-import net.zetetic.database.sqlcipher.SQLiteDatabaseHook;
 import net.zetetic.database.sqlcipher.SQLiteOpenHelper;
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
@@ -26,7 +24,7 @@ import org.thoughtcrime.securesms.util.CursorUtil;
 import java.util.LinkedList;
 import java.util.List;
 
-public class JobDatabase extends SQLiteOpenHelper implements SignalDatabase {
+public class JobDatabase extends SQLiteOpenHelper implements SignalDatabaseOpenHelper {
 
   private static final String TAG = Log.tag(JobDatabase.class);
 
@@ -117,19 +115,19 @@ public class JobDatabase extends SQLiteOpenHelper implements SignalDatabase {
     db.execSQL(Constraints.CREATE_TABLE);
     db.execSQL(Dependencies.CREATE_TABLE);
 
-    if (DatabaseFactory.getInstance(application).hasTable("job_spec")) {
+    if (SignalDatabase.hasTable("job_spec")) {
       Log.i(TAG, "Found old job_spec table. Migrating data.");
-      migrateJobSpecsFromPreviousDatabase(DatabaseFactory.getInstance(application).getRawDatabase(), db);
+      migrateJobSpecsFromPreviousDatabase(SignalDatabase.getRawDatabase(), db);
     }
 
-    if (DatabaseFactory.getInstance(application).hasTable("constraint_spec")) {
+    if (SignalDatabase.hasTable("constraint_spec")) {
       Log.i(TAG, "Found old constraint_spec table. Migrating data.");
-      migrateConstraintSpecsFromPreviousDatabase(DatabaseFactory.getInstance(application).getRawDatabase(), db);
+      migrateConstraintSpecsFromPreviousDatabase(SignalDatabase.getRawDatabase(), db);
     }
 
-    if (DatabaseFactory.getInstance(application).hasTable("dependency_spec")) {
+    if (SignalDatabase.hasTable("dependency_spec")) {
       Log.i(TAG, "Found old dependency_spec table. Migrating data.");
-      migrateDependencySpecsFromPreviousDatabase(DatabaseFactory.getInstance(application).getRawDatabase(), db);
+      migrateDependencySpecsFromPreviousDatabase(SignalDatabase.getRawDatabase(), db);
     }
   }
 
@@ -375,9 +373,9 @@ public class JobDatabase extends SQLiteOpenHelper implements SignalDatabase {
   }
 
   private void dropTableIfPresent(@NonNull String table) {
-    if (DatabaseFactory.getInstance(application).hasTable(table)) {
+    if (SignalDatabase.hasTable(table)) {
       Log.i(TAG, "Dropping original " + table + " table from the main database.");
-      DatabaseFactory.getInstance(application).getRawDatabase().execSQL("DROP TABLE " + table);
+      SignalDatabase.getRawDatabase().execSQL("DROP TABLE " + table);
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java

@@ -26,7 +26,7 @@ import java.util.Map;
  * This is it's own separate physical database, so it cannot do joins or queries with any other
  * tables.
  */
-public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabase, KeyValuePersistentStorage {
+public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabaseOpenHelper, KeyValuePersistentStorage {
 
   private static final String TAG = Log.tag(KeyValueDatabase.class);
 
@@ -72,9 +72,9 @@ public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabase
 
     db.execSQL(CREATE_TABLE);
 
-    if (DatabaseFactory.getInstance(application).hasTable("key_value")) {
+    if (SignalDatabase.hasTable("key_value")) {
       Log.i(TAG, "Found old key_value table. Migrating data.");
-      migrateDataFromPreviousDatabase(DatabaseFactory.getInstance(application).getRawDatabase(), db);
+      migrateDataFromPreviousDatabase(SignalDatabase.getRawDatabase(), db);
     }
   }
 
@@ -91,9 +91,9 @@ public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabase
     db.setForeignKeyConstraintsEnabled(true);
 
     SignalExecutors.BOUNDED.execute(() -> {
-      if (DatabaseFactory.getInstance(application).hasTable("key_value")) {
+      if (SignalDatabase.hasTable("key_value")) {
         Log.i(TAG, "Dropping original key_value table from the main database.");
-        DatabaseFactory.getInstance(application).getRawDatabase().execSQL("DROP TABLE key_value");
+        SignalDatabase.getRawDatabase().execSQL("DROP TABLE key_value");
       }
     });
   }

app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt

@@ -36,7 +36,7 @@ class LocalMetricsDatabase private constructor(
     SqlCipherDeletingErrorHandler(DATABASE_NAME),
     SqlCipherDatabaseHook()
   ),
-  SignalDatabase {
+  SignalDatabaseOpenHelper {
 
   companion object {
     private val TAG = Log.tag(LocalMetricsDatabase::class.java)

app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt

@@ -38,7 +38,7 @@ class LogDatabase private constructor(
     SqlCipherDeletingErrorHandler(DATABASE_NAME),
     SqlCipherDatabaseHook()
   ),
-  SignalDatabase {
+  SignalDatabaseOpenHelper {
 
   companion object {
     private val TAG = Log.tag(LogDatabase::class.java)

app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java

@@ -1,15 +1,12 @@
 package org.thoughtcrime.securesms.database;
 
 import android.content.Context;
-import android.database.ContentObserver;
 import android.database.Cursor;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.MediaUtil;
 
@@ -85,7 +82,7 @@ public class MediaDatabase extends Database {
                                                                                      AttachmentDatabase.CONTENT_TYPE + " NOT LIKE 'audio/%' AND " +
                                                                                      AttachmentDatabase.CONTENT_TYPE + " NOT LIKE 'text/x-signal-plain'");
 
-  MediaDatabase(Context context, SQLCipherOpenHelper databaseHelper) {
+  MediaDatabase(Context context, SignalDatabase databaseHelper) {
     super(context, databaseHelper);
   }
 
@@ -191,7 +188,7 @@ public class MediaDatabase extends Database {
     }
 
     public static MediaRecord from(@NonNull Context context, @NonNull Cursor cursor) {
-      AttachmentDatabase       attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
+      AttachmentDatabase       attachmentDatabase = SignalDatabase.attachments();
       List<DatabaseAttachment> attachments        = attachmentDatabase.getAttachments(cursor);
       RecipientId              recipientId        = RecipientId.from(cursor.getLong(cursor.getColumnIndexOrThrow(MmsDatabase.RECIPIENT_ID)));
       long                     threadId           = cursor.getLong(cursor.getColumnIndexOrThrow(MmsDatabase.THREAD_ID));

app/src/main/java/org/thoughtcrime/securesms/database/MegaphoneDatabase.java

@@ -26,7 +26,7 @@ import java.util.Set;
 /**
  * IMPORTANT: Writes should only be made through {@link org.thoughtcrime.securesms.megaphone.MegaphoneRepository}.
  */
-public class MegaphoneDatabase extends SQLiteOpenHelper implements SignalDatabase {
+public class MegaphoneDatabase extends SQLiteOpenHelper implements SignalDatabaseOpenHelper {
 
   private static final String TAG = Log.tag(MegaphoneDatabase.class);
 
@@ -76,9 +76,9 @@ public class MegaphoneDatabase extends SQLiteOpenHelper implements SignalDatabas
 
     db.execSQL(CREATE_TABLE);
 
-    if (DatabaseFactory.getInstance(application).hasTable("megaphone")) {
+    if (SignalDatabase.hasTable("megaphone")) {
       Log.i(TAG, "Found old megaphone table. Migrating data.");
-      migrateDataFromPreviousDatabase(DatabaseFactory.getInstance(application).getRawDatabase(), db);
+      migrateDataFromPreviousDatabase(SignalDatabase.getRawDatabase(), db);
     }
   }
 
@@ -95,9 +95,9 @@ public class MegaphoneDatabase extends SQLiteOpenHelper implements SignalDatabas
     db.setForeignKeyConstraintsEnabled(true);
 
     SignalExecutors.BOUNDED.execute(() -> {
-      if (DatabaseFactory.getInstance(application).hasTable("megaphone")) {
+      if (SignalDatabase.hasTable("megaphone")) {
         Log.i(TAG, "Dropping original megaphone table from the main database.");
-        DatabaseFactory.getInstance(application).getRawDatabase().execSQL("DROP TABLE megaphone");
+        SignalDatabase.getRawDatabase().execSQL("DROP TABLE megaphone");
       }
     });
   }

app/src/main/java/org/thoughtcrime/securesms/database/MentionDatabase.java

@@ -10,7 +10,6 @@ import androidx.annotation.Nullable;
 
 import com.annimon.stream.Stream;
 
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.Mention;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.CursorUtil;
@@ -28,7 +27,7 @@ public class MentionDatabase extends Database {
 
   private static final String ID           = "_id";
           static final String THREAD_ID    = "thread_id";
-  private static final String MESSAGE_ID   = "message_id";
+          static final String MESSAGE_ID   = "message_id";
           static final String RECIPIENT_ID = "recipient_id";
   private static final String RANGE_START  = "range_start";
   private static final String RANGE_LENGTH = "range_length";
@@ -45,7 +44,7 @@ public class MentionDatabase extends Database {
     "CREATE INDEX IF NOT EXISTS mention_recipient_id_thread_id_index ON " + TABLE_NAME + " (" + RECIPIENT_ID + ", " + THREAD_ID + ");"
   };
 
-  public MentionDatabase(@NonNull Context context, @NonNull SQLCipherOpenHelper databaseHelper) {
+  public MentionDatabase(@NonNull Context context, @NonNull SignalDatabase databaseHelper) {
     super(context, databaseHelper);
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/MentionUtil.java

@@ -42,7 +42,7 @@ public final class MentionUtil {
   @WorkerThread
   public static @NonNull CharSequence updateBodyWithDisplayNames(@NonNull Context context, @NonNull MessageRecord messageRecord, @NonNull CharSequence body) {
     if (messageRecord.isMms()) {
-      List<Mention> mentions = DatabaseFactory.getMentionDatabase(context).getMentionsForMessage(messageRecord.getId());
+      List<Mention> mentions = SignalDatabase.mentions().getMentionsForMessage(messageRecord.getId());
       CharSequence  updated  = updateBodyAndMentionsWithDisplayNames(context, body, mentions).getBody();
       if (updated != null) {
         return updated;

app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java

@@ -8,9 +8,7 @@ import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.annimon.stream.Stream;
 import com.google.android.mms.pdu_alt.NotificationInd;
-import com.google.protobuf.InvalidProtocolBufferException;
 
 import net.zetetic.database.sqlcipher.SQLiteStatement;
 
@@ -19,12 +17,9 @@ import org.thoughtcrime.securesms.database.documents.Document;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatchSet;
 import org.thoughtcrime.securesms.database.documents.NetworkFailure;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
-import org.thoughtcrime.securesms.database.model.ReactionRecord;
 import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
-import org.thoughtcrime.securesms.database.model.databaseprotos.ReactionList;
 import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange;
 import org.thoughtcrime.securesms.insights.InsightsConstants;
 import org.thoughtcrime.securesms.mms.IncomingMediaMessage;
@@ -47,7 +42,6 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -63,7 +57,7 @@ public abstract class MessageDatabase extends Database implements MmsSmsColumns
   protected static final String   THREAD_ID_WHERE      = THREAD_ID + " = ?";
   protected static final String[] THREAD_ID_PROJECTION = new String[] { THREAD_ID };
 
-  public MessageDatabase(Context context, SQLCipherOpenHelper databaseHelper) {
+  public MessageDatabase(Context context, SignalDatabase databaseHelper) {
     super(context, databaseHelper);
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogDatabase.kt

@@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.database
 
 import android.content.ContentValues
 import android.content.Context
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MessageLogEntry
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -44,7 +43,7 @@ import org.whispersystems.signalservice.internal.push.SignalServiceProtos
  * - We *don't* really need to optimize for retrieval, since that happens very infrequently. In particular, we don't want to slow down inserts in order to
  *   improve retrieval time. That means we shouldn't be adding indexes that optimize for retrieval.
  */
-class MessageSendLogDatabase constructor(context: Context?, databaseHelper: SQLCipherOpenHelper?) : Database(context, databaseHelper) {
+class MessageSendLogDatabase constructor(context: Context?, databaseHelper: SignalDatabase?) : Database(context, databaseHelper) {
 
   companion object {
     @JvmField

app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java

@@ -44,14 +44,12 @@ import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatchSet;
 import org.thoughtcrime.securesms.database.documents.NetworkFailure;
 import org.thoughtcrime.securesms.database.documents.NetworkFailureSet;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.Mention;
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.NotificationMmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.Quote;
-import org.thoughtcrime.securesms.database.model.ReactionRecord;
 import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
@@ -233,7 +231,7 @@ public class MmsDatabase extends MessageDatabase {
 
   private final EarlyReceiptCache earlyDeliveryReceiptCache = new EarlyReceiptCache("MmsDelivery");
 
-  public MmsDatabase(Context context, SQLCipherOpenHelper databaseHelper) {
+  public MmsDatabase(Context context, SignalDatabase databaseHelper) {
     super(context, databaseHelper);
   }
 
@@ -637,7 +635,7 @@ public class MmsDatabase extends MessageDatabase {
                              ID + " = ?",
                              SqlUtil.buildArgs(updatedTimestamp, id));
 
-            DatabaseFactory.getGroupReceiptDatabase(context).update(ourRecipientId, id, status, timestamp);
+            SignalDatabase.groupReceipts().update(ourRecipientId, id, status, timestamp);
 
             threadUpdates.add(new ThreadUpdate(threadId, !isFirstIncrement));
           }
@@ -674,12 +672,12 @@ public class MmsDatabase extends MessageDatabase {
 
   private long getThreadIdFor(@NonNull IncomingMediaMessage retrieved) {
     if (retrieved.getGroupId() != null) {
-      RecipientId groupRecipientId = DatabaseFactory.getRecipientDatabase(context).getOrInsertFromPossiblyMigratedGroupId(retrieved.getGroupId());
+      RecipientId groupRecipientId = SignalDatabase.recipients().getOrInsertFromPossiblyMigratedGroupId(retrieved.getGroupId());
       Recipient   groupRecipients  = Recipient.resolved(groupRecipientId);
-      return DatabaseFactory.getThreadDatabase(context).getOrCreateThreadIdFor(groupRecipients);
+      return SignalDatabase.threads().getOrCreateThreadIdFor(groupRecipients);
     } else {
       Recipient sender = Recipient.resolved(retrieved.getFrom());
-      return DatabaseFactory.getThreadDatabase(context).getOrCreateThreadIdFor(sender);
+      return SignalDatabase.threads().getOrCreateThreadIdFor(sender);
     }
   }
 
@@ -688,7 +686,7 @@ public class MmsDatabase extends MessageDatabase {
                       ? Util.toIsoString(notification.getFrom().getTextString())
                       : "";
     Recipient recipient = Recipient.external(context, fromString);
-    return DatabaseFactory.getThreadDatabase(context).getOrCreateThreadIdFor(recipient);
+    return SignalDatabase.threads().getOrCreateThreadIdFor(recipient);
   }
 
   private Cursor rawQuery(@NonNull String where, @Nullable String[] arguments) {
@@ -753,7 +751,7 @@ public class MmsDatabase extends MessageDatabase {
                  " WHERE " + ID + " = ?", new String[] { id + "" });
 
       if (threadId.isPresent()) {
-        DatabaseFactory.getThreadDatabase(context).updateSnippetTypeSilently(threadId.get());
+        SignalDatabase.threads().updateSnippetTypeSilently(threadId.get());
       }
       db.setTransactionSuccessful();
     } finally {
@@ -849,12 +847,12 @@ public class MmsDatabase extends MessageDatabase {
       values.putNull(SHARED_CONTACTS);
       db.update(TABLE_NAME, values, ID_WHERE, new String[] { String.valueOf(messageId) });
 
-      deletedAttachments = DatabaseFactory.getAttachmentDatabase(context).deleteAttachmentsForMessage(messageId);
-      DatabaseFactory.getMentionDatabase(context).deleteMentionsForMessage(messageId);
-      DatabaseFactory.getMessageLogDatabase(context).deleteAllRelatedToMessage(messageId, true);
+      deletedAttachments = SignalDatabase.attachments().deleteAttachmentsForMessage(messageId);
+      SignalDatabase.mentions().deleteMentionsForMessage(messageId);
+      SignalDatabase.messageLog().deleteAllRelatedToMessage(messageId, true);
 
       threadId = getThreadIdForMessage(messageId);
-      DatabaseFactory.getThreadDatabase(context).update(threadId, false);
+      SignalDatabase.threads().update(threadId, false);
       db.setTransactionSuccessful();
     } finally {
       db.endTransaction();
@@ -927,7 +925,7 @@ public class MmsDatabase extends MessageDatabase {
       db.endTransaction();
     }
 
-    DatabaseFactory.getThreadDatabase(context).update(threadId, false);
+    SignalDatabase.threads().update(threadId, false);
     notifyConversationListeners(threadId);
   }
 
@@ -1034,8 +1032,8 @@ public class MmsDatabase extends MessageDatabase {
 
           database.update(TABLE_NAME, values, ID_WHERE, new String[]{String.valueOf(id)});
 
-          DatabaseFactory.getThreadDatabase(context).updateReadState(threadId);
-          DatabaseFactory.getThreadDatabase(context).setLastSeen(threadId);
+          SignalDatabase.threads().updateReadState(threadId);
+          SignalDatabase.threads().setLastSeen(threadId);
           notifyConversationListeners(threadId);
 
           Long latest = threadToLatestRead.get(threadId);
@@ -1096,16 +1094,16 @@ public class MmsDatabase extends MessageDatabase {
 
     try (Cursor cursor = database.query(AttachmentDatabase.TABLE_NAME, columns, where, null, null, null, null)) {
       while (cursor != null && cursor.moveToNext()) {
-        DatabaseFactory.getAttachmentDatabase(context).deleteAttachment(new AttachmentId(cursor.getLong(0), cursor.getLong(1)));
+        SignalDatabase.attachments().deleteAttachment(new AttachmentId(cursor.getLong(0), cursor.getLong(1)));
       }
     }
 
-    DatabaseFactory.getMentionDatabase(context).deleteAbandonedMentions();
+    SignalDatabase.mentions().deleteAbandonedMentions();
 
     try (Cursor cursor = database.query(ThreadDatabase.TABLE_NAME, new String[] { ThreadDatabase.ID }, ThreadDatabase.EXPIRES_IN + " > 0", null, null, null, null)) {
       while (cursor != null && cursor.moveToNext()) {
-        DatabaseFactory.getThreadDatabase(context).setLastScrolled(cursor.getLong(0), 0);
-        DatabaseFactory.getThreadDatabase(context).update(cursor.getLong(0), false);
+        SignalDatabase.threads().setLastScrolled(cursor.getLong(0), 0);
+        SignalDatabase.threads().update(cursor.getLong(0), false);
       }
     }
   }
@@ -1135,8 +1133,8 @@ public class MmsDatabase extends MessageDatabase {
   public OutgoingMediaMessage getOutgoingMessage(long messageId)
       throws MmsException, NoSuchMessageException
   {
-    AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
-    MentionDatabase    mentionDatabase    = DatabaseFactory.getMentionDatabase(context);
+    AttachmentDatabase attachmentDatabase = SignalDatabase.attachments();
+    MentionDatabase    mentionDatabase    = SignalDatabase.mentions();
     Cursor             cursor             = null;
 
     try {
@@ -1154,7 +1152,7 @@ public class MmsDatabase extends MessageDatabase {
         boolean          viewOnce           = cursor.getLong(cursor.getColumnIndexOrThrow(VIEW_ONCE)) == 1;
         long             recipientId        = cursor.getLong(cursor.getColumnIndexOrThrow(RECIPIENT_ID));
         long             threadId           = cursor.getLong(cursor.getColumnIndexOrThrow(THREAD_ID));
-        int              distributionType   = DatabaseFactory.getThreadDatabase(context).getDistributionType(threadId);
+        int              distributionType   = SignalDatabase.threads().getDistributionType(threadId);
         String           mismatchDocument   = cursor.getString(cursor.getColumnIndexOrThrow(MmsDatabase.MISMATCHED_IDENTITIES));
         String           networkDocument    = cursor.getString(cursor.getColumnIndexOrThrow(MmsDatabase.NETWORK_FAILURE));
 
@@ -1358,8 +1356,8 @@ public class MmsDatabase extends MessageDatabase {
     long messageId = insertMediaMessage(threadId, retrieved.getBody(), retrieved.getAttachments(), quoteAttachments, retrieved.getSharedContacts(), retrieved.getLinkPreviews(), retrieved.getMentions(), contentValues, null, true);
 
     if (!Types.isExpirationTimerUpdate(mailbox)) {
-      DatabaseFactory.getThreadDatabase(context).incrementUnread(threadId, 1);
-      DatabaseFactory.getThreadDatabase(context).update(threadId, true);
+      SignalDatabase.threads().incrementUnread(threadId, 1);
+      SignalDatabase.threads().update(threadId, true);
     }
 
     notifyConversationListeners(threadId);
@@ -1454,10 +1452,10 @@ public class MmsDatabase extends MessageDatabase {
     notifyConversationListeners(threadId);
 
     if (org.thoughtcrime.securesms.util.Util.isDefaultSmsProvider(context)) {
-      DatabaseFactory.getThreadDatabase(context).incrementUnread(threadId, 1);
+      SignalDatabase.threads().incrementUnread(threadId, 1);
     }
 
-    DatabaseFactory.getThreadDatabase(context).update(threadId, true);
+    SignalDatabase.threads().update(threadId, true);
 
     TrimThreadJob.enqueueAsync(threadId);
   }
@@ -1549,7 +1547,7 @@ public class MmsDatabase extends MessageDatabase {
     if (message.getRecipient().isGroup()) {
       OutgoingGroupUpdateMessage outgoingGroupUpdateMessage = (message instanceof OutgoingGroupUpdateMessage) ? (OutgoingGroupUpdateMessage) message : null;
 
-      GroupReceiptDatabase receiptDatabase = DatabaseFactory.getGroupReceiptDatabase(context);
+      GroupReceiptDatabase receiptDatabase = SignalDatabase.groupReceipts();
       Set<RecipientId>     members         = new HashSet<>();
 
       if (outgoingGroupUpdateMessage != null && outgoingGroupUpdateMessage.isV2Group()) {
@@ -1560,7 +1558,7 @@ public class MmsDatabase extends MessageDatabase {
                              .toList());
         members.remove(Recipient.self().getId());
       } else {
-        members.addAll(Stream.of(DatabaseFactory.getGroupDatabase(context).getGroupMembers(message.getRecipient().requireGroupId(), GroupDatabase.MemberSet.FULL_MEMBERS_EXCLUDING_SELF)).map(Recipient::getId).toList());
+        members.addAll(Stream.of(SignalDatabase.groups().getGroupMembers(message.getRecipient().requireGroupId(), GroupDatabase.MemberSet.FULL_MEMBERS_EXCLUDING_SELF)).map(Recipient::getId).toList());
       }
 
       receiptDatabase.insert(members, messageId, defaultReceiptStatus, message.getSentTimeMillis());
@@ -1570,7 +1568,7 @@ public class MmsDatabase extends MessageDatabase {
       }
     }
 
-    DatabaseFactory.getThreadDatabase(context).updateLastSeenAndMarkSentAndLastScrolledSilenty(threadId);
+    SignalDatabase.threads().updateLastSeenAndMarkSentAndLastScrolledSilenty(threadId);
 
     ApplicationDependencies.getDatabaseObserver().notifyMessageInsertObservers(threadId, new MessageId(messageId, true));
     notifyConversationListListeners();
@@ -1603,8 +1601,8 @@ public class MmsDatabase extends MessageDatabase {
       throws MmsException
   {
     SQLiteDatabase     db              = databaseHelper.getSignalWritableDatabase();
-    AttachmentDatabase partsDatabase   = DatabaseFactory.getAttachmentDatabase(context);
-    MentionDatabase    mentionDatabase = DatabaseFactory.getMentionDatabase(context);
+    AttachmentDatabase partsDatabase   = SignalDatabase.attachments();
+    MentionDatabase    mentionDatabase = SignalDatabase.mentions();
 
     boolean mentionsSelf = Stream.of(mentions).filter(m -> Recipient.resolved(m.getRecipientId()).isSelf()).findFirst().isPresent();
 
@@ -1666,8 +1664,8 @@ public class MmsDatabase extends MessageDatabase {
       long contentValuesThreadId = contentValues.getAsLong(THREAD_ID);
 
       if (updateThread) {
-        DatabaseFactory.getThreadDatabase(context).setLastScrolled(contentValuesThreadId, 0);
-        DatabaseFactory.getThreadDatabase(context).update(threadId, true);
+        SignalDatabase.threads().setLastScrolled(contentValuesThreadId, 0);
+        SignalDatabase.threads().update(threadId, true);
       }
     }
   }
@@ -1677,20 +1675,20 @@ public class MmsDatabase extends MessageDatabase {
     Log.d(TAG, "deleteMessage(" + messageId + ")");
 
     long               threadId           = getThreadIdForMessage(messageId);
-    AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
+    AttachmentDatabase attachmentDatabase = SignalDatabase.attachments();
     attachmentDatabase.deleteAttachmentsForMessage(messageId);
 
-    GroupReceiptDatabase groupReceiptDatabase = DatabaseFactory.getGroupReceiptDatabase(context);
+    GroupReceiptDatabase groupReceiptDatabase = SignalDatabase.groupReceipts();
     groupReceiptDatabase.deleteRowsForMessage(messageId);
 
-    MentionDatabase mentionDatabase = DatabaseFactory.getMentionDatabase(context);
+    MentionDatabase mentionDatabase = SignalDatabase.mentions();
     mentionDatabase.deleteMentionsForMessage(messageId);
 
     SQLiteDatabase database = databaseHelper.getSignalWritableDatabase();
     database.delete(TABLE_NAME, ID_WHERE, new String[] {messageId+""});
 
-    DatabaseFactory.getThreadDatabase(context).setLastScrolled(threadId, 0);
-    boolean threadDeleted = DatabaseFactory.getThreadDatabase(context).update(threadId, false);
+    SignalDatabase.threads().setLastScrolled(threadId, 0);
+    boolean threadDeleted = SignalDatabase.threads().update(threadId, false);
     notifyConversationListeners(threadId);
     notifyStickerListeners();
     notifyStickerPackListeners();
@@ -1855,9 +1853,9 @@ public class MmsDatabase extends MessageDatabase {
   @Override
   public void deleteAllThreads() {
     Log.d(TAG, "deleteAllThreads()");
-    DatabaseFactory.getAttachmentDatabase(context).deleteAllAttachments();
-    DatabaseFactory.getGroupReceiptDatabase(context).deleteAllRows();
-    DatabaseFactory.getMentionDatabase(context).deleteAllMentions();
+    SignalDatabase.attachments().deleteAllAttachments();
+    SignalDatabase.groupReceipts().deleteAllRows();
+    SignalDatabase.mentions().deleteAllMentions();
 
     SQLiteDatabase database = databaseHelper.getSignalWritableDatabase();
     database.delete(TABLE_NAME, null, null);
@@ -2111,7 +2109,7 @@ public class MmsDatabase extends MessageDatabase {
       Recipient                recipient          = Recipient.live(RecipientId.from(recipientId)).get();
       Set<IdentityKeyMismatch> mismatches         = getMismatchedIdentities(mismatchDocument);
       Set<NetworkFailure>      networkFailures    = getFailures(networkDocument);
-      List<DatabaseAttachment> attachments        = DatabaseFactory.getAttachmentDatabase(context).getAttachments(cursor);
+      List<DatabaseAttachment> attachments        = SignalDatabase.attachments().getAttachments(cursor);
       List<Contact>            contacts           = getSharedContacts(cursor, attachments);
       Set<Attachment>          contactAttachments = Stream.of(contacts).map(Contact::getAvatarAttachment).withoutNulls().collect(Collectors.toSet());
       List<LinkPreview>        previews           = getLinkPreviews(cursor, attachments);
@@ -2165,7 +2163,7 @@ public class MmsDatabase extends MessageDatabase {
       CharSequence               quoteText        = cursor.getString(cursor.getColumnIndexOrThrow(MmsDatabase.QUOTE_BODY));
       boolean                    quoteMissing     = cursor.getInt(cursor.getColumnIndexOrThrow(MmsDatabase.QUOTE_MISSING)) == 1;
       List<Mention>              quoteMentions    = parseQuoteMentions(context, cursor);
-      List<DatabaseAttachment>   attachments      = DatabaseFactory.getAttachmentDatabase(context).getAttachments(cursor);
+      List<DatabaseAttachment>   attachments      = SignalDatabase.attachments().getAttachments(cursor);
       List<? extends Attachment> quoteAttachments = Stream.of(attachments).filter(Attachment::isQuote).toList();
       SlideDeck                  quoteDeck        = new SlideDeck(context, quoteAttachments);
 

app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java

@@ -30,7 +30,6 @@ import net.zetetic.database.sqlcipher.SQLiteQueryBuilder;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.MessageDatabase.SyncMessageId;
 import org.thoughtcrime.securesms.database.MessageDatabase.ThreadUpdate;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.notifications.v2.MessageNotifierV2;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -116,7 +115,7 @@ public class MmsSmsDatabase extends Database {
                                               "ORDER BY " + MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " DESC " +
                                               "LIMIT 1";
 
-  public MmsSmsDatabase(Context context, SQLCipherOpenHelper databaseHelper) {
+  public MmsSmsDatabase(Context context, SignalDatabase databaseHelper) {
     super(context, databaseHelper);
   }
 
@@ -141,8 +140,8 @@ public class MmsSmsDatabase extends Database {
   }
 
   private @NonNull Pair<RecipientId, Long> getGroupAddedBy(long threadId, long lastQuitChecked) {
-    MessageDatabase mmsDatabase = DatabaseFactory.getMmsDatabase(context);
-    MessageDatabase smsDatabase = DatabaseFactory.getSmsDatabase(context);
+    MessageDatabase mmsDatabase = SignalDatabase.mms();
+    MessageDatabase smsDatabase = SignalDatabase.sms();
     long            latestQuit  = mmsDatabase.getLatestGroupQuitTimestamp(threadId, lastQuitChecked);
     RecipientId     id          = smsDatabase.getOldestGroupUpdateSender(threadId, latestQuit);
 
@@ -182,9 +181,9 @@ public class MmsSmsDatabase extends Database {
   }
 
   public @NonNull List<MessageRecord> getMessagesAfterVoiceNoteInclusive(long messageId, long limit) throws NoSuchMessageException {
-    MessageRecord       origin = DatabaseFactory.getMmsDatabase(context).getMessageRecord(messageId);
-    List<MessageRecord> mms    = DatabaseFactory.getMmsDatabase(context).getMessagesInThreadAfterInclusive(origin.getThreadId(), origin.getDateReceived(), limit);
-    List<MessageRecord> sms    = DatabaseFactory.getSmsDatabase(context).getMessagesInThreadAfterInclusive(origin.getThreadId(), origin.getDateReceived(), limit);
+    MessageRecord       origin = SignalDatabase.mms().getMessageRecord(messageId);
+    List<MessageRecord> mms    = SignalDatabase.mms().getMessagesInThreadAfterInclusive(origin.getThreadId(), origin.getDateReceived(), limit);
+    List<MessageRecord> sms    = SignalDatabase.sms().getMessagesInThreadAfterInclusive(origin.getThreadId(), origin.getDateReceived(), limit);
 
     mms.addAll(sms);
     Collections.sort(mms, (a, b) -> Long.compare(a.getDateReceived(), b.getDateReceived()));
@@ -214,9 +213,9 @@ public class MmsSmsDatabase extends Database {
         long    id    = CursorUtil.requireLong(cursor, MmsSmsColumns.ID);
 
         if (isMms) {
-          return DatabaseFactory.getMmsDatabase(context).getMessageRecord(id);
+          return SignalDatabase.mms().getMessageRecord(id);
         } else {
-          return DatabaseFactory.getSmsDatabase(context).getMessageRecord(id);
+          return SignalDatabase.sms().getMessageRecord(id);
         }
       } else {
         throw new NoSuchMessageException("no message");
@@ -275,8 +274,8 @@ public class MmsSmsDatabase extends Database {
   }
 
   public boolean checkMessageExists(@NonNull MessageRecord messageRecord) {
-    MessageDatabase db = messageRecord.isMms() ? DatabaseFactory.getMmsDatabase(context)
-                                               : DatabaseFactory.getSmsDatabase(context);
+    MessageDatabase db = messageRecord.isMms() ? SignalDatabase.mms()
+                                               : SignalDatabase.sms();
 
     try (Cursor cursor = db.getMessageCursor(messageRecord.getId())) {
       return cursor != null && cursor.getCount() > 0;
@@ -288,8 +287,8 @@ public class MmsSmsDatabase extends Database {
       return 0;
     }
 
-    int count = DatabaseFactory.getSmsDatabase(context).getSecureMessageCount(threadId);
-    count    += DatabaseFactory.getMmsDatabase(context).getSecureMessageCount(threadId);
+    int count = SignalDatabase.sms().getSecureMessageCount(threadId);
+    count    += SignalDatabase.mms().getSecureMessageCount(threadId);
 
     return count;
   }
@@ -299,34 +298,34 @@ public class MmsSmsDatabase extends Database {
       return 0;
     }
 
-    int count = DatabaseFactory.getSmsDatabase(context).getOutgoingSecureMessageCount(threadId);
-    count    += DatabaseFactory.getMmsDatabase(context).getOutgoingSecureMessageCount(threadId);
+    int count = SignalDatabase.sms().getOutgoingSecureMessageCount(threadId);
+    count    += SignalDatabase.mms().getOutgoingSecureMessageCount(threadId);
 
     return count;
   }
 
   public int getConversationCount(long threadId) {
-    int count = DatabaseFactory.getSmsDatabase(context).getMessageCountForThread(threadId);
-    count    += DatabaseFactory.getMmsDatabase(context).getMessageCountForThread(threadId);
+    int count = SignalDatabase.sms().getMessageCountForThread(threadId);
+    count    += SignalDatabase.mms().getMessageCountForThread(threadId);
 
     return count;
   }
 
   public int getConversationCount(long threadId, long beforeTime) {
-    return DatabaseFactory.getSmsDatabase(context).getMessageCountForThread(threadId, beforeTime) +
-           DatabaseFactory.getMmsDatabase(context).getMessageCountForThread(threadId, beforeTime);
+    return SignalDatabase.sms().getMessageCountForThread(threadId, beforeTime) +
+           SignalDatabase.mms().getMessageCountForThread(threadId, beforeTime);
   }
 
   public int getInsecureSentCount(long threadId) {
-    int count  = DatabaseFactory.getSmsDatabase(context).getInsecureMessagesSentForThread(threadId);
-    count     += DatabaseFactory.getMmsDatabase(context).getInsecureMessagesSentForThread(threadId);
+    int count  = SignalDatabase.sms().getInsecureMessagesSentForThread(threadId);
+    count     += SignalDatabase.mms().getInsecureMessagesSentForThread(threadId);
 
     return count;
   }
 
   public int getInsecureMessageCountForInsights() {
-    int count = DatabaseFactory.getSmsDatabase(context).getInsecureMessageCountForInsights();
-    count    += DatabaseFactory.getMmsDatabase(context).getInsecureMessageCountForInsights();
+    int count = SignalDatabase.sms().getInsecureMessageCountForInsights();
+    count    += SignalDatabase.mms().getInsecureMessageCountForInsights();
 
     return count;
   }
@@ -344,8 +343,8 @@ public class MmsSmsDatabase extends Database {
   }
 
   public int getSecureMessageCountForInsights() {
-    int count = DatabaseFactory.getSmsDatabase(context).getSecureMessageCountForInsights();
-    count    += DatabaseFactory.getMmsDatabase(context).getSecureMessageCountForInsights();
+    int count = SignalDatabase.sms().getSecureMessageCountForInsights();
+    count    += SignalDatabase.mms().getSecureMessageCountForInsights();
 
     return count;
   }
@@ -355,14 +354,14 @@ public class MmsSmsDatabase extends Database {
       return false;
     }
 
-    return DatabaseFactory.getSmsDatabase(context).hasMeaningfulMessage(threadId) ||
-           DatabaseFactory.getMmsDatabase(context).hasMeaningfulMessage(threadId);
+    return SignalDatabase.sms().hasMeaningfulMessage(threadId) ||
+           SignalDatabase.mms().hasMeaningfulMessage(threadId);
   }
 
   public long getThreadForMessageId(long messageId) {
-    long id = DatabaseFactory.getSmsDatabase(context).getThreadIdForMessage(messageId);
+    long id = SignalDatabase.sms().getThreadIdForMessage(messageId);
 
-    if (id == -1) return DatabaseFactory.getMmsDatabase(context).getThreadIdForMessage(messageId);
+    if (id == -1) return SignalDatabase.mms().getThreadIdForMessage(messageId);
     else          return id;
   }
 
@@ -403,7 +402,7 @@ public class MmsSmsDatabase extends Database {
    */
   private boolean incrementReceiptCount(SyncMessageId syncMessageId, long timestamp, @NonNull MessageDatabase.ReceiptType receiptType) {
     SQLiteDatabase    db             = databaseHelper.getSignalWritableDatabase();
-    ThreadDatabase    threadDatabase = DatabaseFactory.getThreadDatabase(context);
+    ThreadDatabase    threadDatabase = SignalDatabase.threads();
     Set<ThreadUpdate> threadUpdates  = new HashSet<>();
 
     db.beginTransaction();
@@ -437,7 +436,7 @@ public class MmsSmsDatabase extends Database {
    */
   private @NonNull Collection<SyncMessageId> incrementReceiptCounts(@NonNull List<SyncMessageId> syncMessageIds, long timestamp, @NonNull MessageDatabase.ReceiptType receiptType) {
     SQLiteDatabase            db             = databaseHelper.getSignalWritableDatabase();
-    ThreadDatabase            threadDatabase = DatabaseFactory.getThreadDatabase(context);
+    ThreadDatabase            threadDatabase = SignalDatabase.threads();
     Set<ThreadUpdate>         threadUpdates  = new HashSet<>();
     Collection<SyncMessageId> unhandled      = new HashSet<>();
 
@@ -484,8 +483,8 @@ public class MmsSmsDatabase extends Database {
   private @NonNull Set<ThreadUpdate> incrementReceiptCountInternal(SyncMessageId syncMessageId, long timestamp, MessageDatabase.ReceiptType receiptType) {
     Set<ThreadUpdate> threadUpdates = new HashSet<>();
 
-    threadUpdates.addAll(DatabaseFactory.getSmsDatabase(context).incrementReceiptCount(syncMessageId, timestamp, receiptType));
-    threadUpdates.addAll(DatabaseFactory.getMmsDatabase(context).incrementReceiptCount(syncMessageId, timestamp, receiptType));
+    threadUpdates.addAll(SignalDatabase.sms().incrementReceiptCount(syncMessageId, timestamp, receiptType));
+    threadUpdates.addAll(SignalDatabase.mms().incrementReceiptCount(syncMessageId, timestamp, receiptType));
 
     return threadUpdates;
   }
@@ -538,7 +537,7 @@ public class MmsSmsDatabase extends Database {
   }
 
   boolean hasReceivedAnyCallsSince(long threadId, long timestamp) {
-    return DatabaseFactory.getSmsDatabase(context).hasReceivedAnyCallsSince(threadId, timestamp);
+    return SignalDatabase.sms().hasReceivedAnyCallsSince(threadId, timestamp);
   }
 
   /**
@@ -576,27 +575,27 @@ public class MmsSmsDatabase extends Database {
   }
 
   public void setNotifiedTimestamp(long timestamp, @NonNull List<Long> smsIds, @NonNull List<Long> mmsIds) {
-    DatabaseFactory.getSmsDatabase(context).setNotifiedTimestamp(timestamp, smsIds);
-    DatabaseFactory.getMmsDatabase(context).setNotifiedTimestamp(timestamp, mmsIds);
+    SignalDatabase.sms().setNotifiedTimestamp(timestamp, smsIds);
+    SignalDatabase.mms().setNotifiedTimestamp(timestamp, mmsIds);
   }
 
   public int deleteMessagesInThreadBeforeDate(long threadId, long trimBeforeDate) {
     Log.d(TAG, "deleteMessagesInThreadBeforeData(" + threadId + ", " + trimBeforeDate + ")");
-    int deletes = DatabaseFactory.getSmsDatabase(context).deleteMessagesInThreadBeforeDate(threadId, trimBeforeDate);
-    deletes += DatabaseFactory.getMmsDatabase(context).deleteMessagesInThreadBeforeDate(threadId, trimBeforeDate);
+    int deletes = SignalDatabase.sms().deleteMessagesInThreadBeforeDate(threadId, trimBeforeDate);
+    deletes += SignalDatabase.mms().deleteMessagesInThreadBeforeDate(threadId, trimBeforeDate);
     return deletes;
   }
 
   public void deleteAbandonedMessages() {
     Log.d(TAG, "deleteAbandonedMessages()");
-    DatabaseFactory.getSmsDatabase(context).deleteAbandonedMessages();
-    DatabaseFactory.getMmsDatabase(context).deleteAbandonedMessages();
+    SignalDatabase.sms().deleteAbandonedMessages();
+    SignalDatabase.mms().deleteAbandonedMessages();
   }
 
   public @NonNull List<MessageDatabase.ReportSpamData> getReportSpamMessageServerData(long threadId, long timestamp, int limit) {
     List<MessageDatabase.ReportSpamData> data = new ArrayList<>();
-    data.addAll(DatabaseFactory.getSmsDatabase(context).getReportSpamMessageServerGuids(threadId, timestamp));
-    data.addAll(DatabaseFactory.getMmsDatabase(context).getReportSpamMessageServerGuids(threadId, timestamp));
+    data.addAll(SignalDatabase.sms().getReportSpamMessageServerGuids(threadId, timestamp));
+    data.addAll(SignalDatabase.mms().getReportSpamMessageServerGuids(threadId, timestamp));
     return data.stream()
                .sorted((l, r) -> -Long.compare(l.getDateReceived(), r.getDateReceived()))
                .limit(limit)

app/src/main/java/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java

@@ -8,7 +8,6 @@ import android.database.Cursor;
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.util.Base64;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.ecc.Curve;
@@ -35,7 +34,7 @@ public class OneTimePreKeyDatabase extends Database {
       PUBLIC_KEY + " TEXT NOT NULL, " +
       PRIVATE_KEY + " TEXT NOT NULL);";
 
-  OneTimePreKeyDatabase(Context context, SQLCipherOpenHelper databaseHelper) {
+  OneTimePreKeyDatabase(Context context, SignalDatabase databaseHelper) {
     super(context, databaseHelper);
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/PaymentDatabase.java

@@ -15,7 +15,6 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import com.mobilecoin.lib.exceptions.SerializationException;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.databaseprotos.CryptoValue;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.payments.CryptoValueUtil;
@@ -31,7 +30,6 @@ import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.CursorUtil;
 import org.thoughtcrime.securesms.util.SqlUtil;
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
-import org.whispersystems.signalservice.api.InvalidMessageStructureException;
 import org.whispersystems.signalservice.api.payments.Money;
 
 import java.util.Arrays;
@@ -93,7 +91,7 @@ public final class PaymentDatabase extends Database {
 
   private final MutableLiveData<Object> changeSignal;
 
-  PaymentDatabase(@NonNull Context context, @NonNull SQLCipherOpenHelper databaseHelper) {
+  PaymentDatabase(@NonNull Context context, @NonNull SignalDatabase databaseHelper) {
     super(context, databaseHelper);
 
     this.changeSignal = new MutableLiveData<>(new Object());

app/src/main/java/org/thoughtcrime/securesms/database/PendingRetryReceiptCache.kt

@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.util.FeatureFlags
 class PendingRetryReceiptCache @VisibleForTesting constructor(
   private val database: PendingRetryReceiptDatabase
 ) {
-  constructor(context: Context) : this(DatabaseFactory.getPendingRetryReceiptDatabase(context))
+  constructor(context: Context) : this(SignalDatabase.pendingRetryReceipts)
 
   private val pendingRetries: MutableMap<RemoteMessageId, PendingRetryReceiptModel> = HashMap()
   private var populated: Boolean = false

app/src/main/java/org/thoughtcrime/securesms/database/PendingRetryReceiptDatabase.java

@@ -8,7 +8,6 @@ import androidx.annotation.NonNull;
 
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.PendingRetryReceiptModel;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.CursorUtil;
@@ -41,7 +40,7 @@ public final class PendingRetryReceiptDatabase extends Database {
                                                                                  THREAD_ID          + " INTEGER NOT NULL, " +
                                                                                  "UNIQUE(" + AUTHOR + "," + SENT_TIMESTAMP + ") ON CONFLICT REPLACE);";
 
-  PendingRetryReceiptDatabase(Context context, SQLCipherOpenHelper databaseHelper) {
+  PendingRetryReceiptDatabase(Context context, SignalDatabase databaseHelper) {
     super(context, databaseHelper);
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java

@@ -6,8 +6,6 @@ import android.database.Cursor;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
-
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.util.Base64;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -47,7 +45,7 @@ public class PushDatabase extends Database {
                                                                                   SERVER_DELIVERED_TIMESTAMP + " INTEGER DEFAULT 0, " +
                                                                                   SERVER_GUID                + " TEXT DEFAULT NULL);";
 
-  public PushDatabase(Context context, SQLCipherOpenHelper databaseHelper) {
+  public PushDatabase(Context context, SignalDatabase databaseHelper) {
     super(context, databaseHelper);
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/ReactionDatabase.kt

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.database
 import android.content.ContentValues
 import android.content.Context
 import android.database.Cursor
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.ReactionRecord
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
@@ -14,7 +13,7 @@ import org.thoughtcrime.securesms.util.SqlUtil
 /**
  * Store reactions on messages.
  */
-class ReactionDatabase(context: Context, databaseHelper: SQLCipherOpenHelper) : Database(context, databaseHelper) {
+class ReactionDatabase(context: Context, databaseHelper: SignalDatabase) : Database(context, databaseHelper) {
 
   companion object {
     private const val TABLE_NAME = "reaction"
@@ -132,9 +131,9 @@ class ReactionDatabase(context: Context, databaseHelper: SQLCipherOpenHelper) :
       db.insert(TABLE_NAME, null, values)
 
       if (messageId.mms) {
-        DatabaseFactory.getMmsDatabase(context).updateReactionsUnread(db, messageId.id, hasReactions(messageId), false)
+        SignalDatabase.mms.updateReactionsUnread(db, messageId.id, hasReactions(messageId), false)
       } else {
-        DatabaseFactory.getSmsDatabase(context).updateReactionsUnread(db, messageId.id, hasReactions(messageId), false)
+        SignalDatabase.sms.updateReactionsUnread(db, messageId.id, hasReactions(messageId), false)
       }
 
       db.setTransactionSuccessful()
@@ -156,9 +155,9 @@ class ReactionDatabase(context: Context, databaseHelper: SQLCipherOpenHelper) :
       db.delete(TABLE_NAME, query, args)
 
       if (messageId.mms) {
-        DatabaseFactory.getMmsDatabase(context).updateReactionsUnread(db, messageId.id, hasReactions(messageId), true)
+        SignalDatabase.mms.updateReactionsUnread(db, messageId.id, hasReactions(messageId), true)
       } else {
-        DatabaseFactory.getSmsDatabase(context).updateReactionsUnread(db, messageId.id, hasReactions(messageId), true)
+        SignalDatabase.sms.updateReactionsUnread(db, messageId.id, hasReactions(messageId), true)
       }
 
       db.setTransactionSuccessful()

app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java

@@ -32,7 +32,6 @@ import org.thoughtcrime.securesms.conversation.colors.ChatColorsMapper;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
 import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.whispersystems.signalservice.api.push.ACI;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
@@ -66,7 +65,6 @@ import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.IdentityUtil;
 import org.thoughtcrime.securesms.util.SqlUtil;
 import org.thoughtcrime.securesms.util.StringUtil;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaper;
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaperFactory;
@@ -98,7 +96,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
@@ -393,7 +390,7 @@ public class RecipientDatabase extends Database {
       ThreadDatabase.TABLE_NAME + "." + ThreadDatabase.DATE + " > ?" +
       " ORDER BY " + ThreadDatabase.TABLE_NAME + "." + ThreadDatabase.DATE + " DESC LIMIT 50";
 
-  public RecipientDatabase(Context context, SQLCipherOpenHelper databaseHelper) {
+  public RecipientDatabase(Context context, SignalDatabase databaseHelper) {
     super(context, databaseHelper);
   }
 
@@ -626,9 +623,9 @@ public class RecipientDatabase extends Database {
 
     if (existing.isPresent()) {
       return existing.get();
-    } else if (groupId.isV1() && DatabaseFactory.getGroupDatabase(context).groupExists(groupId.requireV1().deriveV2MigrationGroupId())) {
+    } else if (groupId.isV1() && SignalDatabase.groups().groupExists(groupId.requireV1().deriveV2MigrationGroupId())) {
       throw new GroupDatabase.LegacyGroupInsertException(groupId);
-    } else if (groupId.isV2() && DatabaseFactory.getGroupDatabase(context).getGroupV1ByExpectedV2(groupId.requireV2()).isPresent()) {
+    } else if (groupId.isV2() && SignalDatabase.groups().getGroupV1ByExpectedV2(groupId.requireV2()).isPresent()) {
       throw new GroupDatabase.MissedGroupMigrationInsertException(groupId);
     } else {
       ContentValues values = new ContentValues();
@@ -642,9 +639,9 @@ public class RecipientDatabase extends Database {
 
         if (existing.isPresent()) {
           return existing.get();
-        } else if (groupId.isV1() && DatabaseFactory.getGroupDatabase(context).groupExists(groupId.requireV1().deriveV2MigrationGroupId())) {
+        } else if (groupId.isV1() && SignalDatabase.groups().groupExists(groupId.requireV1().deriveV2MigrationGroupId())) {
           throw new GroupDatabase.LegacyGroupInsertException(groupId);
-        } else if (groupId.isV2() && DatabaseFactory.getGroupDatabase(context).getGroupV1ByExpectedV2(groupId.requireV2()).isPresent()) {
+        } else if (groupId.isV2() && SignalDatabase.groups().getGroupV1ByExpectedV2(groupId.requireV2()).isPresent()) {
           throw new GroupDatabase.MissedGroupMigrationInsertException(groupId);
         } else {
           throw new AssertionError("Failed to insert recipient!");
@@ -696,7 +693,7 @@ public class RecipientDatabase extends Database {
       }
 
       if (groupId.isV2()) {
-        Optional<GroupDatabase.GroupRecord> v1 = DatabaseFactory.getGroupDatabase(context).getGroupV1ByExpectedV2(groupId.requireV2());
+        Optional<GroupDatabase.GroupRecord> v1 = SignalDatabase.groups().getGroupV1ByExpectedV2(groupId.requireV2());
         if (v1.isPresent()) {
           db.setTransactionSuccessful();
           return v1.get().getRecipientId();
@@ -740,7 +737,7 @@ public class RecipientDatabase extends Database {
       if (cursor != null && cursor.moveToNext()) {
         return getRecipientSettings(context, cursor);
       } else {
-        Optional<RecipientId> remapped = RemappedRecords.getInstance().getRecipient(context, id);
+        Optional<RecipientId> remapped = RemappedRecords.getInstance().getRecipient(id);
         if (remapped.isPresent()) {
           Log.w(TAG, "Missing recipient for " + id + ", but found it in the remapped records as " + remapped.get());
           return getRecipientSettings(remapped.get());
@@ -822,7 +819,7 @@ public class RecipientDatabase extends Database {
 
   public void applyStorageSyncContactInsert(@NonNull SignalContactRecord insert) {
     SQLiteDatabase   db               = databaseHelper.getSignalWritableDatabase();
-    ThreadDatabase   threadDatabase   = DatabaseFactory.getThreadDatabase(context);
+    ThreadDatabase   threadDatabase   = SignalDatabase.threads();
 
     ContentValues values      = getValuesForStorageContact(insert, true);
     long          id          = db.insertWithOnConflict(TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_IGNORE);
@@ -840,7 +837,7 @@ public class RecipientDatabase extends Database {
       try {
         IdentityKey identityKey = new IdentityKey(insert.getIdentityKey().get(), 0);
 
-        DatabaseFactory.getIdentityDatabase(context).updateIdentityAfterSync(insert.getAddress().getIdentifier(), recipientId, identityKey, StorageSyncModels.remoteToLocalIdentityStatus(insert.getIdentityState()));
+        SignalDatabase.identities().updateIdentityAfterSync(insert.getAddress().getIdentifier(), recipientId, identityKey, StorageSyncModels.remoteToLocalIdentityStatus(insert.getIdentityState()));
       } catch (InvalidKeyException e) {
         Log.w(TAG, "Failed to process identity key during insert! Skipping.", e);
       }
@@ -884,7 +881,7 @@ public class RecipientDatabase extends Database {
 
       if (update.getNew().getIdentityKey().isPresent() && update.getNew().getAddress().hasValidAci()) {
         IdentityKey identityKey = new IdentityKey(update.getNew().getIdentityKey().get(), 0);
-        DatabaseFactory.getIdentityDatabase(context).updateIdentityAfterSync(update.getNew().getAddress().getIdentifier(), recipientId, identityKey, StorageSyncModels.remoteToLocalIdentityStatus(update.getNew().getIdentityState()));
+        SignalDatabase.identities().updateIdentityAfterSync(update.getNew().getAddress().getIdentifier(), recipientId, identityKey, StorageSyncModels.remoteToLocalIdentityStatus(update.getNew().getIdentityState()));
       }
 
       Optional<IdentityRecord> newIdentityRecord = identityStore.getIdentityRecord(recipientId);
@@ -902,7 +899,7 @@ public class RecipientDatabase extends Database {
       Log.w(TAG, "Failed to process identity key during update! Skipping.", e);
     }
 
-    DatabaseFactory.getThreadDatabase(context).applyStorageSyncUpdate(recipientId, update.getNew());
+    SignalDatabase.threads().applyStorageSyncUpdate(recipientId, update.getNew());
 
     Recipient.live(recipientId).refresh();
   }
@@ -913,7 +910,7 @@ public class RecipientDatabase extends Database {
     long        id          = db.insertOrThrow(TABLE_NAME, null, getValuesForStorageGroupV1(insert, true));
     RecipientId recipientId = RecipientId.from(id);
 
-    DatabaseFactory.getThreadDatabase(context).applyStorageSyncUpdate(recipientId, insert);
+    SignalDatabase.threads().applyStorageSyncUpdate(recipientId, insert);
 
     Recipient.live(recipientId).refresh();
   }
@@ -930,7 +927,7 @@ public class RecipientDatabase extends Database {
 
     Recipient recipient = Recipient.externalGroupExact(context, GroupId.v1orThrow(update.getOld().getGroupId()));
 
-    DatabaseFactory.getThreadDatabase(context).applyStorageSyncUpdate(recipient.getId(), update.getNew());
+    SignalDatabase.threads().applyStorageSyncUpdate(recipient.getId(), update.getNew());
 
     recipient.live().refresh();
   }
@@ -945,17 +942,17 @@ public class RecipientDatabase extends Database {
     Recipient      recipient = Recipient.externalGroupExact(context, groupId);
 
     Log.i(TAG, "Creating restore placeholder for " + groupId);
-    DatabaseFactory.getGroupDatabase(context)
-                   .create(masterKey,
-                           DecryptedGroup.newBuilder()
-                                         .setRevision(GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION)
-                                         .build());
+    SignalDatabase.groups()
+                  .create(masterKey,
+                          DecryptedGroup.newBuilder()
+                                        .setRevision(GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION)
+                                        .build());
 
     Log.i(TAG, "Scheduling request for latest group info for " + groupId);
 
     ApplicationDependencies.getJobManager().add(new RequestGroupV2InfoJob(groupId));
 
-    DatabaseFactory.getThreadDatabase(context).applyStorageSyncUpdate(recipient.getId(), insert);
+    SignalDatabase.threads().applyStorageSyncUpdate(recipient.getId(), insert);
 
     recipient.live().refresh();
   }
@@ -973,7 +970,7 @@ public class RecipientDatabase extends Database {
     GroupMasterKey masterKey = update.getOld().getMasterKeyOrThrow();
     Recipient      recipient = Recipient.externalGroupExact(context, GroupId.v2(masterKey));
 
-    DatabaseFactory.getThreadDatabase(context).applyStorageSyncUpdate(recipient.getId(), update.getNew());
+    SignalDatabase.threads().applyStorageSyncUpdate(recipient.getId(), update.getNew());
 
     recipient.live().refresh();
   }
@@ -1012,7 +1009,7 @@ public class RecipientDatabase extends Database {
       ApplicationDependencies.getJobManager().add(new RefreshAttributesJob());
     }
 
-    DatabaseFactory.getThreadDatabase(context).applyStorageSyncUpdate(Recipient.self().getId(), update.getNew());
+    SignalDatabase.threads().applyStorageSyncUpdate(Recipient.self().getId(), update.getNew());
 
     Recipient.self().live().refresh();
   }
@@ -1189,7 +1186,7 @@ public class RecipientDatabase extends Database {
       }
     }
 
-    for (GroupId.V2 id : DatabaseFactory.getGroupDatabase(context).getAllGroupV2Ids()) {
+    for (GroupId.V2 id : SignalDatabase.groups().getAllGroupV2Ids()) {
       Recipient         recipient                = Recipient.externalGroupExact(context, id);
       RecipientId       recipientId              = recipient.getId();
       RecipientSettings recipientSettingsForSync = getRecipientSettingsForSync(recipientId);
@@ -1947,7 +1944,7 @@ public class RecipientDatabase extends Database {
     boolean profiledUpdated = update(id, contentValues);
 
     if (profiledUpdated && enabled) {
-      Optional<GroupDatabase.GroupRecord> group = DatabaseFactory.getGroupDatabase(context).getGroup(id);
+      Optional<GroupDatabase.GroupRecord> group = SignalDatabase.groups().getGroup(id);
 
       if (group.isPresent()) {
         setHasGroupsInCommon(group.get().getMembers());
@@ -2687,7 +2684,7 @@ public class RecipientDatabase extends Database {
    * @param limit Only return at most this many contact.
    */
   public List<RecipientId> getRecipientsForRoutineProfileFetch(long lastInteractionThreshold, long lastProfileFetchThreshold, int limit) {
-    ThreadDatabase threadDatabase                       = DatabaseFactory.getThreadDatabase(context);
+    ThreadDatabase threadDatabase                       = SignalDatabase.threads();
     Set<Recipient> recipientsWithinInteractionThreshold = new LinkedHashSet<>();
 
     try (ThreadDatabase.Reader reader = threadDatabase.readerFor(threadDatabase.getRecentPushConversationList(-1, false))) {
@@ -3029,7 +3026,7 @@ public class RecipientDatabase extends Database {
     db.update(GroupReceiptDatabase.TABLE_NAME, groupReceiptValues, GroupReceiptDatabase.RECIPIENT_ID + " = ?", SqlUtil.buildArgs(byE164));
 
     // Groups
-    GroupDatabase groupDatabase = DatabaseFactory.getGroupDatabase(context);
+    GroupDatabase groupDatabase = SignalDatabase.groups();
     for (GroupDatabase.GroupRecord group : groupDatabase.getGroupsContainingMember(byE164, false, true)) {
       LinkedHashSet<RecipientId> newMembers = new LinkedHashSet<>(group.getMembers());
       newMembers.remove(byE164);
@@ -3045,7 +3042,7 @@ public class RecipientDatabase extends Database {
     }
 
     // Threads
-    ThreadDatabase.MergeResult threadMerge = DatabaseFactory.getThreadDatabase(context).merge(byUuid, byE164);
+    ThreadDatabase.MergeResult threadMerge = SignalDatabase.threads().merge(byUuid, byE164);
 
     // SMS Messages
     ContentValues smsValues = new ContentValues();
@@ -3070,7 +3067,7 @@ public class RecipientDatabase extends Database {
     }
 
     // Sessions
-    SessionDatabase sessionDatabase = DatabaseFactory.getSessionDatabase(context);
+    SessionDatabase sessionDatabase = SignalDatabase.sessions();
 
     boolean hasE164Session = sessionDatabase.getAllFor(e164Settings.e164).size() > 0;
     boolean hasUuidSession = sessionDatabase.getAllFor(uuidSettings.aci.toString()).size() > 0;
@@ -3090,7 +3087,7 @@ public class RecipientDatabase extends Database {
     }
 
     // MSL
-    DatabaseFactory.getMessageLogDatabase(context).remapRecipient(byE164, byUuid);
+    SignalDatabase.messageLog().remapRecipient(byE164, byUuid);
 
     // Mentions
     ContentValues mentionRecipientValues = new ContentValues();
@@ -3102,16 +3099,16 @@ public class RecipientDatabase extends Database {
       db.update(MentionDatabase.TABLE_NAME, mentionThreadValues, MentionDatabase.THREAD_ID + " = ?", SqlUtil.buildArgs(threadMerge.previousThreadId));
     }
 
-    DatabaseFactory.getThreadDatabase(context).setLastScrolled(threadMerge.threadId, 0);
-    DatabaseFactory.getThreadDatabase(context).update(threadMerge.threadId, false, false);
+    SignalDatabase.threads().setLastScrolled(threadMerge.threadId, 0);
+    SignalDatabase.threads().update(threadMerge.threadId, false, false);
 
     // Reactions
-    DatabaseFactory.getReactionDatabase(context).remapRecipient(byE164, byUuid);
+    SignalDatabase.reactions().remapRecipient(byE164, byUuid);
 
     // Recipient
     Log.w(TAG, "Deleting recipient " + byE164, true);
     db.delete(TABLE_NAME, ID_WHERE, SqlUtil.buildArgs(byE164));
-    RemappedRecords.getInstance().addRecipient(context, byE164, byUuid);
+    RemappedRecords.getInstance().addRecipient(byE164, byUuid);
 
     ContentValues uuidValues = new ContentValues();
     uuidValues.put(PHONE, e164Settings.getE164());