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

Unverified Commit 6e3b9143 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #8095 from thunderbird/preferences_refactoring 

Refactor settings code
parents 58ec4655 b8daf725

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

+4 −17
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import com.fsck.k9.preferences.Settings.IntegerRangeSetting; 
import com.fsck.k9.preferences.Settings.InvalidSettingValueException;

import com.fsck.k9.preferences.Settings.PseudoEnumSetting;

import com.fsck.k9.preferences.Settings.SettingsDescription;

import com.fsck.k9.preferences.Settings.SettingsUpgrader;

import com.fsck.k9.preferences.Settings.StringSetting;

import com.fsck.k9.preferences.Settings.V;

import com.fsck.k9.preferences.upgrader.AccountSettingsUpgraderTo53;
@@ -45,12 +44,12 @@ import com.fsck.k9.preferences.upgrader.AccountSettingsUpgraderTo91; 
import static com.fsck.k9.preferences.upgrader.AccountSettingsUpgraderTo53.FOLDER_NONE;





public class AccountSettingsDescriptions {

    static final Map<String, TreeMap<Integer, SettingsDescription>> SETTINGS;

class AccountSettingsDescriptions {

    static final Map<String, TreeMap<Integer, SettingsDescription<?>>> SETTINGS;

    private static final Map<Integer, SettingsUpgrader> UPGRADERS;



    static {

        Map<String, TreeMap<Integer, SettingsDescription>> s = new LinkedHashMap<>();

        Map<String, TreeMap<Integer, SettingsDescription<?>>> s = new LinkedHashMap<>();



        /*

         * When adding new settings here, be sure to increment {@link Settings.VERSION}
@@ -304,25 +303,13 @@ public 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) {

        return Settings.convert(settings, SETTINGS);

    }



    static Map<String, String> getAccountSettings(Storage storage, String uuid) {

        Map<String, String> result = new HashMap<>();

        String prefix = uuid + ".";

        for (String key : SETTINGS.keySet()) {

            String value = storage.getString(prefix + key, null);

            if (value != null) {

                result.put(key, value);

            }

        }

        return result;

    }



    private static class IntegerResourceSetting extends PseudoEnumSetting<Integer> {

        private final Context context = DI.get(Context.class);

        private final Map<Integer, String> mapping;

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

+3 −16
Original line number Diff line number Diff line
@@ -11,16 +11,15 @@ import com.fsck.k9.mail.FolderClass; 
import com.fsck.k9.preferences.Settings.BooleanSetting;

import com.fsck.k9.preferences.Settings.EnumSetting;

import com.fsck.k9.preferences.Settings.SettingsDescription;

import com.fsck.k9.preferences.Settings.SettingsUpgrader;

import com.fsck.k9.preferences.Settings.V;





class FolderSettingsDescriptions {

    static final Map<String, TreeMap<Integer, SettingsDescription>> SETTINGS;

    static final Map<String, TreeMap<Integer, SettingsDescription<?>>> SETTINGS;

    private static final Map<Integer, SettingsUpgrader> UPGRADERS;



    static {

        Map<String, TreeMap<Integer, SettingsDescription>> s = new LinkedHashMap<>();

        Map<String, TreeMap<Integer, SettingsDescription<?>>> s = new LinkedHashMap<>();



        /*

         * When adding new settings here, be sure to increment {@link Settings.VERSION}
@@ -59,22 +58,10 @@ 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) {

        return Settings.convert(settings, SETTINGS);

    }



    static Map<String, String> getFolderSettings(Storage storage, String uuid, String folderName) {

        Map<String, String> result = new HashMap<>();

        String prefix = uuid + "." + folderName + ".";

        for (String key : SETTINGS.keySet()) {

            String value = storage.getString(prefix + key, null);

            if (value != null) {

                result.put(key, value);

            }

        }

        return result;

    }

}

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

+5 −6
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import com.fsck.k9.preferences.Settings.IntegerRangeSetting; 
import com.fsck.k9.preferences.Settings.InvalidSettingValueException;

import com.fsck.k9.preferences.Settings.PseudoEnumSetting;

import com.fsck.k9.preferences.Settings.SettingsDescription;

import com.fsck.k9.preferences.Settings.SettingsUpgrader;

import com.fsck.k9.preferences.Settings.V;

import com.fsck.k9.preferences.Settings.WebFontSizeSetting;

import com.fsck.k9.preferences.upgrader.GeneralSettingsUpgraderTo24;
@@ -45,12 +44,12 @@ import com.fsck.k9.preferences.upgrader.GeneralSettingsUpgraderTo89; 
import static com.fsck.k9.K9.LockScreenNotificationVisibility;





public class GeneralSettingsDescriptions {

    static final Map<String, TreeMap<Integer, SettingsDescription>> SETTINGS;

class GeneralSettingsDescriptions {

    static final Map<String, TreeMap<Integer, SettingsDescription<?>>> SETTINGS;

    private static final Map<Integer, SettingsUpgrader> UPGRADERS;



    static {

        Map<String, TreeMap<Integer, SettingsDescription>> s = new LinkedHashMap<>();

        Map<String, TreeMap<Integer, SettingsDescription<?>>> s = new LinkedHashMap<>();



        /*

         * When adding new settings here, be sure to increment {@link Settings.VERSION}
@@ -286,7 +285,7 @@ public class GeneralSettingsDescriptions { 
            new V(85, new BooleanSetting(true))

        ));

        s.put("messageListDensity", Settings.versions(

            new V(86, new EnumSetting(UiDensity.class, UiDensity.Default))

            new V(86, new EnumSetting<>(UiDensity.class, UiDensity.Default))

        ));

        s.put("fontSizeMessageViewAccountName", Settings.versions(

            new V(87, new FontSizeSetting(FontSizes.FONT_DEFAULT))
@@ -317,7 +316,7 @@ public 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

+3 −18
Original line number Diff line number Diff line
@@ -13,16 +13,15 @@ import com.fsck.k9.EmailAddressValidator; 
import com.fsck.k9.preferences.Settings.BooleanSetting;

import com.fsck.k9.preferences.Settings.InvalidSettingValueException;

import com.fsck.k9.preferences.Settings.SettingsDescription;

import com.fsck.k9.preferences.Settings.SettingsUpgrader;

import com.fsck.k9.preferences.Settings.V;





class IdentitySettingsDescriptions {

    static final Map<String, TreeMap<Integer, SettingsDescription>> SETTINGS;

    static final Map<String, TreeMap<Integer, SettingsDescription<?>>> SETTINGS;

    private static final Map<Integer, SettingsUpgrader> UPGRADERS;



    static {

        Map<String, TreeMap<Integer, SettingsDescription>> s = new LinkedHashMap<>();

        Map<String, TreeMap<Integer, SettingsDescription<?>>> s = new LinkedHashMap<>();



        /*

         * When adding new settings here, be sure to increment {@link Settings.VERSION}
@@ -52,27 +51,13 @@ 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) {

        return Settings.convert(settings, SETTINGS);

    }



    static Map<String, String> getIdentitySettings(Storage storage, String uuid, int identityIndex) {

        Map<String, String> result = new HashMap<>();

        String prefix = uuid + ".";

        String suffix = "." + Integer.toString(identityIndex);

        for (String key : SETTINGS.keySet()) {

            String value = storage.getString(prefix + key + suffix, null);

            if (value != null) {

                result.put(key, value);

            }

        }

        return result;

    }





    static boolean isEmailAddressValid(String email) {

        return new EmailAddressValidator().isValidAddressOnly(email);

    }

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

+2 −3
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ package com.fsck.k9.preferences 


import com.fsck.k9.preferences.Settings.IntegerRangeSetting

import com.fsck.k9.preferences.Settings.SettingsDescription

import com.fsck.k9.preferences.Settings.SettingsUpgrader

import com.fsck.k9.preferences.Settings.StringSetting

import com.fsck.k9.preferences.upgrader.ServerSettingsUpgraderTo92

import com.fsck.k9.preferences.upgrader.ServerSettingsUpgraderTo94
@@ -15,7 +14,7 @@ import java.util.TreeMap 
 */

@Suppress("MagicNumber")

internal class ServerSettingsDescriptions {

    val settings: Map<String, TreeMap<Int, SettingsDescription<*>>> by lazy {

    val settings: Map<String, TreeMap<Int, SettingsDescription<*>?>> by lazy {

        mapOf(

            HOST to versions(

                1 to StringSetting(null),
@@ -102,6 +101,6 @@ internal class ServerSettingsDescriptions { 
    }

}



private fun versions(vararg versions: Pair<Int, SettingsDescription<*>>): TreeMap<Int, SettingsDescription<*>> {

private fun versions(vararg versions: Pair<Int, SettingsDescription<*>?>): TreeMap<Int, SettingsDescription<*>?> {

    return TreeMap(versions.toMap())

}