From e90c555c18c83c289254bd8b1b270793a9bcd8a1 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Wed, 1 Aug 2018 03:09:44 +0800 Subject: [PATCH] Some cleanups --- app/src/full/java/com/topjohnwu/magisk/Data.java | 7 +------ .../java/com/topjohnwu/magisk/MagiskManager.java | 1 - .../com/topjohnwu/magisk/asyncs/InstallMagisk.java | 5 +++-- .../com/topjohnwu/magisk/utils/LocaleManager.java | 12 ++++++------ app/src/full/res/xml/app_settings.xml | 2 ++ app/src/main/res/values/strings.xml | 1 + 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/app/src/full/java/com/topjohnwu/magisk/Data.java b/app/src/full/java/com/topjohnwu/magisk/Data.java index be7a6cf30..a0d62f05b 100644 --- a/app/src/full/java/com/topjohnwu/magisk/Data.java +++ b/app/src/full/java/com/topjohnwu/magisk/Data.java @@ -52,9 +52,7 @@ public class Data { public static int suResponseType; public static int suNotificationType; public static int suNamespaceMode; - public static String localeConfig; public static int updateChannel; - public static String bootFormat; public static int repoOrder; public static void loadMagiskInfo() { @@ -154,8 +152,7 @@ public class Data { // config isDarkTheme = mm.prefs.getBoolean(Const.Key.DARK_THEME, false); updateChannel = Utils.getPrefsInt(mm.prefs, Const.Key.UPDATE_CHANNEL, Const.Value.STABLE_CHANNEL); - bootFormat = mm.prefs.getString(Const.Key.BOOT_FORMAT, ".img"); - repoOrder = mm.prefs.getInt(Const.Key.REPO_ORDER, Const.Value.ORDER_NAME); + repoOrder = mm.prefs.getInt(Const.Key.REPO_ORDER, Const.Value.ORDER_DATE); } public static void writeConfig() { @@ -171,8 +168,6 @@ public class Data { .putString(Const.Key.SU_MULTIUSER_MODE, String.valueOf(multiuserMode)) .putString(Const.Key.SU_MNT_NS, String.valueOf(suNamespaceMode)) .putString(Const.Key.UPDATE_CHANNEL, String.valueOf(updateChannel)) - .putString(Const.Key.LOCALE, localeConfig) - .putString(Const.Key.BOOT_FORMAT, bootFormat) .putInt(Const.Key.UPDATE_SERVICE_VER, Const.UPDATE_SERVICE_VER) .putInt(Const.Key.REPO_ORDER, repoOrder) .apply(); diff --git a/app/src/full/java/com/topjohnwu/magisk/MagiskManager.java b/app/src/full/java/com/topjohnwu/magisk/MagiskManager.java index 6f9ab9575..c7b702b68 100644 --- a/app/src/full/java/com/topjohnwu/magisk/MagiskManager.java +++ b/app/src/full/java/com/topjohnwu/magisk/MagiskManager.java @@ -44,7 +44,6 @@ public class MagiskManager extends ContainerApp { prefs = PreferenceManager.getDefaultSharedPreferences(this); mDB = MagiskDatabaseHelper.getInstance(this); - LocaleManager.locale = LocaleManager.defaultLocale = Locale.getDefault(); String pkg = mDB.getStrings(Const.Key.SU_MANAGER, null); if (pkg != null && getPackageName().equals(Const.ORIG_PKG_NAME)) { diff --git a/app/src/full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java b/app/src/full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java index 0273e03a0..111e78d4b 100644 --- a/app/src/full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java +++ b/app/src/full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java @@ -231,10 +231,11 @@ public class InstallMagisk extends ParallelTask { private void outputBoot(File patched) throws IOException { switch (mode) { case PATCH_MODE: - File dest = new File(Download.EXTERNAL_PATH, "patched_boot" + Data.bootFormat); + String fmt = mm.prefs.getString(Const.Key.BOOT_FORMAT, ".img"); + File dest = new File(Download.EXTERNAL_PATH, "patched_boot" + fmt); dest.getParentFile().mkdirs(); OutputStream out; - switch (Data.bootFormat) { + switch (fmt) { case ".img.tar": out = new TarOutputStream(new BufferedOutputStream(new FileOutputStream(dest))); ((TarOutputStream) out).putNextEntry(new TarEntry(patched, "boot.img")); diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/LocaleManager.java b/app/src/full/java/com/topjohnwu/magisk/utils/LocaleManager.java index 66ff71b20..5b7fcb380 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/LocaleManager.java +++ b/app/src/full/java/com/topjohnwu/magisk/utils/LocaleManager.java @@ -17,20 +17,20 @@ import java.util.List; import java.util.Locale; public class LocaleManager { - public static Locale locale; - public static Locale defaultLocale; + public static Locale locale = Locale.getDefault(); + public final static Locale defaultLocale = Locale.getDefault(); public static List locales; public static void setLocale() { MagiskManager mm = Data.MM(); - Data.localeConfig = mm.prefs.getString(Const.Key.LOCALE, ""); - if (Data.localeConfig.isEmpty()) { + String localeConfig = mm.prefs.getString(Const.Key.LOCALE, ""); + if (localeConfig.isEmpty()) { locale = defaultLocale; } else { - locale = Locale.forLanguageTag(Data.localeConfig); + locale = Locale.forLanguageTag(localeConfig); } Resources res = mm.getResources(); - Configuration config = new Configuration(res.getConfiguration()); + Configuration config = res.getConfiguration(); config.setLocale(locale); res.updateConfiguration(config, res.getDisplayMetrics()); } diff --git a/app/src/full/res/xml/app_settings.xml b/app/src/full/res/xml/app_settings.xml index 4a969d99c..975e7d58e 100644 --- a/app/src/full/res/xml/app_settings.xml +++ b/app/src/full/res/xml/app_settings.xml @@ -12,6 +12,7 @@ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 71c93db17..b3ca7c91f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,6 +5,7 @@ Magisk Manager Magisk Magisk Hide + Error downloading file