Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 9024bacd authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

Move `MessageCountsProvider` to :legacy:message` module

parent 982489ed

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

+1 −1
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ import android.content.Context 
import android.content.Intent

import app.k9mail.legacy.account.Account

import app.k9mail.legacy.mailstore.FolderRepository

import app.k9mail.legacy.message.controller.MessageCountsProvider

import app.k9mail.legacy.search.LocalSearch

import app.k9mail.legacy.search.SearchAccount

import app.k9mail.legacy.ui.folder.FolderNameFormatter

import com.fsck.k9.CoreResourceProvider

import com.fsck.k9.Preferences

import com.fsck.k9.activity.MessageList

import com.fsck.k9.controller.MessageCountsProvider

import com.fsck.k9.ui.messagelist.DefaultFolderProvider

import timber.log.Timber

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

+2 −2
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ import app.k9mail.legacy.account.Account 
import app.k9mail.legacy.folder.Folder

import app.k9mail.legacy.folder.FolderType

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.ui.folder.FolderNameFormatter

import assertk.assertThat
@@ -12,8 +14,6 @@ import assertk.assertions.isEqualTo 
import assertk.assertions.isNull

import com.fsck.k9.CoreResourceProvider

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 org.junit.Before

import org.junit.Test

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

+2 −8
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ package com.fsck.k9.controller 
import app.k9mail.legacy.account.Account

import app.k9mail.legacy.account.AccountManager

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.LocalSearch

import app.k9mail.legacy.search.SearchAccount
@@ -11,14 +13,6 @@ import com.fsck.k9.search.getAccounts 
import com.fsck.k9.search.limitToDisplayableFolders

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(

    private val accountManager: AccountManager,

    private val messageStoreManager: MessageStoreManager,

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

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package com.fsck.k9.controller 


import android.content.Context

import app.k9mail.legacy.mailstore.MessageStoreManager

import app.k9mail.legacy.message.controller.MessageCountsProvider

import app.k9mail.legacy.message.controller.MessagingControllerRegistry

import com.fsck.k9.Preferences

import com.fsck.k9.backend.BackendManager

legacy/message/build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ android { 


dependencies {

    implementation(projects.legacy.account)

    implementation(projects.legacy.search)



    implementation(projects.mail.common)

    implementation(projects.backend.api)