Skip to content

Commit e1544a8

Browse files
committed
refactor: merge to BetterAndroid new usage
1 parent 276503c commit e1544a8

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

yukihookapi-core/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/AppParasitics.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import android.os.Handler
4242
import android.os.UserHandle
4343
import androidx.annotation.RequiresApi
4444
import com.highcapable.betterandroid.system.extension.component.registerReceiver
45-
import com.highcapable.betterandroid.system.extension.tool.SystemVersion
45+
import com.highcapable.betterandroid.system.extension.tool.AndroidVersion
4646
import com.highcapable.kavaref.KavaRef.Companion.asResolver
4747
import com.highcapable.kavaref.KavaRef.Companion.resolve
4848
import com.highcapable.kavaref.extension.classOf
@@ -420,13 +420,13 @@ internal object AppParasitics {
420420
* @param context 当前 [Context]
421421
* @param proxy 代理的 [Activity]
422422
*/
423-
@RequiresApi(SystemVersion.N)
423+
@RequiresApi(AndroidVersion.N)
424424
internal fun registerModuleAppActivities(context: Context, proxy: Any?) {
425425
if (isActivityProxyRegistered) return
426426
if (YukiXposedModule.isXposedEnvironment.not()) return YLog.innerW("You can only register Activity Proxy in Xposed Environment")
427427
if (context.packageName == YukiXposedModule.modulePackageName) return YLog.innerE("You cannot register Activity Proxy into yourself")
428428
@SuppressLint("ObsoleteSdkInt")
429-
if (SystemVersion.isLowTo(SystemVersion.N)) return YLog.innerE("Activity Proxy only support for Android 7.0 (API 24) or higher")
429+
if (AndroidVersion.isAtMost(AndroidVersion.N)) return YLog.innerE("Activity Proxy only support for Android 7.0 (API 24) or higher")
430430
runCatching {
431431
ActivityProxyConfig.apply {
432432
proxyIntentName = "${YukiXposedModule.modulePackageName}.ACTIVITY_PROXY_INTENT"

yukihookapi-core/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/caller/HandlerDelegateCaller.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import android.os.Bundle
3030
import android.os.Handler
3131
import android.os.IBinder
3232
import android.os.Message
33-
import com.highcapable.betterandroid.system.extension.tool.SystemVersion
33+
import com.highcapable.betterandroid.system.extension.tool.AndroidVersion
3434
import com.highcapable.kavaref.KavaRef.Companion.asResolver
3535
import com.highcapable.kavaref.KavaRef.Companion.resolve
3636
import com.highcapable.kavaref.extension.lazyClass
@@ -94,7 +94,7 @@ internal object HandlerDelegateCaller {
9494
if (intent?.hasExtra(ActivityProxyConfig.proxyIntentName) == true) {
9595
@Suppress("DEPRECATION")
9696
val subIntent = intent.getParcelableExtra<Intent>(ActivityProxyConfig.proxyIntentName)
97-
if (SystemVersion.isHighOrEqualsTo(SystemVersion.S)) {
97+
if (AndroidVersion.isAtLeast(AndroidVersion.S)) {
9898
val currentActivityThread = ActivityThreadClass.resolve()
9999
.processor(AndroidHiddenApiBypassResolver.get())
100100
.optional(silent = true)

0 commit comments

Comments
 (0)