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

Commit 50eea089 authored by cketti's avatar cketti
Browse files

Extract `Settings.upgrade()` to `SettingsUpgradeHelper`

parent 2443f08e

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

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ class AccountSettingsDescriptions { 
    }



    public static Map<String, Object> upgrade(int version, Map<String, Object> validatedSettings) {

        return Settings.upgrade(version, UPGRADERS, SETTINGS, validatedSettings);

        return SettingsUpgradeHelper.upgrade(version, UPGRADERS, SETTINGS, validatedSettings);

    }



    public static Map<String, String> convert(Map<String, Object> settings) {

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

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ class FolderSettingsDescriptions { 
    }



    public static Map<String, Object> upgrade(int version, Map<String, Object> validatedSettings) {

        return Settings.upgrade(version, UPGRADERS, SETTINGS, validatedSettings);

        return SettingsUpgradeHelper.upgrade(version, UPGRADERS, SETTINGS, validatedSettings);

    }



    public static Map<String, String> convert(Map<String, Object> settings) {

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

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ class GeneralSettingsDescriptions { 
    }



    public static Map<String, Object> upgrade(int version, Map<String, Object> validatedSettings) {

        return Settings.upgrade(version, UPGRADERS, SETTINGS, validatedSettings);

        return SettingsUpgradeHelper.upgrade(version, UPGRADERS, SETTINGS, validatedSettings);

    }



    public static Map<String, String> convert(Map<String, Object> settings) {

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class IdentitySettingsDescriptions { 
    }



    public static Map<String, Object> upgrade(int version, Map<String, Object> validatedSettings) {

        return Settings.upgrade(version, UPGRADERS, SETTINGS, validatedSettings);

        return SettingsUpgradeHelper.upgrade(version, UPGRADERS, SETTINGS, validatedSettings);

    }



    public static Map<String, String> convert(Map<String, Object> settings) {

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

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ internal class ServerSettingsUpgrader( 
            return server

        }



        val upgradedSettings = Settings.upgrade(

        val upgradedSettings = SettingsUpgradeHelper.upgrade(

            contentVersion,

            serverSettingsDescriptions.upgraders,

            serverSettingsDescriptions.settings,