HighCapable/YukiHookAPI
5
0
Fork 0
mirror of https://github.com/HighCapable/YukiHookAPI.git synced 2025-10-18 17:19:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: merge to BetterAndroid new usage

Browse Source
This commit is contained in:
fankesyooni
2025-09-13 19:09:16 +08:00
parent 79344401dd
commit e3828c91fa
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/demo-module/src/main/java/com/highcapable/yukihookapi/demo_module/hook/HookEntry.kt
View File

@@ -28,7 +28,7 @@ import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.widget.Button import android.widget.Button
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.highcapable.betterandroid.system.extension.tool.SystemVersion import com.highcapable.betterandroid.system.extension.tool.AndroidVersion
import com.highcapable.kavaref.KavaRef.Companion.resolve import com.highcapable.kavaref.KavaRef.Companion.resolve
import com.highcapable.kavaref.extension.ArrayClass import com.highcapable.kavaref.extension.ArrayClass
import com.highcapable.yukihookapi.YukiHookAPI import com.highcapable.yukihookapi.YukiHookAPI
@@ -190,7 +190,7 @@ object HookEntry : IYukiHookXposedInit {
// Register Activity Proxy // Register Activity Proxy
// 注册模块 Activity 代理 // 注册模块 Activity 代理
onAppLifecycle { onAppLifecycle {
onCreate { if (SystemVersion.isHighOrEqualsTo(SystemVersion.N)) registerModuleAppActivities() } onCreate { if (AndroidVersion.isAtLeast(AndroidVersion.N)) registerModuleAppActivities() }
} }
// Find Class to hook // Find Class to hook
// 得到需要 Hook 的 Class // 得到需要 Hook 的 Class
@@ -288,7 +288,7 @@ object HookEntry : IYukiHookXposedInit {
.setTitle("Hooked") .setTitle("Hooked")
.setMessage("I am hook your toast showing!") .setMessage("I am hook your toast showing!")
.apply { .apply {
if (SystemVersion.isHighOrEqualsTo(SystemVersion.N)) if (AndroidVersion.isAtLeast(AndroidVersion.N))
setPositiveButton("START PARASITIC") { _, _ -> setPositiveButton("START PARASITIC") { _, _ ->
MaterialAlertDialogBuilder(context) MaterialAlertDialogBuilder(context)
.setTitle("Start Parasitic") .setTitle("Start Parasitic")

6
yukihookapi-core/src/main/java/com/highcapable/yukihookapi/hook/core/api/reflect/AndroidHiddenApiBypassResolver.kt
View File

@@ -21,7 +21,7 @@
*/ */
package com.highcapable.yukihookapi.hook.core.api.reflect package com.highcapable.yukihookapi.hook.core.api.reflect
import com.highcapable.betterandroid.system.extension.tool.SystemVersion import com.highcapable.betterandroid.system.extension.tool.AndroidVersion
import com.highcapable.kavaref.resolver.processor.MemberProcessor import com.highcapable.kavaref.resolver.processor.MemberProcessor
import org.lsposed.hiddenapibypass.HiddenApiBypass import org.lsposed.hiddenapibypass.HiddenApiBypass
import java.lang.reflect.Constructor import java.lang.reflect.Constructor
@@ -50,12 +50,12 @@ class AndroidHiddenApiBypassResolver private constructor() : MemberProcessor.Res
} }
override fun <T : Any> getDeclaredConstructors(declaringClass: Class<T>): List<Constructor<T>> = override fun <T : Any> getDeclaredConstructors(declaringClass: Class<T>): List<Constructor<T>> =
SystemVersion.require(SystemVersion.P, super.getDeclaredConstructors(declaringClass)) { AndroidVersion.require(AndroidVersion.P, super.getDeclaredConstructors(declaringClass)) {
HiddenApiBypass.getDeclaredMethods(declaringClass).filterIsInstance<Constructor<T>>().toList() HiddenApiBypass.getDeclaredMethods(declaringClass).filterIsInstance<Constructor<T>>().toList()
} }
override fun <T : Any> getDeclaredMethods(declaringClass: Class<T>): List<Method> = override fun <T : Any> getDeclaredMethods(declaringClass: Class<T>): List<Method> =
SystemVersion.require(SystemVersion.P, super.getDeclaredMethods(declaringClass)) { AndroidVersion.require(AndroidVersion.P, super.getDeclaredMethods(declaringClass)) {
HiddenApiBypass.getDeclaredMethods(declaringClass).filterIsInstance<Method>().toList() HiddenApiBypass.getDeclaredMethods(declaringClass).filterIsInstance<Method>().toList()
} }
} }

6
yukihookapi-core/src/main/java/com/highcapable/yukihookapi/hook/factory/YukiHookFactory.kt
View File

@@ -34,7 +34,7 @@ import android.widget.ImageView
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.annotation.StyleRes import androidx.annotation.StyleRes
import androidx.core.net.toUri import androidx.core.net.toUri
import com.highcapable.betterandroid.system.extension.tool.SystemVersion import com.highcapable.betterandroid.system.extension.tool.AndroidVersion
import com.highcapable.yukihookapi.YukiHookAPI import com.highcapable.yukihookapi.YukiHookAPI
import com.highcapable.yukihookapi.hook.entity.YukiBaseHooker import com.highcapable.yukihookapi.hook.entity.YukiBaseHooker
import com.highcapable.yukihookapi.hook.param.PackageParam import com.highcapable.yukihookapi.hook.param.PackageParam
@@ -118,7 +118,7 @@ fun Context.dataChannel(packageName: String) = YukiHookDataChannel.instance().na
val Context.processName val Context.processName
get() = runCatching { get() = runCatching {
BufferedReader(FileReader(File("/proc/${Process.myPid()}/cmdline"))).let { buff -> BufferedReader(FileReader(File("/proc/${Process.myPid()}/cmdline"))).let { buff ->
buff.readLine().trim { it <= ' ' }.let { buff.readLine().trim().let {
buff.close() buff.close()
it it
} }
@@ -173,7 +173,7 @@ fun Resources.injectModuleAppResources() = AppParasitics.injectModuleAppResource
* - 最低支持 Android 7.0 (API 24) * - 最低支持 Android 7.0 (API 24)
* @param proxy 代理的 [Activity] - 必须存在于宿主的 AndroidMainifest 清单中 - 不填使用默认 [Activity] * @param proxy 代理的 [Activity] - 必须存在于宿主的 AndroidMainifest 清单中 - 不填使用默认 [Activity]
*/ */
@RequiresApi(SystemVersion.N) @RequiresApi(AndroidVersion.N)
fun Context.registerModuleAppActivities(proxy: Any? = null) = AppParasitics.registerModuleAppActivities(context = this, proxy) fun Context.registerModuleAppActivities(proxy: Any? = null) = AppParasitics.registerModuleAppActivities(context = this, proxy)
/** /**