From c9c71b0b727791c82e69f6a3a7dee1042e072aed Mon Sep 17 00:00:00 2001 From: Ivan Baheux Date: Wed, 11 Jun 2025 17:03:44 +0200 Subject: [PATCH 1/2] Revert "mail: Update default folder push mode" This reverts commit f65067850cccdd5ca7fed6db5b09d68f1fec5d7d. --- .../src/main/java/app/k9mail/legacy/account/Account.kt | 2 +- .../src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt | 4 ++-- .../com/fsck/k9/preferences/AccountSettingsDescriptions.java | 4 +++- .../k9/preferences/upgrader/CombinedSettingsUpgraderTo98.kt | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/legacy/account/src/main/java/app/k9mail/legacy/account/Account.kt b/legacy/account/src/main/java/app/k9mail/legacy/account/Account.kt index 1f6ac848da..d464186894 100644 --- a/legacy/account/src/main/java/app/k9mail/legacy/account/Account.kt +++ b/legacy/account/src/main/java/app/k9mail/legacy/account/Account.kt @@ -183,7 +183,7 @@ class Account( @get:Synchronized @set:Synchronized - var folderPushMode = FolderMode.ALL + var folderPushMode = FolderMode.NONE @get:Synchronized @set:Synchronized diff --git a/legacy/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt b/legacy/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt index 10f89ea0a8..5edc9054d2 100644 --- a/legacy/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt +++ b/legacy/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt @@ -175,7 +175,7 @@ class AccountPreferenceSerializer( folderSyncMode = getEnumStringPref(storage, "$accountUuid.folderSyncMode", FolderMode.FIRST_CLASS) - folderPushMode = getEnumStringPref(storage, "$accountUuid.folderPushMode", FolderMode.ALL) + folderPushMode = getEnumStringPref(storage, "$accountUuid.folderPushMode", FolderMode.NONE) isSignatureBeforeQuotedText = storage.getBoolean("$accountUuid.signatureBeforeQuotedText", false) replaceIdentities(loadIdentities(accountUuid, storage)) @@ -575,7 +575,7 @@ class AccountPreferenceSerializer( messagesNotificationChannelVersion = 0 folderDisplayMode = FolderMode.NOT_SECOND_CLASS folderSyncMode = FolderMode.FIRST_CLASS - folderPushMode = FolderMode.ALL + folderPushMode = FolderMode.NONE sortType = DEFAULT_SORT_TYPE setSortAscending(DEFAULT_SORT_TYPE, DEFAULT_SORT_ASCENDING) showPictures = ShowPictures.ALWAYS diff --git a/legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java b/legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java index c5c3441fc4..af8a84472e 100644 --- a/legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java +++ b/legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java @@ -98,7 +98,9 @@ class AccountSettingsDescriptions { new V(100, null) )); s.put("folderPushMode", Settings.versions( - new V(1, new EnumSetting<>(FolderMode.class, FolderMode.ALL)) + new V(1, new EnumSetting<>(FolderMode.class, FolderMode.FIRST_CLASS)), + new V(72, new EnumSetting<>(FolderMode.class, FolderMode.NONE)), + new V(98, null) )); s.put("folderSyncMode", Settings.versions( new V(1, new EnumSetting<>(FolderMode.class, FolderMode.FIRST_CLASS)), diff --git a/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/CombinedSettingsUpgraderTo98.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/CombinedSettingsUpgraderTo98.kt index e5b1623bec..71499141d1 100644 --- a/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/CombinedSettingsUpgraderTo98.kt +++ b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/CombinedSettingsUpgraderTo98.kt @@ -8,7 +8,7 @@ import com.fsck.k9.preferences.legacy.FolderClass class CombinedSettingsUpgraderTo98 : CombinedSettingsUpgrader { override fun upgrade(account: ValidatedSettings.Account): ValidatedSettings.Account { - val folderPushMode = account.settings["folderPushMode"] as? FolderMode ?: FolderMode.ALL + val folderPushMode = account.settings["folderPushMode"] as? FolderMode ?: FolderMode.NONE val newFolders = account.folders.map { folder -> val newFolderSettings = folder.settings.toMutableMap().apply { -- GitLab From c4d321c711b1a17b687b3c6f6dbe05c5957bc1f3 Mon Sep 17 00:00:00 2001 From: Ivan Baheux Date: Wed, 11 Jun 2025 13:19:29 +0200 Subject: [PATCH 2/2] mail: Change default poll/sync frequency to 5min --- .../feature/account/setup/domain/entity/EmailCheckFrequency.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 6b752927b3..2d4d5e06f0 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 @@ -7,6 +7,7 @@ enum class EmailCheckFrequency( val minutes: Int, ) { MANUAL(-1), + EVERY_5_MINUTES(5), EVERY_15_MINUTES(15), EVERY_30_MINUTES(30), EVERY_HOUR(1.fromHour()), @@ -18,7 +19,7 @@ enum class EmailCheckFrequency( ; companion object { - val DEFAULT = EVERY_HOUR + val DEFAULT = EVERY_5_MINUTES fun all() = entries.toImmutableList() fun fromMinutes(minutes: Int): EmailCheckFrequency { -- GitLab