Add compatibility for the new version of LSPosed

app/src/main/java/io/nekohasekai/sfa/xposed/HookInstaller.kt

@@ -0,0 +1,49 @@
+package io.nekohasekai.sfa.xposed
+
+import android.content.Context
+import io.nekohasekai.sfa.xposed.hooks.HookIConnectivityManagerOnTransact
+import io.nekohasekai.sfa.xposed.hooks.hidevpn.ConnectivityServiceHookHelper
+import io.nekohasekai.sfa.xposed.hooks.hidevpn.HookNetworkCapabilitiesWriteToParcel
+import io.nekohasekai.sfa.xposed.hooks.hidevpn.HookNetworkInterfaceGetName
+import io.nekohasekai.sfa.xposed.hooks.hidevpnapp.HookPackageManagerGetInstalledPackages
+
+object HookInstaller {
+
+    private const val TAG = "XposedInit"
+
+    private val activityThreadClass by lazy { Class.forName("android.app.ActivityThread") }
+    private val currentActivityThreadMethod by lazy { activityThreadClass.getMethod("currentActivityThread") }
+    private val getSystemContextMethod by lazy { activityThreadClass.getMethod("getSystemContext") }
+
+    fun install(classLoader: ClassLoader) {
+        val systemContext = resolveSystemContext()
+        HookErrorStore.i(TAG, "handleSystemServerLoaded")
+        val hooks = arrayOf(
+            ConnectivityServiceHookHelper(classLoader),
+            HookIConnectivityManagerOnTransact(classLoader, systemContext),
+            HookPackageManagerGetInstalledPackages(classLoader),
+            HookNetworkCapabilitiesWriteToParcel(),
+            HookNetworkInterfaceGetName(classLoader),
+        )
+
+        hooks.forEach { hook ->
+            try {
+                hook.injectHook()
+            } catch (e: Throwable) {
+                HookErrorStore.e(
+                    TAG,
+                    "Failed to inject ${hook.javaClass.simpleName}",
+                    e,
+                )
+            }
+        }
+    }
+
+    private fun resolveSystemContext(): Context? = try {
+        val currentThread = currentActivityThreadMethod.invoke(null)
+        getSystemContextMethod.invoke(currentThread) as? Context
+    } catch (e: Throwable) {
+        HookErrorStore.e(TAG, "resolveSystemContext failed", e)
+        null
+    }
+}

app/src/main/java/io/nekohasekai/sfa/xposed/XposedInit.kt

@@ -1,54 +1,16 @@
 package io.nekohasekai.sfa.xposed
 
-import android.content.Context
 import io.github.libxposed.api.XposedInterface
 import io.github.libxposed.api.XposedModule
 import io.github.libxposed.api.XposedModuleInterface
-import io.nekohasekai.sfa.xposed.hooks.HookIConnectivityManagerOnTransact
-import io.nekohasekai.sfa.xposed.hooks.hidevpn.ConnectivityServiceHookHelper
-import io.nekohasekai.sfa.xposed.hooks.hidevpn.HookNetworkCapabilitiesWriteToParcel
-import io.nekohasekai.sfa.xposed.hooks.hidevpn.HookNetworkInterfaceGetName
-import io.nekohasekai.sfa.xposed.hooks.hidevpnapp.HookPackageManagerGetInstalledPackages
 
 class XposedInit(base: XposedInterface, param: XposedModuleInterface.ModuleLoadedParam) : XposedModule(base, param) {
 
-    private val activityThreadClass by lazy { Class.forName("android.app.ActivityThread") }
-    private val currentActivityThreadMethod by lazy { activityThreadClass.getMethod("currentActivityThread") }
-    private val getSystemContextMethod by lazy { activityThreadClass.getMethod("getSystemContext") }
-
     override fun onSystemServerLoaded(param: XposedModuleInterface.SystemServerLoadedParam) {
-        val systemContext = resolveSystemContext()
-        HookErrorStore.i("XposedInit", "handleSystemServerLoaded")
-        val hooks = arrayOf(
-            ConnectivityServiceHookHelper(param.classLoader),
-            HookIConnectivityManagerOnTransact(param.classLoader, systemContext),
-            HookPackageManagerGetInstalledPackages(param.classLoader),
-            HookNetworkCapabilitiesWriteToParcel(),
-            HookNetworkInterfaceGetName(param.classLoader),
-        )
-
-        hooks.forEach { hook ->
-            try {
-                hook.injectHook()
-            } catch (e: Throwable) {
-                HookErrorStore.e(
-                    "XposedInit",
-                    "Failed to inject ${hook.javaClass.simpleName}",
-                    e,
-                )
-            }
-        }
+        HookInstaller.install(param.classLoader)
     }
 
     companion object {
         const val TAG = "sing-box-lsposed"
     }
-
-    private fun resolveSystemContext(): Context? = try {
-        val currentThread = currentActivityThreadMethod.invoke(null)
-        getSystemContextMethod.invoke(currentThread) as? Context
-    } catch (e: Throwable) {
-        HookErrorStore.e("XposedInit", "resolveSystemContext failed", e)
-        null
-    }
 }

app/src/main/java/io/nekohasekai/sfa/xposed/XposedInit101.kt

@@ -0,0 +1,11 @@
+package io.nekohasekai.sfa.xposed
+
+import io.github.libxposed.api.XposedModule
+import io.github.libxposed.api.XposedModuleInterface
+
+class XposedInit101 : XposedModule() {
+
+    override fun onSystemServerStarting(param: XposedModuleInterface.SystemServerStartingParam) {
+        HookInstaller.install(param.classLoader)
+    }
+}

app/src/main/resources/META-INF/xposed/java_init.list

@@ -1 +1,2 @@
 io.nekohasekai.sfa.xposed.XposedInit
+io.nekohasekai.sfa.xposed.XposedInit101

app/src/main/resources/META-INF/xposed/module.prop

@@ -1,3 +1,3 @@
 minApiVersion=100
-targetApiVersion=100
+targetApiVersion=101
 staticScope=true