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

Commit b0bb33da authored by cketti's avatar cketti
Browse files

Change `Settings.upgrade()` to return the upgraded settings

parent 0b6c0c41

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

+2 −2
Original line number Diff line number Diff line
@@ -303,8 +303,8 @@ public class AccountSettingsDescriptions { 
        return Settings.validate(version, SETTINGS, importedSettings, useDefaultValues);

    }



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

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

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

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

    }



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

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

+3 −4
Original line number Diff line number Diff line
@@ -6,13 +6,12 @@ internal class AccountSettingsUpgrader { 
    private val serverSettingsUpgrader = ServerSettingsUpgrader()



    fun upgrade(contentVersion: Int, account: ValidatedSettings.Account): ValidatedSettings.Account {

        val validatedSettings = account.settings.toMutableMap()

        if (contentVersion != Settings.VERSION) {

            AccountSettingsDescriptions.upgrade(contentVersion, validatedSettings)

        if (contentVersion == Settings.VERSION) {

            return account

        }



        return account.copy(

            settings = validatedSettings.toMap(),

            settings = AccountSettingsDescriptions.upgrade(contentVersion, account.settings),

            incoming = serverSettingsUpgrader.upgrade(contentVersion, account.incoming),

            outgoing = serverSettingsUpgrader.upgrade(contentVersion, account.outgoing),

            identities = upgradeIdentities(contentVersion, account.identities),

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

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ class FolderSettingsDescriptions { 
        return Settings.validate(version, SETTINGS, importedSettings, useDefaultValues);

    }



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

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

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

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

    }



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

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

+5 −4
Original line number Diff line number Diff line
@@ -2,11 +2,12 @@ package com.fsck.k9.preferences 


internal class FolderSettingsUpgrader {

    fun upgrade(contentVersion: Int, folder: ValidatedSettings.Folder): ValidatedSettings.Folder {

        val settings = folder.settings.toMutableMap()

        if (contentVersion != Settings.VERSION) {

            FolderSettingsDescriptions.upgrade(contentVersion, settings)

        if (contentVersion == Settings.VERSION) {

            return folder

        }



        return folder.copy(settings = settings.toMap())

        val upgradedSettings = FolderSettingsDescriptions.upgrade(contentVersion, folder.settings)



        return folder.copy(settings = upgradedSettings)

    }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -316,8 +316,8 @@ public class GeneralSettingsDescriptions { 
        return Settings.validate(version, SETTINGS, importedSettings, false);

    }



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

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

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

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

    }



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