Merge pull request #10002 from wmontwe/feat-change-default-sync-interval-to-15

feat(sync): change default sync interval to 15 minutes

Author: wmontwe

core/android/account/src/main/kotlin/net/thunderbird/core/android/account/AccountDefaultsProvider.kt

@@ -41,7 +41,7 @@ interface AccountDefaultsProvider {
 
         const val DEFAULT_STRIP_SIGNATURE = true
 
-        const val DEFAULT_SYNC_INTERVAL = 60
+        const val DEFAULT_SYNC_INTERVAL = 15
 
         /**
          * Specifies how many messages will be shown in a folder by default. This number is set

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

@@ -18,7 +18,7 @@ enum class EmailCheckFrequency(
     ;
 
     companion object {
-        val DEFAULT = EVERY_HOUR
+        val DEFAULT = EVERY_15_MINUTES
         fun all() = entries.toImmutableList()
 
         fun fromMinutes(minutes: Int): EmailCheckFrequency {

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

@@ -20,6 +20,7 @@
 import com.fsck.k9.preferences.Settings.V;
 import com.fsck.k9.preferences.upgrader.AccountSettingsUpgraderTo104;
 import com.fsck.k9.preferences.upgrader.AccountSettingsUpgraderTo106;
+import com.fsck.k9.preferences.upgrader.AccountSettingsUpgraderTo107;
 import com.fsck.k9.preferences.upgrader.AccountSettingsUpgraderTo53;
 import com.fsck.k9.preferences.upgrader.AccountSettingsUpgraderTo54;
 import com.fsck.k9.preferences.upgrader.AccountSettingsUpgraderTo74;
@@ -80,7 +81,8 @@ class AccountSettingsDescriptions {
         ));
         s.put("automaticCheckIntervalMinutes", Settings.versions(
                 new V(1, new IntegerResourceSetting(-1, R.array.check_frequency_values)),
-                new V(61, new IntegerResourceSetting(60, R.array.check_frequency_values))
+                new V(61, new IntegerResourceSetting(60, R.array.check_frequency_values)),
+                new V(107, new IntegerResourceSetting(15, R.array.check_frequency_values))
         ));
         s.put("chipColor", Settings.versions(
                 new V(1, new ColorSetting(0xFF0000FF))
@@ -324,6 +326,7 @@ class AccountSettingsDescriptions {
         u.put(91, new AccountSettingsUpgraderTo91());
         u.put(104, new AccountSettingsUpgraderTo104());
         u.put(106, new AccountSettingsUpgraderTo106(new ServerSettingsDtoSerializer()));
+        u.put(107, new AccountSettingsUpgraderTo107());
 
         UPGRADERS = Collections.unmodifiableMap(u);
     }

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

@@ -34,7 +34,7 @@ class Settings {
      *
      * @see SettingsExporter
      */
-    public static final int VERSION = 106;
+    public static final int VERSION = 107;
 
     static Map<String, Object> validate(int version, Map<String, TreeMap<Integer, SettingsDescription<?>>> settings,
             Map<String, String> importedSettings, boolean useDefaultValues) {

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

@@ -0,0 +1,31 @@
+package com.fsck.k9.preferences.upgrader
+
+import com.fsck.k9.preferences.SettingsUpgrader
+
+/**
+ * Upgrade account settings
+ *
+ * - update the automatic check interval default from 60 to 15 minutes without
+ *   overwriting user-customized values (e.g., manual, 30 min, etc.).
+ */
+class AccountSettingsUpgraderTo107 : SettingsUpgrader {
+    override fun upgrade(settings: MutableMap<String, Any?>) {
+        val current = settings[AUTOMATIC_CHECK_INTERVAL_MINUTES_KEY] as? Int
+
+        when (current) {
+            null -> settings[AUTOMATIC_CHECK_INTERVAL_MINUTES_KEY] = NEW_CHECK_INTERVAL_MINUTES
+            OLD_DEFAULT_CHECK_INTERVAL_MINUTES -> {
+                settings[AUTOMATIC_CHECK_INTERVAL_MINUTES_KEY] = NEW_CHECK_INTERVAL_MINUTES
+            }
+            else -> {
+                // Keep user-selected value as-is
+            }
+        }
+    }
+
+    private companion object {
+        const val AUTOMATIC_CHECK_INTERVAL_MINUTES_KEY = "automaticCheckIntervalMinutes"
+        const val OLD_DEFAULT_CHECK_INTERVAL_MINUTES = 60
+        const val NEW_CHECK_INTERVAL_MINUTES = 15
+    }
+}

legacy/core/src/test/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo107Test.kt

@@ -0,0 +1,47 @@
+package com.fsck.k9.preferences.upgrader
+
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import kotlin.test.Test
+
+class AccountSettingsUpgraderTo107Test {
+
+    @Test
+    fun `should set automaticCheckIntervalMinutes when missing`() {
+        val settings = mutableMapOf<String, Any?>()
+
+        AccountSettingsUpgraderTo107().upgrade(settings)
+
+        assertThat(settings[AUTOMATIC_CHECK_INTERVAL_MINUTES_KEY]).isEqualTo(NEW_CHECK_INTERVAL_MINUTES)
+    }
+
+    @Test
+    fun `should change automaticCheckIntervalMinutes from old default to new default value`() {
+        val settings = mutableMapOf<String, Any?>(
+            AUTOMATIC_CHECK_INTERVAL_MINUTES_KEY to OLD_DEFAULT_CHECK_INTERVAL_MINUTES,
+        )
+
+        AccountSettingsUpgraderTo107().upgrade(settings)
+
+        assertThat(settings[AUTOMATIC_CHECK_INTERVAL_MINUTES_KEY]).isEqualTo(NEW_CHECK_INTERVAL_MINUTES)
+    }
+
+    @Test
+    fun `should keep custom automaticCheckIntervalMinutes for all allowed values`() {
+        val customValues = listOf(-1, 15, 30, 120, 180, 360, 720, 1440)
+
+        customValues.forEach { value ->
+            val settings = mutableMapOf<String, Any?>(AUTOMATIC_CHECK_INTERVAL_MINUTES_KEY to value)
+
+            AccountSettingsUpgraderTo107().upgrade(settings)
+
+            assertThat(settings[AUTOMATIC_CHECK_INTERVAL_MINUTES_KEY]).isEqualTo(value)
+        }
+    }
+
+    private companion object {
+        const val AUTOMATIC_CHECK_INTERVAL_MINUTES_KEY = "automaticCheckIntervalMinutes"
+        const val OLD_DEFAULT_CHECK_INTERVAL_MINUTES = 60
+        const val NEW_CHECK_INTERVAL_MINUTES = 15
+    }
+}