Update MainHook

Author: keta1

app/src/main/java/com/xposed/miuiime/MainHook.kt

@@ -38,11 +38,10 @@ class MainHook : IXposedHookLoadPackage {
             }
         }
         //针对A10的修复切换输入法列表
-        findAndHookMethod(
-            "android.inputmethodservice.InputMethodServiceInjector\$MiuiSwitchInputMethodListener",
-            lpparam.classLoader, "deleteNotSupportIme",
-            XC_MethodReplacement.returnConstant(null)
-        )
+        findClass("android.inputmethodservice.InputMethodServiceInjector\$MiuiSwitchInputMethodListener",
+            lpparam.classLoader)?.let {
+            hookDeleteNotSupportIme(it)
+        }
 
         //获取常用语的ClassLoader
         findAndHookMethod("android.inputmethodservice.InputMethodModuleManager",
@@ -73,6 +72,12 @@ class MainHook : IXposedHookLoadPackage {
                                 }
                             })
                     }
+                    findClass(
+                        "com.miui.inputmethod.InputMethodBottomManager\$MiuiSwitchInputMethodListener",
+                        param.args[0] as ClassLoader
+                    )?.let {
+                        hookDeleteNotSupportIme(it)
+                    }
                 }
             })
         XposedBridge.log("Hook MIUI IME Success")
@@ -106,6 +111,18 @@ class MainHook : IXposedHookLoadPackage {
         )
     }
 
+    /**
+     * 修复切换输入法列表
+     *
+     * @param clazz 声明或继承方法的类
+     */
+    fun hookDeleteNotSupportIme(clazz: Class<*>) {
+        findAndHookMethod(
+            clazz, "deleteNotSupportIme",
+            XC_MethodReplacement.returnConstant(null)
+        )
+    }
+
     fun findAndHookMethod(
         clazz: Class<*>,
         methodName: String,

app/src/main/java/com/xposed/miuiime/PropertyUtils.kt

@@ -7,8 +7,8 @@ import java.lang.reflect.Method
 object PropertyUtils {
     private var get: Method? = null
 
-    operator fun get(prop: String?, defaultvalue: String?): String? {
-        var value = defaultvalue
+    operator fun get(prop: String?, defaultValue: String?): String? {
+        var value = defaultValue
         try {
             if (null == get) {
                 synchronized(PropertyUtils::class.java) {
@@ -19,7 +19,7 @@ object PropertyUtils {
                     }
                 }
             }
-            value = get!!.invoke(null, prop, defaultvalue) as String
+            value = get!!.invoke(null, prop, defaultValue) as String
         } catch (e: Exception) {
             XposedBridge.log(e)
         }