From 68622e02353cbf9a08714bc39d2567dd0326ae4d Mon Sep 17 00:00:00 2001 From: Francesco Andreuzzi <andreuzzi.francesco@gmail.com> Date: Mon, 6 Jun 2016 20:39:45 +0200 Subject: [PATCH] bugfix --- .../consolelauncher/commands/raw/refresh.java | 4 +-- .../managers/AliasManager.java | 26 ++++++++++++------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/ohi/andre/consolelauncher/commands/raw/refresh.java b/app/src/main/java/ohi/andre/consolelauncher/commands/raw/refresh.java index f33bb25..bcb6d60 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/commands/raw/refresh.java +++ b/app/src/main/java/ohi/andre/consolelauncher/commands/raw/refresh.java @@ -5,7 +5,6 @@ import android.app.Activity; import ohi.andre.consolelauncher.R; import ohi.andre.consolelauncher.commands.CommandAbstraction; import ohi.andre.consolelauncher.commands.ExecInfo; -import ohi.andre.consolelauncher.managers.AliasManager; import ohi.andre.consolelauncher.managers.PreferencesManager; public class refresh implements CommandAbstraction { @@ -13,9 +12,8 @@ public class refresh implements CommandAbstraction { @Override public String exec(ExecInfo info) { info.appsManager.fill(((Activity) info.context).getPreferences(0)); - info.preferencesManager.refresh(PreferencesManager.ALIAS); - info.aliasManager = new AliasManager(info.preferencesManager); + info.aliasManager.reload(); return info.res.getString(R.string.output_refresh); } diff --git a/app/src/main/java/ohi/andre/consolelauncher/managers/AliasManager.java b/app/src/main/java/ohi/andre/consolelauncher/managers/AliasManager.java index d64076f..024cbbf 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/managers/AliasManager.java +++ b/app/src/main/java/ohi/andre/consolelauncher/managers/AliasManager.java @@ -6,19 +6,16 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -public class AliasManager { +import ohi.andre.consolelauncher.tuils.interfaces.Reloadable; + +public class AliasManager implements Reloadable { private Map<String, String> alias; + private PreferencesManager preferences; public AliasManager(PreferencesManager prefs) { - alias = new HashMap<>(); - for (int count = 0; count < prefs.getLength(PreferencesManager.ALIAS); count++) { - String line = prefs.getLine(PreferencesManager.ALIAS, count); - String name = prefs.obtainKey(line); - String value = prefs.obtainValue(line); - - alias.put(name, value); - } + this.preferences = prefs; + reload(); } public String printAliases() { @@ -49,4 +46,15 @@ public class AliasManager { return alias.keySet(); } + @Override + public void reload() { + alias = new HashMap<>(); + for (int count = 0; count < preferences.getLength(PreferencesManager.ALIAS); count++) { + String line = preferences.getLine(PreferencesManager.ALIAS, count); + String name = preferences.obtainKey(line); + String value = preferences.obtainValue(line); + + alias.put(name, value); + } + } } -- GitLab