移除一些多余的内容

Author: lingqiqi5211

app/src/main/java/com/sevtinge/hyperceiler/home/safemode/CrashActivity.java

@@ -34,6 +34,7 @@
 import com.sevtinge.hyperceiler.core.R;
 import com.sevtinge.hyperceiler.libhook.safecrash.CrashScope;
 import com.sevtinge.hyperceiler.utils.DialogHelper;
+import com.sevtinge.hyperceiler.utils.LanguageHelper;
 
 import fan.appcompat.app.AppCompatActivity;
 
@@ -48,7 +49,7 @@ public class CrashActivity extends AppCompatActivity {
 
     @Override
     protected void attachBaseContext(Context newBase) {
-        super.attachBaseContext(com.sevtinge.hyperceiler.utils.LanguageHelper.wrapContext(newBase));
+        super.attachBaseContext(LanguageHelper.wrapContext(newBase));
     }
 
     @SuppressLint({"SetTextI18n", "StringFormatInvalid"})

app/src/main/java/com/sevtinge/hyperceiler/home/safemode/ExceptionCrashActivity.java

@@ -33,6 +33,7 @@
 import com.sevtinge.hyperceiler.BuildConfig;
 import com.sevtinge.hyperceiler.R;
 import com.sevtinge.hyperceiler.common.log.AndroidLog;
+import com.sevtinge.hyperceiler.utils.LanguageHelper;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -47,7 +48,7 @@ public class ExceptionCrashActivity extends AppCompatActivity implements View.On
 
     @Override
     protected void attachBaseContext(Context newBase) {
-        super.attachBaseContext(com.sevtinge.hyperceiler.utils.LanguageHelper.wrapContext(newBase));
+        super.attachBaseContext(LanguageHelper.wrapContext(newBase));
     }
 
     @Override

library/core/src/main/java/com/sevtinge/hyperceiler/hooker/VariousFragment.java

@@ -48,10 +48,6 @@ public class VariousFragment extends DashboardFragment {
     private static final String PREF_IME_SHOW_ALL = "prefs_key_various_unlock_ime_show_all";
     private static final String PREF_AOSP_IME_NAV_BAR_LAYOUT_START = "prefs_key_various_aosp_ime_nav_bar_layout_start";
     private static final String PREF_AOSP_IME_NAV_BAR_LAYOUT_END = "prefs_key_various_aosp_ime_nav_bar_layout_end";
-    private static final String PREF_LEGACY_MIUI_ENABLE = "prefs_key_various_unlock_ime";
-    private static final String PREF_LEGACY_AOSP_ENABLE = "prefs_key_various_aosp_ime";
-    private static final String PREF_LEGACY_AOSP_TARGET_APPS = "prefs_key_various_aosp_ime_apps";
-
     private static final int IME_STYLE_OFF = 0;
     private static final int IME_STYLE_MIUI = 1;
     private static final int IME_STYLE_AOSP = 2;
@@ -71,7 +67,6 @@ public int getPreferenceScreenResId() {
 
     @Override
     public void initPrefs() {
-        migrateLegacyInputMethodPrefs();
         mClipboard = findPreference("prefs_key_sogou_xiaomi_clipboard");
         mClipboardClear = findPreference("prefs_key_add_clipboard_clear");
         mImeStyle = findPreference(PREF_IME_STYLE);
@@ -162,7 +157,7 @@ private void updateInputMethodSummary() {
         }
 
         Set<String> packages = getInputMethodTargets();
-        if (packages == null || packages.isEmpty()) {
+        if (packages.isEmpty()) {
             mImeTargetApps.setSummary(R.string.various_unlock_ime_apps_desc);
             return;
         }
@@ -228,43 +223,6 @@ private void updateDropDownSummary(DropDownPreference preference, String value)
         }
     }
 
-    private void migrateLegacyInputMethodPrefs() {
-        SharedPreferences preferences = getSharedPreferences();
-        if (preferences == null || preferences.contains(PREF_IME_STYLE)) {
-            return;
-        }
-
-        boolean legacyMiuiEnabled = preferences.getBoolean(PREF_LEGACY_MIUI_ENABLE, false);
-        boolean legacyAospEnabled = preferences.getBoolean(PREF_LEGACY_AOSP_ENABLE, false);
-        LinkedHashSet<String> inputMethodTargets = new LinkedHashSet<>(
-            preferences.getStringSet(PREF_IME_TARGET_APPS, Collections.emptySet()));
-        LinkedHashSet<String> legacyAospTargets = new LinkedHashSet<>(
-            preferences.getStringSet(PREF_LEGACY_AOSP_TARGET_APPS, Collections.emptySet()));
-
-        int migratedStyle = IME_STYLE_OFF;
-        if (legacyMiuiEnabled) {
-            migratedStyle = IME_STYLE_MIUI;
-        } else if (legacyAospEnabled) {
-            migratedStyle = IME_STYLE_AOSP;
-            if (inputMethodTargets.isEmpty() && !legacyAospTargets.isEmpty()) {
-                inputMethodTargets.addAll(legacyAospTargets);
-            }
-        }
-
-        SharedPreferences.Editor editor = preferences.edit();
-        editor.putString(PREF_IME_STYLE, String.valueOf(migratedStyle));
-        if (legacyMiuiEnabled) {
-            editor.putBoolean(PREF_IME_SHOW_ALL, true);
-        }
-        if (!inputMethodTargets.isEmpty()) {
-            editor.putStringSet(PREF_IME_TARGET_APPS, inputMethodTargets);
-        }
-        editor.remove(PREF_LEGACY_MIUI_ENABLE);
-        editor.remove(PREF_LEGACY_AOSP_ENABLE);
-        editor.remove(PREF_LEGACY_AOSP_TARGET_APPS);
-        editor.apply();
-    }
-
     private int getImeStyle() {
         SharedPreferences preferences = getSharedPreferences();
         if (preferences == null) {

library/core/src/main/java/com/sevtinge/hyperceiler/sub/SubPickerActivity.java

@@ -51,6 +51,7 @@
 import com.sevtinge.hyperceiler.model.adapter.AppDataAdapter;
 import com.sevtinge.hyperceiler.model.data.AppData;
 import com.sevtinge.hyperceiler.model.data.AppDataManager;
+import com.sevtinge.hyperceiler.utils.LanguageHelper;
 import com.sevtinge.hyperceiler.utils.ScopeManager;
 import com.sevtinge.hyperceiler.utils.ThreadUtils;
 
@@ -104,7 +105,7 @@ public class SubPickerActivity extends AppCompatActivity
 
     @Override
     protected void attachBaseContext(Context newBase) {
-        super.attachBaseContext(com.sevtinge.hyperceiler.utils.LanguageHelper.wrapContext(newBase));
+        super.attachBaseContext(LanguageHelper.wrapContext(newBase));
     }
 
     @Override

library/core/src/main/java/com/sevtinge/hyperceiler/utils/AppIconCache.java

@@ -34,7 +34,6 @@
 import androidx.collection.LruCache;
 
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
 import me.zhanghai.android.appiconloader.AppIconLoader;
@@ -198,25 +197,18 @@ public interface IconCallback {
         void onIconLoaded(@Nullable Drawable icon);
     }
 
-    private static final class CacheKey {
-        private final String packageName;
-        private final int sizePx;
-
-        private CacheKey(@NonNull String packageName, int sizePx) {
-            this.packageName = packageName;
-            this.sizePx = sizePx;
-        }
+    private record CacheKey(String packageName, int sizePx) {
+            private CacheKey(@NonNull String packageName, int sizePx) {
+                this.packageName = packageName;
+                this.sizePx = sizePx;
+            }
 
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) return true;
-            if (!(obj instanceof CacheKey other)) return false;
-            return sizePx == other.sizePx && packageName.equals(other.packageName);
-        }
+            @Override
+            public boolean equals(Object obj) {
+                if (this == obj) return true;
+                if (!(obj instanceof CacheKey other)) return false;
+                return sizePx == other.sizePx && packageName.equals(other.packageName);
+            }
 
-        @Override
-        public int hashCode() {
-            return Objects.hash(packageName, sizePx);
-        }
     }
 }

library/core/src/main/res/values-zh-rCN/strings_app.xml

@@ -1607,7 +1607,7 @@
     <string name="various_phrase_clipboardlist">解除常用语剪贴板条数和时间限制</string>
     <string name="various_phrase_clipboardlist_more">开启后请在 Xposed 管理器中勾选对应输入法作用域</string>
     <string name="various_unlock_ime">解锁输入法全面屏优化</string>
-    <string name="various_unlock_ime_desc">对所选输入法启用所选样式的全面屏优化\n原生风格需要额外勾选系统框架作用域\n选择原生风格后只对非小米定制版生效，小米定制版勾选将加入键盘可切换列表</string>
+    <string name="various_unlock_ime_desc">对目标输入法启用所选样式的全面屏优化\n原生风格需要额外勾选系统框架作用域\n选择原生风格后只对非小米定制版生效，小米定制版勾选将加入键盘可切换列表</string>
     <string name="various_unlock_ime_apps">目标输入法</string>
     <string name="various_unlock_ime_apps_desc">若所选输入法未加入作用域，将同时申请作用域</string>
     <string name="various_unlock_ime_show_all">显示全部输入法列表</string>
@@ -1618,9 +1618,6 @@
     <string name="various_aosp_ime_nav_bar_layout_end">右侧功能键</string>
     <string name="various_aosp_ime_nav_bar_layout_hide_ime">收起输入法</string>
     <string name="various_aosp_ime_nav_bar_layout_ime_switcher">切换输入法</string>
-    <string name="various_aosp_ime">Mi_AOSP_IME</string>
-    <string name="various_aosp_ime_desc">对所选输入法启用 AOSP 风格导航栏/底栏。需要勾选对应输入法作用域和 Android/System Framework 作用域</string>
-    <string name="various_aosp_ime_apps">Mi_AOSP_IME 目标输入法</string>
     <string name="various_input_method_apps_count">已选择 %1$d 个输入法</string>
     <string name="various_collapse_miui_title">系统标题样式</string>
     <string name="various_collapse_miui_title_desc">调整系统应用中的顶栏标题</string>

library/core/src/main/res/values-zh-rHK/strings_app.xml

@@ -1530,7 +1530,7 @@
     <string name="various_phrase_clipboardlist">解除常用語剪貼簿條數和時間限制</string>
     <string name="various_phrase_clipboardlist_more">開啟後勾選輸入法作用域並重新啟動</string>
     <string name="various_unlock_ime">解鎖輸入法全面屏優化</string>
-    <string name="various_unlock_ime_desc">對所選輸入法啟用所選樣式的全面屏優化\n原生風格需要額外勾選系統框架作用域\n選擇原生風格後只對非小米定製版生效，小米定製版勾選後將加入鍵盤可切換列表</string>
+    <string name="various_unlock_ime_desc">對目標輸入法啟用所選樣式的全面屏優化\n原生風格需要額外勾選系統框架作用域\n選擇原生風格後只對非小米定製版生效，小米定製版勾選後將加入鍵盤可切換列表</string>
     <string name="various_unlock_ime_apps">目標輸入法</string>
     <string name="various_unlock_ime_apps_desc">若所選輸入法未加入作用域，將同時申請作用域</string>
     <string name="various_unlock_ime_show_all">顯示全部輸入法列表</string>
@@ -1541,9 +1541,6 @@
     <string name="various_aosp_ime_nav_bar_layout_end">右側功能鍵</string>
     <string name="various_aosp_ime_nav_bar_layout_hide_ime">收起輸入法</string>
     <string name="various_aosp_ime_nav_bar_layout_ime_switcher">切換輸入法</string>
-    <string name="various_aosp_ime">Mi_AOSP_IME</string>
-    <string name="various_aosp_ime_desc">對所選輸入法啟用 AOSP 風格導覽列/底欄。需要勾選對應輸入法作用域與 Android/System Framework 作用域</string>
-    <string name="various_aosp_ime_apps">Mi_AOSP_IME 目標輸入法</string>
     <string name="various_input_method_apps_count">已選擇 %1$d 個輸入法</string>
     <string name="various_collapse_miui_title">系統標題樣式</string>
     <string name="various_collapse_miui_title_desc">調整系統應用程式中的頂欄標題</string>

library/core/src/main/res/values-zh-rTW/strings_app.xml

@@ -1508,7 +1508,7 @@
     <string name="various_phrase_clipboardlist">解除常用語剪貼簿數量和時間限制</string>
     <string name="various_phrase_clipboardlist_more">開啟後勾選輸入法作用域並重啟</string>
     <string name="various_unlock_ime">解鎖輸入法全螢幕最佳化</string>
-    <string name="various_unlock_ime_desc">對所選輸入法啟用所選樣式的全螢幕最佳化\n原生風格需要額外勾選系統框架作用域\n選擇原生風格後只對非小米定製版生效，小米定製版勾選後將加入鍵盤可切換列表</string>
+    <string name="various_unlock_ime_desc">對目標輸入法啟用所選樣式的全螢幕最佳化\n原生風格需要額外勾選系統框架作用域\n選擇原生風格後只對非小米定製版生效，小米定製版勾選後將加入鍵盤可切換列表</string>
     <string name="various_unlock_ime_apps">目標輸入法</string>
     <string name="various_unlock_ime_apps_desc">若所選輸入法未加入作用域，將同時申請作用域</string>
     <string name="various_unlock_ime_show_all">顯示全部輸入法列表</string>
@@ -1519,9 +1519,6 @@
     <string name="various_aosp_ime_nav_bar_layout_end">右側功能鍵</string>
     <string name="various_aosp_ime_nav_bar_layout_hide_ime">收起輸入法</string>
     <string name="various_aosp_ime_nav_bar_layout_ime_switcher">切換輸入法</string>
-    <string name="various_aosp_ime">Mi_AOSP_IME</string>
-    <string name="various_aosp_ime_desc">對所選輸入法啟用 AOSP 風格導覽列/底欄。需要勾選對應輸入法作用域與 Android/System Framework 作用域</string>
-    <string name="various_aosp_ime_apps">Mi_AOSP_IME 目標輸入法</string>
     <string name="various_input_method_apps_count">已選擇 %1$d 個輸入法</string>
     <string name="various_collapse_miui_title">系統標題樣式</string>
     <string name="various_collapse_miui_title_desc">調整系統應用程式中的頂欄標題</string>

library/core/src/main/res/values/strings_app.xml

@@ -1649,7 +1649,7 @@
     <string name="various_phrase_clipboardlist">Remove the clipboard and time limits for phrases</string>
     <string name="various_phrase_clipboardlist_more">After it\'s enabled, select the input method scope and restart it.</string>
     <string name="various_unlock_ime">Unlock IME fullscreen optimization</string>
-    <string name="various_unlock_ime_desc">Apply the selected fullscreen optimization style to the selected input methods.\nAOSP style also requires System Framework scope.\nWith AOSP style selected, only non-Xiaomi-customized IMEs take effect. Selected Xiaomi-customized IMEs will only be added to the keyboard switcher list.</string>
+    <string name="various_unlock_ime_desc">Enable full-screen optimization for the selected style on the target input method\nThe "Native" style requires an additional check of the "System Framework" scope\nSelecting the "Native" style only applies to non-Xiaomi custom versions; checking it for Xiaomi custom versions will add the keyboard to the switchable list</string>
     <string name="various_unlock_ime_apps">Target input methods</string>
     <string name="various_unlock_ime_apps_desc">If a selected input method is not in scope, its scope will be requested as well.</string>
     <string name="various_unlock_ime_show_all">Show all input methods</string>
@@ -1660,9 +1660,6 @@
     <string name="various_aosp_ime_nav_bar_layout_end">Right function key</string>
     <string name="various_aosp_ime_nav_bar_layout_hide_ime">Hide input method</string>
     <string name="various_aosp_ime_nav_bar_layout_ime_switcher">Switch input method</string>
-    <string name="various_aosp_ime">Mi AOSP IME</string>
-    <string name="various_aosp_ime_desc">Apply AOSP-style IME navigation to the selected input methods. Requires the IME scope and Android/System Framework scope.</string>
-    <string name="various_aosp_ime_apps">Mi AOSP IME targets</string>
     <string name="various_input_method_apps_count">%1$d input methods selected</string>
     <string name="various_collapse_miui_title">System title style</string>
     <string name="various_collapse_miui_title_desc">Adjust top bar title in system apps</string>

library/libhook/src/main/java/com/sevtinge/hyperceiler/libhook/rules/gallery/ChangeBackupServer.java

@@ -23,7 +23,6 @@
 import com.sevtinge.hyperceiler.libhook.callback.IMethodHook;
 
 import io.github.kyuubiran.ezxhelper.xposed.common.HookParam;
-import io.github.libxposed.api.XposedInterface;
 
 
 public class ChangeBackupServer extends BaseHook {
@@ -70,7 +69,7 @@ public void before(HookParam param) {
             if (isXiaomi) {
                 findAndChainMethod("com.miui.gallery.ui.GallerySettingsFragment",
                     "initGlobalBackupPreference",
-                    (XposedInterface.Hooker) chain -> {
+                    chain -> {
                         sOverrideIsInternational.set(false);
                         try {
                             return chain.proceed();