refactor: migrate K9.isMessageViewCopyActionVisible to PreferenceDataStore

Author: shamim-emon

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DisplayVisualSettings.kt

@@ -11,6 +11,7 @@ const val DISPLAY_SETTINGS_DEFAULT_DRAWER_EXPAND_ALL_FOLDER = false
 const val DISPLAY_SETTINGS_DEFAULT_MESSAGE_VIEW_ARCHIVE_ACTION_VISIBLE = false
 const val DISPLAY_SETTINGS_DEFAULT_MESSAGE_VIEW_DELETE_ACTION_VISIBLE = true
 const val DISPLAY_SETTINGS_DEFAULT_MESSAGE_VIEW_MOVE_ACTION_VISIBLE = false
+const val DISPLAY_SETTINGS_DEFAULT_MESSAGE_VIEW_COPY_ACTION_VISIBLE = false
 
 data class DisplayVisualSettings(
     val isShowAnimations: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_SHOW_ANIMATION,
@@ -22,4 +23,5 @@ data class DisplayVisualSettings(
     val isMessageViewArchiveActionVisible: Boolean = DISPLAY_SETTINGS_DEFAULT_MESSAGE_VIEW_ARCHIVE_ACTION_VISIBLE,
     val isMessageViewDeleteActionVisible: Boolean = DISPLAY_SETTINGS_DEFAULT_MESSAGE_VIEW_DELETE_ACTION_VISIBLE,
     val isMessageViewMoveActionVisible: Boolean = DISPLAY_SETTINGS_DEFAULT_MESSAGE_VIEW_MOVE_ACTION_VISIBLE,
+    val isMessageViewCopyActionVisible: Boolean = DISPLAY_SETTINGS_DEFAULT_MESSAGE_VIEW_COPY_ACTION_VISIBLE,
 )

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DisplayVisualSettingsPreferenceManager.kt

@@ -10,5 +10,6 @@ const val KEY_DRAWER_EXPAND_ALL_FOLDER = "drawerExpandAllFolder"
 const val KEY_MESSAGE_VIEW_ARCHIVE_ACTION_VISIBLE = "messageViewArchiveActionVisible"
 const val KEY_MESSAGE_VIEW_DELETE_ACTION_VISIBLE = "messageViewDeleteActionVisible"
 const val KEY_MESSAGE_VIEW_MOVE_ACTION_VISIBLE = "messageViewMoveActionVisible"
+const val KEY_MESSAGE_VIEW_COPY_ACTION_VISIBLE = "messageViewCopyActionVisible"
 
 interface DisplayVisualSettingsPreferenceManager : PreferenceManager<DisplayVisualSettings>

core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DefaultDisplayVisualSettingsPreferenceManager.kt

@@ -88,7 +88,11 @@ class DefaultDisplayVisualSettingsPreferenceManager(
         isMessageViewMoveActionVisible = storage.getBoolean(
             KEY_MESSAGE_VIEW_MOVE_ACTION_VISIBLE,
             DISPLAY_SETTINGS_DEFAULT_MESSAGE_VIEW_MOVE_ACTION_VISIBLE,
-        )
+        ),
+        isMessageViewCopyActionVisible = storage.getBoolean(
+            KEY_MESSAGE_VIEW_COPY_ACTION_VISIBLE,
+            DISPLAY_SETTINGS_DEFAULT_MESSAGE_VIEW_COPY_ACTION_VISIBLE,
+        ),
     )
 
     private fun writeConfig(config: DisplayVisualSettings) {
@@ -116,6 +120,10 @@ class DefaultDisplayVisualSettingsPreferenceManager(
                     KEY_MESSAGE_VIEW_MOVE_ACTION_VISIBLE,
                     config.isMessageViewMoveActionVisible,
                 )
+                storageEditor.putBoolean(
+                    KEY_MESSAGE_VIEW_COPY_ACTION_VISIBLE,
+                    config.isMessageViewCopyActionVisible,
+                )
                 storageEditor.commit().also { commited ->
                     logger.verbose(TAG) { "writeConfig: storageEditor.commit() resulted in: $commited" }
                 }

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

@@ -125,8 +125,6 @@ object K9 : KoinComponent {
     var sortType: SortType = AccountDefaultsProvider.DEFAULT_SORT_TYPE
     private val sortAscending = mutableMapOf<SortType, Boolean>()
 
-    @JvmStatic
-    var isMessageViewCopyActionVisible = false
 
     @JvmStatic
     var isMessageViewSpamActionVisible = false
@@ -198,7 +196,6 @@ object K9 : KoinComponent {
             .onDisabledOrUnavailable {
                 fontSizes.load(storage)
             }
-        isMessageViewCopyActionVisible = storage.getBoolean("messageViewCopyActionVisible", false)
         isMessageViewSpamActionVisible = storage.getBoolean("messageViewSpamActionVisible", false)
 
         pgpInlineDialogCounter = storage.getInt("pgpInlineDialogCounter", 0)
@@ -220,7 +217,6 @@ object K9 : KoinComponent {
         editor.putEnum("sortTypeEnum", sortType)
         editor.putBoolean("sortAscending", sortAscending[sortType] ?: false)
         editor.putString("lockScreenNotificationVisibility", lockScreenNotificationVisibility.toString())
-        editor.putBoolean("messageViewCopyActionVisible", isMessageViewCopyActionVisible)
         editor.putBoolean("messageViewSpamActionVisible", isMessageViewSpamActionVisible)
 
         editor.putInt("pgpInlineDialogCounter", pgpInlineDialogCounter)

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt

@@ -351,7 +351,8 @@ class MessageViewFragment :
         menu.findItem(R.id.set_format_html).isVisible = isRenderPlainFormat()
 
         if (isCopyCapable) {
-            menu.findItem(R.id.copy).isVisible = K9.isMessageViewCopyActionVisible
+            menu.findItem(R.id.copy).isVisible = generalSettingsManager.getConfig()
+                .display.visualSettings.isMessageViewCopyActionVisible
             menu.findItem(R.id.refile_copy).isVisible = true
         } else {
             menu.findItem(R.id.copy).isVisible = false

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt

@@ -249,7 +249,7 @@ class GeneralSettingsDataStore(
                     if (visualSettings.isMessageViewDeleteActionVisible) add("delete")
                     if (visualSettings.isMessageViewArchiveActionVisible) add("archive")
                     if (visualSettings.isMessageViewMoveActionVisible) add("move")
-                    if (K9.isMessageViewCopyActionVisible) add("copy")
+                    if (visualSettings.isMessageViewCopyActionVisible) add("copy")
                     if (K9.isMessageViewSpamActionVisible) add("spam")
                 }
             }
@@ -286,12 +286,11 @@ class GeneralSettingsDataStore(
                                 isMessageViewArchiveActionVisible = "archive" in checkedValues,
                                 isMessageViewDeleteActionVisible = "delete" in checkedValues,
                                 isMessageViewMoveActionVisible = "move" in checkedValues,
+                                isMessageViewCopyActionVisible = "copy" in checkedValues,
                             ),
                         ),
                     )
                 }
-
-                K9.isMessageViewCopyActionVisible = "copy" in checkedValues
                 K9.isMessageViewSpamActionVisible = "spam" in checkedValues
             }