From 251f835c1e38196ec40aa51faec8d5614275e430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= Date: Tue, 28 Nov 2023 16:44:52 +0100 Subject: [PATCH] Change use of Enum.values() to Enum.entries --- .../ui/catalog/ui/atom/CatalogAtomPage.kt | 2 +- .../ui/molecule/CatalogMoleculePage.kt | 2 +- .../ui/organism/CatalogOrganismPage.kt | 2 +- app/core/src/main/java/com/fsck/k9/Account.kt | 2 +- .../java/com/fsck/k9/mailstore/SendState.kt | 2 +- .../NotificationVibrationDecoder.kt | 2 +- .../k9/ui/messagelist/MessageListFragment.kt | 27 ++++++++++++++++++- .../domain/entity/AuthenticationType.kt | 2 +- .../domain/entity/ConnectionSecurity.kt | 2 +- .../domain/entity/IncomingProtocolType.kt | 4 +-- .../domain/entity/OutgoingProtocolType.kt | 2 +- .../domain/entity/AuthenticationTypeTest.kt | 4 +-- .../domain/entity/ConnectionSecurityTest.kt | 4 +-- .../domain/entity/IncomingProtocolTypeTest.kt | 2 +- .../domain/entity/OutgoingProtocolTypeTest.kt | 2 +- .../domain/entity/EmailCheckFrequency.kt | 2 +- .../setup/domain/entity/EmailDisplayCount.kt | 2 +- .../AutoDiscoveryAuthenticationTypeKtTest.kt | 2 +- .../AutoDiscoveryConnectionSecurityKtTest.kt | 2 +- 19 files changed, 47 insertions(+), 22 deletions(-) diff --git a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/CatalogAtomPage.kt b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/CatalogAtomPage.kt index 1eae2e27c5..78d6da667d 100644 --- a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/CatalogAtomPage.kt +++ b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/CatalogAtomPage.kt @@ -19,6 +19,6 @@ enum class CatalogAtomPage( } companion object { - fun all() = values().toList().toImmutableList() + fun all() = entries.toImmutableList() } } diff --git a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/molecule/CatalogMoleculePage.kt b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/molecule/CatalogMoleculePage.kt index cfd4018c21..7526811aca 100644 --- a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/molecule/CatalogMoleculePage.kt +++ b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/molecule/CatalogMoleculePage.kt @@ -14,6 +14,6 @@ enum class CatalogMoleculePage( } companion object { - fun all() = values().toList().toImmutableList() + fun all() = entries.toImmutableList() } } diff --git a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/organism/CatalogOrganismPage.kt b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/organism/CatalogOrganismPage.kt index 1f2c4a4059..f6d280f9b7 100644 --- a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/organism/CatalogOrganismPage.kt +++ b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/organism/CatalogOrganismPage.kt @@ -13,6 +13,6 @@ enum class CatalogOrganismPage( } companion object { - fun all() = values().toList().toImmutableList() + fun all() = entries.toImmutableList() } } diff --git a/app/core/src/main/java/com/fsck/k9/Account.kt b/app/core/src/main/java/com/fsck/k9/Account.kt index 0c585eb0f9..1fbefc293f 100644 --- a/app/core/src/main/java/com/fsck/k9/Account.kt +++ b/app/core/src/main/java/com/fsck/k9/Account.kt @@ -670,7 +670,7 @@ class Account(override val uuid: String) : BaseAccount { companion object { fun fromInt(initialSetting: Int): DeletePolicy { - return values().find { it.setting == initialSetting } ?: error("DeletePolicy $initialSetting unknown") + return entries.find { it.setting == initialSetting } ?: error("DeletePolicy $initialSetting unknown") } } } diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt index cb411c02cf..2634b058fb 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt @@ -9,7 +9,7 @@ enum class SendState(val databaseName: String) { companion object { @JvmStatic fun fromDatabaseName(databaseName: String): SendState { - return SendState.values().firstOrNull { it.databaseName == databaseName } + return entries.firstOrNull { it.databaseName == databaseName } ?: throw IllegalArgumentException("Unknown value: $databaseName") } } diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationVibrationDecoder.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationVibrationDecoder.kt index 248b58f4f1..927e142274 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NotificationVibrationDecoder.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationVibrationDecoder.kt @@ -14,7 +14,7 @@ class NotificationVibrationDecoder { val systemPatternArray = systemPattern.toLongArray() val repeatCount = systemPattern.size / 2 - val pattern = VibratePattern.values() + val pattern = VibratePattern.entries .firstOrNull { vibratePattern -> val testPattern = NotificationVibration.getSystemPattern(vibratePattern, repeatCount) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt index de1f188b34..b3faefeeb3 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt @@ -679,7 +679,7 @@ class MessageListFragment : } fun onCycleSort() { - val sortTypes = SortType.values() + val sortTypes = SortType.entries val currentIndex = sortTypes.indexOf(sortType) val newIndex = if (currentIndex == sortTypes.lastIndex) 0 else currentIndex + 1 val nextSortType = sortTypes[newIndex] @@ -763,6 +763,7 @@ class MessageListFragment : val cancelText = getString(R.string.dialog_confirm_spam_cancel_button) ConfirmationDialogFragment.newInstance(dialogId, title, message, confirmText, cancelText) } + R.id.dialog_confirm_delete -> { val title = getString(R.string.dialog_confirm_delete_title) val selectionSize = activeMessages!!.size @@ -775,6 +776,7 @@ class MessageListFragment : val cancelText = getString(R.string.dialog_confirm_delete_cancel_button) ConfirmationDialogFragment.newInstance(dialogId, title, message, confirmText, cancelText) } + R.id.dialog_confirm_mark_all_as_read -> { val title = getString(R.string.dialog_confirm_mark_all_as_read_title) val message = getString(R.string.dialog_confirm_mark_all_as_read_message) @@ -782,6 +784,7 @@ class MessageListFragment : val cancelText = getString(R.string.dialog_confirm_mark_all_as_read_cancel_button) ConfirmationDialogFragment.newInstance(dialogId, title, message, confirmText, cancelText) } + R.id.dialog_confirm_empty_trash -> { val title = getString(R.string.dialog_confirm_empty_trash_title) val message = getString(R.string.dialog_confirm_empty_trash_message) @@ -789,6 +792,7 @@ class MessageListFragment : val cancelText = getString(R.string.dialog_confirm_delete_cancel_button) ConfirmationDialogFragment.newInstance(dialogId, title, message, confirmText, cancelText) } + else -> { throw RuntimeException("Called showDialog(int) with unknown dialog id.") } @@ -1210,14 +1214,17 @@ class MessageListFragment : onSpamConfirmed(activeMessages!!) activeMessages = null } + R.id.dialog_confirm_delete -> { onDeleteConfirmed(activeMessages!!) activeMessage = null adapter.activeMessage = null } + R.id.dialog_confirm_mark_all_as_read -> { markAllAsRead() } + R.id.dialog_confirm_empty_trash -> { messagingController.emptyTrash(account, null) } @@ -1628,21 +1635,27 @@ class MessageListFragment : SwipeAction.ToggleSelection -> { toggleMessageSelect(item) } + SwipeAction.ToggleRead -> { setFlag(item, Flag.SEEN, !item.isRead) } + SwipeAction.ToggleStar -> { setFlag(item, Flag.FLAGGED, !item.isStarred) } + SwipeAction.Archive -> { onArchive(item.messageReference) } + SwipeAction.Delete -> { onDelete(listOf(item.messageReference)) } + SwipeAction.Spam -> { onSpam(listOf(item.messageReference)) } + SwipeAction.Move -> { val messageReference = item.messageReference resetSwipedView(messageReference) @@ -1672,6 +1685,7 @@ class MessageListFragment : SwipeAction.Archive -> { !isOutbox && item.account.hasArchiveFolder() && item.folderId != item.account.archiveFolderId } + SwipeAction.Delete -> true SwipeAction.Move -> !isOutbox && messagingController.isMoveCapable(item.account) SwipeAction.Spam -> !isOutbox && item.account.hasSpamFolder() && item.folderId != item.account.spamFolderId @@ -1967,48 +1981,59 @@ class MessageListFragment : onDelete(selectedMessages) true } + R.id.mark_as_read -> { setFlagForSelected(Flag.SEEN, true) false } + R.id.mark_as_unread -> { setFlagForSelected(Flag.SEEN, false) false } + R.id.flag -> { setFlagForSelected(Flag.FLAGGED, true) false } + R.id.unflag -> { setFlagForSelected(Flag.FLAGGED, false) false } + R.id.select_all -> { selectAll() false } + R.id.archive -> { onArchive(selectedMessages) // TODO: Only finish action mode if all messages have been moved. true } + R.id.spam -> { onSpam(selectedMessages) // TODO: Only finish action mode if all messages have been moved. true } + R.id.move -> { onMove(selectedMessages) true } + R.id.move_to_drafts -> { onMoveToDraftsFolder(selectedMessages) true } + R.id.copy -> { onCopy(selectedMessages) true } + else -> return false } diff --git a/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/AuthenticationType.kt b/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/AuthenticationType.kt index c6965b2356..e06847867e 100644 --- a/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/AuthenticationType.kt +++ b/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/AuthenticationType.kt @@ -31,7 +31,7 @@ enum class AuthenticationType( companion object { val DEFAULT = PasswordCleartext - fun all() = values().toList().toImmutableList() + fun all() = entries.toImmutableList() fun outgoing() = all() } diff --git a/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/ConnectionSecurity.kt b/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/ConnectionSecurity.kt index 0696af5afc..609b7c25ff 100644 --- a/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/ConnectionSecurity.kt +++ b/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/ConnectionSecurity.kt @@ -13,7 +13,7 @@ enum class ConnectionSecurity { companion object { val DEFAULT = TLS - fun all() = values().toList().toImmutableList() + fun all() = entries.toImmutableList() } } diff --git a/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/IncomingProtocolType.kt b/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/IncomingProtocolType.kt index 62545c1ca0..910e295fad 100644 --- a/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/IncomingProtocolType.kt +++ b/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/IncomingProtocolType.kt @@ -13,10 +13,10 @@ enum class IncomingProtocolType( companion object { val DEFAULT = IMAP - fun all() = values().toList().toImmutableList() + fun all() = entries.toImmutableList() fun fromName(name: String): IncomingProtocolType { - return values().find { it.defaultName == name } ?: throw IllegalArgumentException("Unknown protocol: $name") + return entries.find { it.defaultName == name } ?: throw IllegalArgumentException("Unknown protocol: $name") } } } diff --git a/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/OutgoingProtocolType.kt b/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/OutgoingProtocolType.kt index e59b81a7fa..55b32ac203 100644 --- a/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/OutgoingProtocolType.kt +++ b/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/domain/entity/OutgoingProtocolType.kt @@ -12,7 +12,7 @@ enum class OutgoingProtocolType( companion object { val DEFAULT = SMTP - fun all() = values().toList().toImmutableList() + fun all() = entries.toImmutableList() } } diff --git a/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/AuthenticationTypeTest.kt b/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/AuthenticationTypeTest.kt index f7f3449927..2fdca47716 100644 --- a/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/AuthenticationTypeTest.kt +++ b/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/AuthenticationTypeTest.kt @@ -9,7 +9,7 @@ class AuthenticationTypeTest { @Test fun `should map all AuthenticationType to AuthTypes`() { - val types = AuthenticationType.values() + val types = AuthenticationType.entries for (type in types) { val authType = type.toAuthType() @@ -28,7 +28,7 @@ class AuthenticationTypeTest { @Test fun `should map all AuthTypes to AuthenticationTypes`() { - val types = AuthType.values() + val types = AuthType.entries for (type in types) { val authenticationType = type.toAuthenticationType() diff --git a/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/ConnectionSecurityTest.kt b/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/ConnectionSecurityTest.kt index 4cdc873c10..8a80194619 100644 --- a/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/ConnectionSecurityTest.kt +++ b/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/ConnectionSecurityTest.kt @@ -59,7 +59,7 @@ class ConnectionSecurityTest { @Test fun `should map all MailConnectionSecurities to ConnectionSecurities`() { - val securities = MailConnectionSecurity.values() + val securities = MailConnectionSecurity.entries for (security in securities) { val connectionSecurity = security.toConnectionSecurity() @@ -76,7 +76,7 @@ class ConnectionSecurityTest { @Test fun `should map to all ConnectionSecurities to MailConnectionSecurities`() { - val connectionSecurities = ConnectionSecurity.values() + val connectionSecurities = ConnectionSecurity.entries for (security in connectionSecurities) { val mailConnectionSecurity = security.toMailConnectionSecurity() diff --git a/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/IncomingProtocolTypeTest.kt b/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/IncomingProtocolTypeTest.kt index 9966eb14a3..3980ddc9a6 100644 --- a/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/IncomingProtocolTypeTest.kt +++ b/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/IncomingProtocolTypeTest.kt @@ -12,7 +12,7 @@ class IncomingProtocolTypeTest { val protocolTypes = IncomingProtocolType.all() assertThat(protocolTypes).isEqualTo( - IncomingProtocolType.values().toList(), + IncomingProtocolType.entries, ) } diff --git a/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/OutgoingProtocolTypeTest.kt b/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/OutgoingProtocolTypeTest.kt index 15dca7520c..a5f71f6ca4 100644 --- a/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/OutgoingProtocolTypeTest.kt +++ b/feature/account/common/src/test/kotlin/app/k9mail/feature/account/common/domain/entity/OutgoingProtocolTypeTest.kt @@ -11,7 +11,7 @@ class OutgoingProtocolTypeTest { val protocolTypes = OutgoingProtocolType.all() assertThat(protocolTypes).isEqualTo( - OutgoingProtocolType.values().toList(), + OutgoingProtocolType.entries, ) } diff --git a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/EmailCheckFrequency.kt b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/EmailCheckFrequency.kt index 729ad8db20..6b752927b3 100644 --- a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/EmailCheckFrequency.kt +++ b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/EmailCheckFrequency.kt @@ -19,7 +19,7 @@ enum class EmailCheckFrequency( companion object { val DEFAULT = EVERY_HOUR - fun all() = values().toList().toImmutableList() + fun all() = entries.toImmutableList() fun fromMinutes(minutes: Int): EmailCheckFrequency { return all().find { it.minutes == minutes } ?: DEFAULT diff --git a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/EmailDisplayCount.kt b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/EmailDisplayCount.kt index f315ccbfed..ab399fad04 100644 --- a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/EmailDisplayCount.kt +++ b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/EmailDisplayCount.kt @@ -17,7 +17,7 @@ enum class EmailDisplayCount( companion object { val DEFAULT = MESSAGES_25 - fun all() = values().toList().toImmutableList() + fun all() = entries.toImmutableList() fun fromCount(count: Int): EmailDisplayCount { return all().find { it.count == count } ?: DEFAULT diff --git a/feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/domain/entity/AutoDiscoveryAuthenticationTypeKtTest.kt b/feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/domain/entity/AutoDiscoveryAuthenticationTypeKtTest.kt index 47e0504332..53e9d3db49 100644 --- a/feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/domain/entity/AutoDiscoveryAuthenticationTypeKtTest.kt +++ b/feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/domain/entity/AutoDiscoveryAuthenticationTypeKtTest.kt @@ -9,7 +9,7 @@ class AutoDiscoveryAuthenticationTypeKtTest { @Test fun `should map all AutoDiscoveryAuthenticationTypes`() { - val types = AutoDiscoveryAuthenticationType.values() + val types = AutoDiscoveryAuthenticationType.entries for (type in types) { val authenticationType = type.toAuthenticationType() diff --git a/feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/domain/entity/AutoDiscoveryConnectionSecurityKtTest.kt b/feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/domain/entity/AutoDiscoveryConnectionSecurityKtTest.kt index 31d112a202..c7290ae19a 100644 --- a/feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/domain/entity/AutoDiscoveryConnectionSecurityKtTest.kt +++ b/feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/domain/entity/AutoDiscoveryConnectionSecurityKtTest.kt @@ -9,7 +9,7 @@ class AutoDiscoveryConnectionSecurityKtTest { @Test fun `should map all AutoDiscoveryConnectionSecurities`() { - val securities = AutoDiscoveryConnectionSecurity.values() + val securities = AutoDiscoveryConnectionSecurity.entries for (security in securities) { val connectionSecurity = security.toConnectionSecurity()