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

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

Merge pull request #9374 from shamim-emon/fix-issue-9365 

Replace Direct Calls to K9.isShowComposeButtonOnMessageList with PreferenceDataStore integration
parents 48ce9477 6dde818f

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

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

    val isColorizeMissingContactPictures: Boolean,

    val isUseBackgroundAsUnreadIndicator: Boolean,

    val isShowComposeButtonOnMessageList: 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
@@ -28,4 +28,5 @@ interface GeneralSettingsManager { 
    fun setIsChangeContactNameColor(isChangeContactNameColor: Boolean)

    fun setIsColorizeMissingContactPictures(isColorizeMissingContactPictures: Boolean)

    fun setIsUseBackgroundAsUnreadIndicator(isUseBackgroundAsUnreadIndicator: Boolean)

    fun setIsShowComposeButtonOnMessageList(isShowComposeButtonOnMessageList: Boolean)

}

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

+5 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ class BuildSwipeActionsTest { 
            isChangeContactNameColor = false,

            isColorizeMissingContactPictures = false,

            isUseBackgroundAsUnreadIndicator = false,

            isShowComposeButtonOnMessageList = false,

        )



    @Test
@@ -410,6 +411,10 @@ private class FakeGeneralSettingsManager( 
    override fun setIsUseBackgroundAsUnreadIndicator(

        isUseBackgroundAsUnreadIndicator: Boolean,

    ) = error("not implemented")



    override fun setIsShowComposeButtonOnMessageList(isShowComposeButtonOnMessageList: Boolean) = error(

        "not implemented",

    )

}



private class FakeStorage(

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

+0 −7
Original line number Diff line number Diff line
@@ -220,10 +220,6 @@ object K9 : KoinComponent { 
    var sortType: SortType = AccountDefaultsProvider.DEFAULT_SORT_TYPE

    private val sortAscending = mutableMapOf<SortType, Boolean>()



    @get:Synchronized

    @set:Synchronized

    var isShowComposeButtonOnMessageList = true



    @get:Synchronized

    @set:Synchronized

    @JvmStatic
@@ -359,8 +355,6 @@ object K9 : KoinComponent { 
        )



        splitViewMode = storage.getEnum("splitViewMode", SplitViewMode.NEVER)



        isShowComposeButtonOnMessageList = storage.getBoolean("showComposeButtonOnMessageList", true)

        isThreadedViewEnabled = storage.getBoolean("threadedView", true)



        featureFlagProvider.provide("disable_font_size_config".toFeatureFlagKey())
@@ -437,7 +431,6 @@ object K9 : KoinComponent { 
        editor.putString("notificationQuickDelete", notificationQuickDeleteBehaviour.toString())

        editor.putString("lockScreenNotificationVisibility", lockScreenNotificationVisibility.toString())



        editor.putBoolean("showComposeButtonOnMessageList", isShowComposeButtonOnMessageList)

        editor.putBoolean("threadedView", isThreadedViewEnabled)

        editor.putEnum("splitViewMode", splitViewMode)

legacy/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ internal const val KEY_SHOULD_SHOW_SETUP_ARCHIVE_FOLDER_DIALOG = "shouldShowSetu 
internal const val KEY_CHANGE_REGISTERED_NAME_COLOR = "changeRegisteredNameColor"

internal const val KEY_COLORIZE_MISSING_CONTACT_PICTURE = "colorizeMissingContactPictures"

internal const val KEY_USE_BACKGROUND_AS_UNREAD_INDICATOR = "isUseBackgroundAsUnreadIndicator"

internal const val KEY_SHOW_COMPOSE_BUTTON_ON_MESSAGE_LIST = "showComposeButtonOnMessageList"



/**

 * Retrieve and modify general settings.
@@ -190,6 +191,10 @@ internal class RealGeneralSettingsManager( 
        getSettings().copy(isUseBackgroundAsUnreadIndicator = isUseBackgroundAsUnreadIndicator).persist()

    }



    override fun setIsShowComposeButtonOnMessageList(isShowComposeButtonOnMessageList: Boolean) {

        getSettings().copy(isShowComposeButtonOnMessageList = isShowComposeButtonOnMessageList).persist()

    }



    private fun writeSettings(editor: StorageEditor, settings: GeneralSettings) {

        editor.putBoolean("showRecentChanges", settings.showRecentChanges)

        editor.putEnum("theme", settings.appTheme)
@@ -208,6 +213,7 @@ internal class RealGeneralSettingsManager( 
        editor.putBoolean(KEY_CHANGE_REGISTERED_NAME_COLOR, settings.isChangeContactNameColor)

        editor.putBoolean(KEY_COLORIZE_MISSING_CONTACT_PICTURE, settings.isColorizeMissingContactPictures)

        editor.putBoolean(KEY_USE_BACKGROUND_AS_UNREAD_INDICATOR, settings.isUseBackgroundAsUnreadIndicator)

        editor.putBoolean(KEY_SHOW_COMPOSE_BUTTON_ON_MESSAGE_LIST, settings.isShowComposeButtonOnMessageList)

    }



    private fun loadGeneralSettings(): GeneralSettings {
@@ -241,6 +247,7 @@ internal class RealGeneralSettingsManager( 
            isColorizeMissingContactPictures = storage.getBoolean(KEY_COLORIZE_MISSING_CONTACT_PICTURE, true),

            isChangeContactNameColor = storage.getBoolean(KEY_CHANGE_REGISTERED_NAME_COLOR, false),

            isUseBackgroundAsUnreadIndicator = storage.getBoolean(KEY_USE_BACKGROUND_AS_UNREAD_INDICATOR, false),

            isShowComposeButtonOnMessageList = storage.getBoolean(KEY_SHOW_COMPOSE_BUTTON_ON_MESSAGE_LIST, true),

        )



        updateSettingsFlow(settings)