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

Commit 0b6c0c41 authored by cketti's avatar cketti
Browse files

Remove unused return value from `SettingsUpgrader.upgrade()`

parent 5fddbf43

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

+1 −4
Original line number Diff line number Diff line
@@ -355,11 +355,8 @@ public class Settings { 
         * @param settings

         *         The settings to upgrade.  This map is modified and contains the upgraded

         *         settings when this method returns.

         *

         * @return A set of setting names that were removed during the upgrade process or

         *         {@code null} if none were removed.

         */

        Set<String> upgrade(Map<String, Object> settings);

        void upgrade(Map<String, Object> settings);

    }

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

+1 −4
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ package com.fsck.k9.preferences.upgrader; 




import java.util.Map;

import java.util.Set;



import com.fsck.k9.preferences.Settings.SettingsUpgrader;
@@ -14,15 +13,13 @@ public class AccountSettingsUpgraderTo53 implements SettingsUpgrader { 
    public static final String FOLDER_NONE = "-NONE-";



    @Override

    public Set<String> upgrade(Map<String, Object> settings) {

    public void upgrade(Map<String, Object> settings) {

        upgradeFolderEntry(settings, "archiveFolderName");

        upgradeFolderEntry(settings, "autoExpandFolderName");

        upgradeFolderEntry(settings, "draftsFolderName");

        upgradeFolderEntry(settings, "sentFolderName");

        upgradeFolderEntry(settings, "spamFolderName");

        upgradeFolderEntry(settings, "trashFolderName");



        return null;

    }



    private void upgradeFolderEntry(Map<String, Object> settings, String key) {

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

+1 −4
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ package com.fsck.k9.preferences.upgrader; 




import java.util.Map;

import java.util.Set;



import com.fsck.k9.preferences.Settings.SettingsUpgrader;
@@ -14,13 +13,11 @@ public class AccountSettingsUpgraderTo54 implements SettingsUpgrader { 
    private static final String FOLDER_SELECTION_MANUAL = "MANUAL";



    @Override

    public Set<String> upgrade(Map<String, Object> settings) {

    public void upgrade(Map<String, Object> settings) {

        settings.put("archiveFolderSelection", FOLDER_SELECTION_MANUAL);

        settings.put("draftsFolderSelection", FOLDER_SELECTION_MANUAL);

        settings.put("sentFolderSelection", FOLDER_SELECTION_MANUAL);

        settings.put("spamFolderSelection", FOLDER_SELECTION_MANUAL);

        settings.put("trashFolderSelection", FOLDER_SELECTION_MANUAL);



        return null;

    }

}

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

+1 −4
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ package com.fsck.k9.preferences.upgrader; 




import java.util.Map;

import java.util.Set;



import com.fsck.k9.preferences.Settings.SettingsUpgrader;
@@ -12,12 +11,10 @@ import com.fsck.k9.preferences.Settings.SettingsUpgrader; 
 */

public class AccountSettingsUpgraderTo74 implements SettingsUpgrader {

    @Override

    public Set<String> upgrade(Map<String, Object> settings) {

    public void upgrade(Map<String, Object> settings) {

        Integer idleRefreshMinutes = (Integer) settings.get("idleRefreshMinutes");

        if (idleRefreshMinutes == 1) {

            settings.put("idleRefreshMinutes", 2);

        }



        return null;

    }

}

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

+2 −6
Original line number Diff line number Diff line
@@ -2,13 +2,11 @@ package com.fsck.k9.preferences.upgrader; 




import java.util.Map;

import java.util.Set;



import app.k9mail.legacy.notification.NotificationLight;

import app.k9mail.legacy.di.DI;

import app.k9mail.legacy.notification.NotificationLight;

import com.fsck.k9.notification.NotificationLightDecoder;

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

import kotlin.collections.SetsKt;





/**
@@ -18,7 +16,7 @@ public class AccountSettingsUpgraderTo80 implements SettingsUpgrader { 
    private final NotificationLightDecoder notificationLightDecoder = DI.get(NotificationLightDecoder.class);



    @Override

    public Set<String> upgrade(Map<String, Object> settings) {

    public void upgrade(Map<String, Object> settings) {

        Boolean isLedEnabled = (Boolean) settings.get("led");

        Integer ledColor = (Integer) settings.get("ledColor");

        Integer chipColor = (Integer) settings.get("chipColor");
@@ -28,7 +26,5 @@ public class AccountSettingsUpgraderTo80 implements SettingsUpgrader { 
            NotificationLight light = notificationLightDecoder.decode(isLedEnabled, ledColor, accountColor);

            settings.put("notificationLight", light.name());

        }



        return SetsKt.setOf("led", "ledColor");

    }

}