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

Commit d94d1c69 authored by Ivan Baheux's avatar Ivan Baheux
Browse files

Merge branch '3097-develop-default_disable_push' into 'develop' 

feat: change default poll/sync frequency to 5min

See merge request !174
parents 4f5a490c c4d321c7

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/EmailCheckFrequency.kt

+2 −1
Original line number Diff line number Diff line
@@ -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 {

legacy/account/src/main/java/app/k9mail/legacy/account/Account.kt

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ class Account( 


    @get:Synchronized

    @set:Synchronized

    var folderPushMode = FolderMode.ALL

    var folderPushMode = FolderMode.NONE



    @get:Synchronized

    @set:Synchronized

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

+2 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ class AccountPreferenceSerializer( 
            folderSyncMode =

                getEnumStringPref<FolderMode>(storage, "$accountUuid.folderSyncMode", FolderMode.FIRST_CLASS)



            folderPushMode = getEnumStringPref<FolderMode>(storage, "$accountUuid.folderPushMode", FolderMode.ALL)

            folderPushMode = getEnumStringPref<FolderMode>(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

legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java

+3 −1
Original line number Diff line number Diff line
@@ -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)),

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

+1 −1
Original line number Diff line number Diff line
@@ -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 {