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

Unverified Commit cef409d8 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé Committed by GitHub
Browse files

Merge pull request #9322 from shamim-emon/fix-issue-9321 

Replace Direct Calls to K9.isMessageListSenderAboveSubject with PreferenceDataStore integration
parents f1ca3e88 9b0d3e6c

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/GeneralSettings.kt

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ data class GeneralSettings( 
    val isShowAnimations: Boolean,

    val isShowCorrespondentNames: Boolean,

    val shouldShowSetupArchiveFolderDialog: Boolean,

    val isMessageListSenderAboveSubject: Boolean,

)



enum class BackgroundSync {

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/GeneralSettingsManager.kt

+1 −0
Original line number Diff line number Diff line
@@ -22,4 +22,5 @@ interface GeneralSettingsManager { 
    fun setIsShowAnimations(isShowAnimations: Boolean)

    fun setIsShowCorrespondentNames(isShowCorrespondentNames: Boolean)

    fun setSetupArchiveShouldNotShowAgain(shouldShowSetupArchiveFolderDialog: Boolean)

    fun setIsMessageListSenderAboveSubject(isMessageListSenderAboveSubject: Boolean)

}

feature/mail/message/list/src/test/kotlin/net/thunderbird/feature/mail/message/list/domain/usecase/BuildSwipeActionsTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ class BuildSwipeActionsTest { 
            isShowAnimations = false,

            isShowCorrespondentNames = false,

            shouldShowSetupArchiveFolderDialog = false,

            isMessageListSenderAboveSubject = false,

        )



    @Test
@@ -389,6 +390,8 @@ private class FakeGeneralSettingsManager( 
    override fun setSetupArchiveShouldNotShowAgain(shouldShowSetupArchiveFolderDialog: Boolean) {

        generalSettings.update { it.copy(shouldShowSetupArchiveFolderDialog = shouldShowSetupArchiveFolderDialog) }

    }



    override fun setIsMessageListSenderAboveSubject(isMessageListSenderAboveSubject: Boolean) = error("not implemented")

}



private class FakeStorage(

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListRemoteViewFactory.kt

+3 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ import com.fsck.k9.CoreResourceProvider 
import com.fsck.k9.K9

import com.fsck.k9.activity.MessageList

import net.thunderbird.core.android.account.SortType

import net.thunderbird.core.preference.GeneralSettingsManager

import net.thunderbird.feature.search.LocalSearch

import net.thunderbird.feature.search.SearchAccount

import org.koin.core.component.KoinComponent
@@ -21,6 +22,7 @@ import org.koin.core.component.inject 
internal class MessageListRemoteViewFactory(private val context: Context) : RemoteViewsFactory, KoinComponent {

    private val messageListLoader: MessageListLoader by inject()

    private val coreResourceProvider: CoreResourceProvider by inject()

    private val generalSettingsManager: GeneralSettingsManager by inject()



    private lateinit var unifiedInboxSearch: LocalSearch
@@ -35,7 +37,7 @@ internal class MessageListRemoteViewFactory(private val context: Context) : Remo 
            unifiedInboxDetail = coreResourceProvider.searchUnifiedInboxDetail(),

        ).relatedSearch



        senderAboveSubject = K9.isMessageListSenderAboveSubject

        senderAboveSubject = generalSettingsManager.getSettings().isMessageListSenderAboveSubject

        readTextColor = ContextCompat.getColor(context, R.color.message_list_widget_text_read)

        unreadTextColor = ContextCompat.getColor(context, R.color.message_list_widget_text_unread)

    }

legacy/core/src/main/java/com/fsck/k9/K9.kt

+0 −5
Original line number Diff line number Diff line
@@ -180,9 +180,6 @@ object K9 : KoinComponent { 
    @JvmStatic

    var messageListPreviewLines = 2



    @JvmStatic

    var isMessageListSenderAboveSubject = false



    @JvmStatic

    var isShowContactName = false
@@ -334,7 +331,6 @@ object K9 : KoinComponent { 
        isSensitiveDebugLoggingEnabled = storage.getBoolean("enableSensitiveLogging", false)

        isUseVolumeKeysForNavigation = storage.getBoolean("useVolumeKeysForNavigation", false)

        isShowAccountSelector = storage.getBoolean("showAccountSelector", true)

        isMessageListSenderAboveSubject = storage.getBoolean("messageListSenderAboveSubject", false)

        messageListPreviewLines = storage.getInt("messageListPreviewLines", 2)



        isAutoFitWidth = storage.getBoolean("autofitWidth", true)
@@ -434,7 +430,6 @@ object K9 : KoinComponent { 
        editor.putString("quietTimeEnds", quietTimeEnds)



        editor.putEnum("messageListDensity", messageListDensity)

        editor.putBoolean("messageListSenderAboveSubject", isMessageListSenderAboveSubject)

        editor.putBoolean("showAccountSelector", isShowAccountSelector)

        editor.putInt("messageListPreviewLines", messageListPreviewLines)

        editor.putBoolean("showContactName", isShowContactName)