wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add migration for IMAP compression in settings file

Browse source
This commit is contained in:
cketti 2022-04-07 05:47:35 +02:00
parent 814583a89e
commit 72e679dca0
2 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java
View file

@ -207,13 +207,16 @@ public class AccountSettingsDescriptions {
new V(53, new StringSetting(null))
));
s.put("useCompression.MOBILE", Settings.versions(
new V(1, new BooleanSetting(true))
new V(1, new BooleanSetting(true)),
new V(81, null)
));
s.put("useCompression.OTHER", Settings.versions(
new V(1, new BooleanSetting(true))
new V(1, new BooleanSetting(true)),
new V(81, null)
));
s.put("useCompression.WIFI", Settings.versions(
new V(1, new BooleanSetting(true))
new V(1, new BooleanSetting(true)),
new V(81, null)
));
s.put("vibrate", Settings.versions(
new V(1, new BooleanSetting(false))
@ -270,6 +273,9 @@ public class AccountSettingsDescriptions {
s.put("notificationLight", Settings.versions(
new V(80, new EnumSetting<>(NotificationLight.class, NotificationLight.Disabled))
));
s.put("useCompression", Settings.versions(
new V(81, new BooleanSetting(true))
));
// note that there is no setting for openPgpProvider, because this will have to be set up together
// with the actual provider after import anyways.
@ -280,6 +286,7 @@ public class AccountSettingsDescriptions {
u.put(54, new SettingsUpgraderV54());
u.put(74, new SettingsUpgraderV74());
u.put(80, new SettingsUpgraderV80());
u.put(81, new SettingsUpgraderV81());
UPGRADERS = Collections.unmodifiableMap(u);
}
@ -546,4 +553,22 @@ public class AccountSettingsDescriptions {
return SetsKt.setOf("led", "ledColor");
}
}
/**
* Rewrite the per-network type IMAP compression settings to a single setting.
*/
private static class SettingsUpgraderV81 implements SettingsUpgrader {
@Override
public Set<String> upgrade(Map<String, Object> settings) {
Boolean useCompressionWifi = (Boolean) settings.get("useCompression.WIFI");
Boolean useCompressionMobile = (Boolean) settings.get("useCompression.MOBILE");
Boolean useCompressionOther = (Boolean) settings.get("useCompression.OTHER");
boolean useCompression = useCompressionWifi != null && useCompressionMobile != null &&
useCompressionOther != null && useCompressionWifi && useCompressionMobile && useCompressionOther;
settings.put("useCompression", useCompression);
return SetsKt.setOf("useCompression.WIFI", "useCompression.MOBILE", "useCompression.OTHER");
}
}
}

2
app/core/src/main/java/com/fsck/k9/preferences/Settings.java
View file

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