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

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

Merge pull request #9351 from shamim-emon/fix-issue-9343 

Replace Direct Calls to K9.isShowContactPicture with PreferenceDataStore Integration
parents 34bf53e7 591d5ebc

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

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

    val isMessageListSenderAboveSubject: Boolean,

    val isShowContactName: Boolean,

    val isShowContactPicture: 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
@@ -24,4 +24,5 @@ interface GeneralSettingsManager { 
    fun setSetupArchiveShouldNotShowAgain(shouldShowSetupArchiveFolderDialog: Boolean)

    fun setIsMessageListSenderAboveSubject(isMessageListSenderAboveSubject: Boolean)

    fun setIsShowContactName(isShowContactName: Boolean)

    fun setIsShowContactPicture(isShowContactPicture: 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
@@ -42,6 +42,7 @@ class BuildSwipeActionsTest { 
            shouldShowSetupArchiveFolderDialog = false,

            isMessageListSenderAboveSubject = false,

            isShowContactName = false,

            isShowContactPicture = false,

        )



    @Test
@@ -395,6 +396,8 @@ private class FakeGeneralSettingsManager( 
    override fun setIsMessageListSenderAboveSubject(isMessageListSenderAboveSubject: Boolean) = error("not implemented")



    override fun setIsShowContactName(isShowContactName: Boolean) = error("not implemented")



    override fun setIsShowContactPicture(isShowContactPicture: Boolean) = error("not implemented")

}



private class FakeStorage(

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

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

    var contactNameColor = 0xFF1093F5.toInt()



    @JvmStatic

    var isShowContactPicture = true



    @JvmStatic

    var isUseMessageViewFixedWidthFont = false
@@ -341,7 +338,6 @@ object K9 : KoinComponent { 
        quietTimeEnds = storage.getStringOrDefault("quietTimeEnds", "7:00")



        messageListDensity = storage.getEnum("messageListDensity", UiDensity.Default)

        isShowContactPicture = storage.getBoolean("showContactPicture", true)

        isChangeContactNameColor = storage.getBoolean("changeRegisteredNameColor", false)

        contactNameColor = storage.getInt("registeredNameColor", 0xFF1093F5.toInt())

        isUseMessageViewFixedWidthFont = storage.getBoolean("messageViewFixedWidthFont", false)
@@ -431,7 +427,6 @@ object K9 : KoinComponent { 
        editor.putEnum("messageListDensity", messageListDensity)

        editor.putBoolean("showAccountSelector", isShowAccountSelector)

        editor.putInt("messageListPreviewLines", messageListPreviewLines)

        editor.putBoolean("showContactPicture", isShowContactPicture)

        editor.putBoolean("changeRegisteredNameColor", isChangeContactNameColor)

        editor.putInt("registeredNameColor", contactNameColor)

        editor.putBoolean("messageViewFixedWidthFont", isUseMessageViewFixedWidthFont)

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

+6 −0
Original line number Diff line number Diff line
@@ -171,6 +171,10 @@ internal class RealGeneralSettingsManager( 
        getSettings().copy(isShowContactName = isShowContactName).persist()

    }



    override fun setIsShowContactPicture(isShowContactPicture: Boolean) {

        getSettings().copy(isShowContactPicture = isShowContactPicture).persist()

    }



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

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

        editor.putEnum("theme", settings.appTheme)
@@ -185,6 +189,7 @@ internal class RealGeneralSettingsManager( 
        editor.putBoolean(KEY_SHOULD_SHOW_SETUP_ARCHIVE_FOLDER_DIALOG, settings.shouldShowSetupArchiveFolderDialog)

        editor.putBoolean("messageListSenderAboveSubject", settings.isMessageListSenderAboveSubject)

        editor.putBoolean("showContactName", settings.isShowContactName)

        editor.putBoolean("showContactPicture", settings.isShowContactPicture)

    }



    private fun loadGeneralSettings(): GeneralSettings {
@@ -214,6 +219,7 @@ internal class RealGeneralSettingsManager( 
            ),

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

            isShowContactName = storage.getBoolean("showContactName", false),

            isShowContactPicture = storage.getBoolean("showContactPicture", true),

        )



        updateSettingsFlow(settings)