refactor: use hilt to provide DB instead of our own factory, inject it in some places where possible

app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseComponent.kt

@@ -0,0 +1,45 @@
+package org.thoughtcrime.securesms.dependencies
+
+import android.content.Context
+import dagger.hilt.EntryPoint
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.session.libsession.database.MessageDataProvider
+import org.thoughtcrime.securesms.ApplicationContext
+import org.thoughtcrime.securesms.database.*
+import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
+
+@EntryPoint
+@InstallIn(SingletonComponent::class)
+interface DatabaseComponent {
+
+    companion object {
+        @JvmStatic
+        fun get(context: Context) = ApplicationContext.getInstance(context).databaseComponent
+    }
+
+    fun openHelper(): SQLCipherOpenHelper
+
+    fun smsDatabase(): SmsDatabase
+    fun mmsDatabase(): MmsDatabase
+    fun attachmentDatabase(): AttachmentDatabase
+    fun mediaDatabase(): MediaDatabase
+    fun threadDatabase(): ThreadDatabase
+    fun mmsSmsDatabase(): MmsSmsDatabase
+    fun draftDatabase(): DraftDatabase
+    fun pushDatabase(): PushDatabase
+    fun groupDatabase(): GroupDatabase
+    fun recipientDatabase(): RecipientDatabase
+    fun groupReceiptDatabase(): GroupReceiptDatabase
+    fun searchDatabase(): SearchDatabase
+    fun jobDatabase(): JobDatabase
+    fun lokiAPIDatabase(): LokiAPIDatabase
+    fun lokiMessageDatabase(): LokiMessageDatabase
+    fun lokiThreadDatabase(): LokiThreadDatabase
+    fun lokiUserDatabase(): LokiUserDatabase
+    fun lokiBackupFilesDatabase(): LokiBackupFilesDatabase
+    fun sessionJobDatabase(): SessionJobDatabase
+    fun sessionContactDatabase(): SessionContactDatabase
+    fun storage(): Storage
+    fun attachmentProvider(): MessageDataProvider
+}

app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseModule.kt

@@ -0,0 +1,106 @@
+package org.thoughtcrime.securesms.dependencies
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import net.sqlcipher.database.SQLiteDatabase
+import org.session.libsession.database.MessageDataProvider
+import org.thoughtcrime.securesms.attachments.DatabaseAttachmentProvider
+import org.thoughtcrime.securesms.crypto.AttachmentSecret
+import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider
+import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider
+import org.thoughtcrime.securesms.database.*
+import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DatabaseModule {
+
+    @JvmStatic
+    fun init(context: Context) {
+        SQLiteDatabase.loadLibs(context)
+    }
+
+    @Provides
+    @Singleton
+    fun provideAttachmentSecret(@ApplicationContext context: Context) = AttachmentSecretProvider.getInstance(context).orCreateAttachmentSecret
+
+    @Provides
+    @Singleton
+    fun provideOpenHelper(@ApplicationContext context: Context): SQLCipherOpenHelper {
+        val dbSecret = DatabaseSecretProvider(context).orCreateDatabaseSecret
+        return SQLCipherOpenHelper(context, dbSecret)
+    }
+
+    @Provides
+    fun provideSmsDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = SmsDatabase(context, openHelper)
+
+    @Provides
+    fun provideMmsDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = MmsDatabase(context, openHelper)
+
+    @Provides
+    fun provideAttachmentDatabase(@ApplicationContext context: Context,
+                                  openHelper: SQLCipherOpenHelper,
+                                  attachmentSecret: AttachmentSecret) = AttachmentDatabase(context, openHelper, attachmentSecret)
+    @Provides
+    fun provideMediaDatbase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = MediaDatabase(context, openHelper)
+
+    @Provides
+    fun provideThread(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = ThreadDatabase(context,openHelper)
+
+    @Provides
+    fun provideMmsSms(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = MmsSmsDatabase(context, openHelper)
+
+    @Provides
+    fun provideDraftDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = DraftDatabase(context, openHelper)
+
+    @Provides
+    fun providePushDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = PushDatabase(context,openHelper)
+
+    @Provides
+    fun provideGroupDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = GroupDatabase(context,openHelper)
+
+    @Provides
+    fun provideRecipientDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = RecipientDatabase(context,openHelper)
+
+    @Provides
+    fun provideGroupReceiptDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = GroupReceiptDatabase(context,openHelper)
+
+    @Provides
+    fun searchDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = SearchDatabase(context,openHelper)
+
+    @Provides
+    fun provideJobDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = JobDatabase(context, openHelper)
+
+    @Provides
+    fun provideLokiApiDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = LokiAPIDatabase(context,openHelper)
+
+    @Provides
+    fun provideLokiMessageDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = LokiMessageDatabase(context,openHelper)
+
+    @Provides
+    fun provideLokiThreadDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = LokiThreadDatabase(context,openHelper)
+
+    @Provides
+    fun provideLokiUserDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = LokiUserDatabase(context,openHelper)
+
+    @Provides
+    fun provideLokiBackupFilesDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = LokiBackupFilesDatabase(context,openHelper)
+
+    @Provides
+    fun provideSessionJobDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = SessionJobDatabase(context, openHelper)
+
+    @Provides
+    fun provideSessionContactDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = SessionContactDatabase(context,openHelper)
+
+    @Provides
+    fun provideStorage(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = Storage(context,openHelper)
+
+    @Provides
+    fun provideAttachmentProvider(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper): MessageDataProvider = DatabaseAttachmentProvider(context, openHelper)
+
+}

app/src/main/java/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java

@@ -1,24 +0,0 @@
-package org.thoughtcrime.securesms.dependencies;
-
-import android.content.Context;
-
-import org.thoughtcrime.securesms.jobs.AvatarDownloadJob;
-import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob;
-import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository;
-import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment;
-
-import dagger.Module;
-
-@Module(complete = false, injects = {AvatarDownloadJob.class,
-                                     RetrieveProfileAvatarJob.class,
-                                     AppProtectionPreferenceFragment.class,
-                                     LinkPreviewRepository.class})
-
-public class SignalCommunicationModule {
-
-  private final Context                      context;
-
-  public SignalCommunicationModule(Context context) {
-    this.context = context;
-  }
-}