Job inject

MixinNetwork · Nov 27, 2024 · 162b795 · 162b795
1 parent 948d441
commit 162b795
Show file tree

Hide file tree

Showing 23 changed files with 348 additions and 272 deletions.
diff --git a/app/src/main/java/one/mixin/android/db/DaoExtension.kt b/app/src/main/java/one/mixin/android/db/DaoExtension.kt
@@ -194,7 +194,7 @@ suspend fun OutputDao.insertUnspentOutputs(outputs: List<Output>) =
 fun MixinDatabase.deleteMessageById(messageId: String) {
     runInTransaction {
         pinMessageDao().deleteByMessageId(messageId)
-        mentionMessageDao().deleteMessage(messageId)
+        messageMentionDao().deleteMessage(messageId)
         messageDao().deleteMessageById(messageId)
         remoteMessageStatusDao().deleteByMessageId(messageId)
         expiredMessageDao().deleteByMessageId(messageId)
@@ -207,7 +207,7 @@ fun MixinDatabase.deleteMessageById(
 ) {
     runInTransaction {
         pinMessageDao().deleteByMessageId(messageId)
-        mentionMessageDao().deleteMessage(messageId)
+        messageMentionDao().deleteMessage(messageId)
         messageDao().deleteMessageById(messageId)
         conversationExtDao().decrement(conversationId)
         remoteMessageStatusDao().deleteByMessageId(messageId)
@@ -219,7 +219,7 @@ fun MixinDatabase.deleteMessageById(
 fun MixinDatabase.deleteMessageByIds(messageIds: List<String>) {
     runInTransaction {
         pinMessageDao().deleteByIds(messageIds)
-        mentionMessageDao().deleteMessage(messageIds)
+        messageMentionDao().deleteMessage(messageIds)
         messageDao().deleteMessageById(messageIds)
         remoteMessageStatusDao().deleteByMessageIds(messageIds)
         expiredMessageDao().deleteByMessageId(messageIds)

diff --git a/app/src/main/java/one/mixin/android/db/MixinDatabase.kt b/app/src/main/java/one/mixin/android/db/MixinDatabase.kt
@@ -236,7 +236,7 @@ abstract class MixinDatabase : RoomDatabase() {
 
     abstract fun favoriteAppDao(): FavoriteAppDao
 
-    abstract fun mentionMessageDao(): MessageMentionDao
+    abstract fun messageMentionDao(): MessageMentionDao
 
     abstract fun circleDao(): CircleDao
 

diff --git a/app/src/main/java/one/mixin/android/di/DatabaseModule.kt b/app/src/main/java/one/mixin/android/di/DatabaseModule.kt
@@ -25,7 +25,9 @@ internal object DatabaseModule {
 
     @Singleton
     @Provides
-    fun provideDatbaseProvider(app: Application) = DatabaseProvider(app)
+    fun provideDatabaseProvider(app: Application): DatabaseProvider {
+        return DatabaseProvider(app)
+    }
 
     @Provides
     fun provideAppDatabase(
@@ -122,7 +124,7 @@ internal object DatabaseModule {
     fun providesFavoriteAppDao(db: MixinDatabase) = db.favoriteAppDao()
 
     @Provides
-    fun providesMentionMessageDao(db: MixinDatabase) = db.mentionMessageDao()
+    fun providesMentionMessageDao(db: MixinDatabase) = db.messageMentionDao()
 
     @Provides
     fun providesCircleDao(db: MixinDatabase) = db.circleDao()