mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-20 04:02:14 +02:00
Code

Move MessageCountsProvider to :legacy:message` module

Browse Source
This commit is contained in:
Wolf-Martell Montwé 2024-08-06 15:35:19 +02:00
parent 982489edde
commit 9024bacd84
No known key found for this signature in database
GPG Key ID: 6D45B21512ACBF72
8 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetDataProvider.kt
View File

@ -4,13 +4,13 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import app.k9mail.legacy.account.Account import app.k9mail.legacy.account.Account
import app.k9mail.legacy.mailstore.FolderRepository import app.k9mail.legacy.mailstore.FolderRepository
import app.k9mail.legacy.message.controller.MessageCountsProvider
import app.k9mail.legacy.search.LocalSearch import app.k9mail.legacy.search.LocalSearch
import app.k9mail.legacy.search.SearchAccount import app.k9mail.legacy.search.SearchAccount
import app.k9mail.legacy.ui.folder.FolderNameFormatter import app.k9mail.legacy.ui.folder.FolderNameFormatter
import com.fsck.k9.CoreResourceProvider import com.fsck.k9.CoreResourceProvider
import com.fsck.k9.Preferences import com.fsck.k9.Preferences
import com.fsck.k9.activity.MessageList import com.fsck.k9.activity.MessageList
import com.fsck.k9.controller.MessageCountsProvider
import com.fsck.k9.ui.messagelist.DefaultFolderProvider import com.fsck.k9.ui.messagelist.DefaultFolderProvider
import timber.log.Timber import timber.log.Timber

4
feature/widget/unread/src/test/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetDataProviderTest.kt
View File

@ -5,6 +5,8 @@ import app.k9mail.legacy.account.Account
import app.k9mail.legacy.folder.Folder import app.k9mail.legacy.folder.Folder
import app.k9mail.legacy.folder.FolderType import app.k9mail.legacy.folder.FolderType
import app.k9mail.legacy.mailstore.FolderRepository import app.k9mail.legacy.mailstore.FolderRepository
import app.k9mail.legacy.message.controller.MessageCounts
import app.k9mail.legacy.message.controller.MessageCountsProvider
import app.k9mail.legacy.search.SearchAccount import app.k9mail.legacy.search.SearchAccount
import app.k9mail.legacy.ui.folder.FolderNameFormatter import app.k9mail.legacy.ui.folder.FolderNameFormatter
import assertk.assertThat import assertk.assertThat
@ -12,8 +14,6 @@ import assertk.assertions.isEqualTo
import assertk.assertions.isNull import assertk.assertions.isNull
import com.fsck.k9.CoreResourceProvider import com.fsck.k9.CoreResourceProvider
import com.fsck.k9.Preferences import com.fsck.k9.Preferences
import com.fsck.k9.controller.MessageCounts
import com.fsck.k9.controller.MessageCountsProvider
import com.fsck.k9.ui.messagelist.DefaultFolderProvider import com.fsck.k9.ui.messagelist.DefaultFolderProvider
import org.junit.Before import org.junit.Before
import org.junit.Test import org.junit.Test

10
legacy/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt → legacy/core/src/main/java/com/fsck/k9/controller/DefaultMessageCountsProvider.kt
View File

@ -3,6 +3,8 @@ package com.fsck.k9.controller
import app.k9mail.legacy.account.Account import app.k9mail.legacy.account.Account
import app.k9mail.legacy.account.AccountManager import app.k9mail.legacy.account.AccountManager
import app.k9mail.legacy.mailstore.MessageStoreManager import app.k9mail.legacy.mailstore.MessageStoreManager
import app.k9mail.legacy.message.controller.MessageCounts
import app.k9mail.legacy.message.controller.MessageCountsProvider
import app.k9mail.legacy.search.ConditionsTreeNode import app.k9mail.legacy.search.ConditionsTreeNode
import app.k9mail.legacy.search.LocalSearch import app.k9mail.legacy.search.LocalSearch
import app.k9mail.legacy.search.SearchAccount import app.k9mail.legacy.search.SearchAccount
@ -11,14 +13,6 @@ import com.fsck.k9.search.getAccounts
import com.fsck.k9.search.limitToDisplayableFolders import com.fsck.k9.search.limitToDisplayableFolders
import timber.log.Timber import timber.log.Timber
interface MessageCountsProvider {
fun getMessageCounts(account: Account): MessageCounts
fun getMessageCounts(searchAccount: SearchAccount): MessageCounts
fun getUnreadMessageCount(account: Account, folderId: Long): Int
}
data class MessageCounts(val unread: Int, val starred: Int)
internal class DefaultMessageCountsProvider( internal class DefaultMessageCountsProvider(
private val accountManager: AccountManager, private val accountManager: AccountManager,
private val messageStoreManager: MessageStoreManager, private val messageStoreManager: MessageStoreManager,

1
legacy/core/src/main/java/com/fsck/k9/controller/KoinModule.kt
View File

@ -2,6 +2,7 @@ package com.fsck.k9.controller
import android.content.Context import android.content.Context
import app.k9mail.legacy.mailstore.MessageStoreManager import app.k9mail.legacy.mailstore.MessageStoreManager
import app.k9mail.legacy.message.controller.MessageCountsProvider
import app.k9mail.legacy.message.controller.MessagingControllerRegistry import app.k9mail.legacy.message.controller.MessagingControllerRegistry
import com.fsck.k9.Preferences import com.fsck.k9.Preferences
import com.fsck.k9.backend.BackendManager import com.fsck.k9.backend.BackendManager

1
legacy/message/build.gradle.kts
View File

@ -8,6 +8,7 @@ android {
dependencies { dependencies {
implementation(projects.legacy.account) implementation(projects.legacy.account)
implementation(projects.legacy.search)
implementation(projects.mail.common) implementation(projects.mail.common)
implementation(projects.backend.api) implementation(projects.backend.api)

12
legacy/message/src/main/java/app/k9mail/legacy/message/controller/MessageCountsProvider.kt Normal file
View File

@ -0,0 +1,12 @@
package app.k9mail.legacy.message.controller
import app.k9mail.legacy.account.Account
import app.k9mail.legacy.search.SearchAccount
interface MessageCountsProvider {
fun getMessageCounts(account: Account): MessageCounts
fun getMessageCounts(searchAccount: SearchAccount): MessageCounts
fun getUnreadMessageCount(account: Account, folderId: Long): Int
}
data class MessageCounts(val unread: Int, val starred: Int)

4
legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt
View File

@ -5,9 +5,9 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.asLiveData import androidx.lifecycle.asLiveData
import app.k9mail.legacy.account.Account import app.k9mail.legacy.account.Account
import app.k9mail.legacy.account.AccountManager import app.k9mail.legacy.account.AccountManager
import app.k9mail.legacy.message.controller.MessageCounts
import app.k9mail.legacy.message.controller.MessageCountsProvider
import app.k9mail.legacy.ui.account.DisplayAccount import app.k9mail.legacy.ui.account.DisplayAccount
import com.fsck.k9.controller.MessageCounts
import com.fsck.k9.controller.MessageCountsProvider
import com.fsck.k9.mailstore.MessageListChangedListener import com.fsck.k9.mailstore.MessageListChangedListener
import com.fsck.k9.mailstore.MessageListRepository import com.fsck.k9.mailstore.MessageListRepository
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers

2
legacy/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt
View File

@ -6,10 +6,10 @@ import androidx.lifecycle.asLiveData
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import app.k9mail.legacy.account.Account import app.k9mail.legacy.account.Account
import app.k9mail.legacy.mailstore.FolderRepository import app.k9mail.legacy.mailstore.FolderRepository
import app.k9mail.legacy.message.controller.MessageCountsProvider
import app.k9mail.legacy.search.SearchAccount import app.k9mail.legacy.search.SearchAccount
import app.k9mail.legacy.ui.folder.DisplayUnifiedInbox import app.k9mail.legacy.ui.folder.DisplayUnifiedInbox
import app.k9mail.legacy.ui.folder.FolderList import app.k9mail.legacy.ui.folder.FolderList
import com.fsck.k9.controller.MessageCountsProvider
import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi