Tidy up storage

7 months ago · 79db7bdc5c
parent d2a4f12c29
commit 79db7bdc5c
3 changed files with 200 additions and 457 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
--- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseComponent.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseComponent.kt
@ -17,6 +17,7 @@ interface DatabaseComponent {

    companion object {
        @JvmStatic
+        @Deprecated("Should use a properly DI instance of components")
        fun get(context: Context) = ApplicationContext.getInstance(context).databaseComponent
    }

--- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseModule.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseModule.kt
@ -139,19 +139,6 @@ object DatabaseModule {
    @Singleton
    fun provideExpirationConfigurationDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = ExpirationConfigurationDatabase(context, openHelper)

-    @Provides
-    @Singleton
-    fun provideStorage(@ApplicationContext context: Context,
-                       openHelper: SQLCipherOpenHelper,
-                       configFactory: ConfigFactory,
-                       threadDatabase: ThreadDatabase,
-                       pollerFactory: PollerFactory,
-    ): Storage {
-        val storage = Storage(context, openHelper, configFactory, pollerFactory)
-        threadDatabase.setUpdateListener(storage)
-        return storage
-    }
-
    @Provides
    @Singleton
    fun provideAttachmentProvider(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper): MessageDataProvider = DatabaseAttachmentProvider(context, openHelper)