From a8576708fbf24667146223dd581d75fcfc2d4db3 Mon Sep 17 00:00:00 2001 From: solohsu Date: Fri, 17 May 2019 15:02:39 +0800 Subject: [PATCH] Temporary fix for hooker method index exceeding method cache size --- edxp-core/build.gradle | 4 ++-- edxp-core/template_override/common/util_functions.sh | 2 +- .../{entry/hooker => _hooker}/HandleBindAppHooker.java | 2 +- .../hooker => _hooker}/LoadedApkConstructorHooker.java | 2 +- .../hooker => _hooker}/OnePlusWorkAroundHooker.java | 2 +- .../hooker => _hooker}/StartBootstrapServicesHooker.java | 3 +-- .../{entry/hooker => _hooker}/SystemMainHooker.java | 2 +- .../elderdrivers/riru/edxp/sandhook/core/HookMain.java | 2 +- .../com/elderdrivers/riru/edxp/sandhook/entry/Router.java | 2 +- .../sandhook/entry/bootstrap/AppBootstrapHookInfo.java | 6 +++--- .../sandhook/entry/bootstrap/SysBootstrapHookInfo.java | 8 ++++---- .../edxp/sandhook/entry/bootstrap/SysInnerHookInfo.java | 2 +- .../edxp/sandhook/entry/bootstrap/WorkAroundHookInfo.java | 2 +- .../{entry/hooker => _hooker}/HandleBindAppHooker.java | 2 +- .../hooker => _hooker}/LoadedApkConstructorHooker.java | 2 +- .../hooker => _hooker}/OnePlusWorkAroundHooker.java | 2 +- .../hooker => _hooker}/StartBootstrapServicesHooker.java | 2 +- .../whale/{entry/hooker => _hooker}/SystemMainHooker.java | 2 +- .../com/elderdrivers/riru/edxp/whale/core/HookMain.java | 2 +- .../com/elderdrivers/riru/edxp/whale/entry/Router.java | 2 +- .../edxp/whale/entry/bootstrap/AppBootstrapHookInfo.java | 6 +++--- .../edxp/whale/entry/bootstrap/SysBootstrapHookInfo.java | 8 ++++---- .../riru/edxp/whale/entry/bootstrap/SysInnerHookInfo.java | 2 +- .../edxp/whale/entry/bootstrap/WorkAroundHookInfo.java | 2 +- .../{entry/hooker => _hooker}/HandleBindAppHooker.java | 2 +- .../hooker => _hooker}/LoadedApkConstructorHooker.java | 2 +- .../hooker => _hooker}/OnePlusWorkAroundHooker.java | 2 +- .../hooker => _hooker}/StartBootstrapServicesHooker.java | 2 +- .../yahfa/{entry/hooker => _hooker}/SystemMainHooker.java | 2 +- .../com/elderdrivers/riru/edxp/yahfa/core/HookMain.java | 2 +- .../com/elderdrivers/riru/edxp/yahfa/entry/Router.java | 2 +- .../edxp/yahfa/entry/bootstrap/AppBootstrapHookInfo.java | 6 +++--- .../edxp/yahfa/entry/bootstrap/SysBootstrapHookInfo.java | 8 ++++---- .../riru/edxp/yahfa/entry/bootstrap/SysInnerHookInfo.java | 2 +- .../edxp/yahfa/entry/bootstrap/WorkAroundHookInfo.java | 2 +- 35 files changed, 51 insertions(+), 52 deletions(-) rename edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/{entry/hooker => _hooker}/HandleBindAppHooker.java (98%) rename edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/{entry/hooker => _hooker}/LoadedApkConstructorHooker.java (98%) rename edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/{entry/hooker => _hooker}/OnePlusWorkAroundHooker.java (97%) rename edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/{entry/hooker => _hooker}/StartBootstrapServicesHooker.java (96%) rename edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/{entry/hooker => _hooker}/SystemMainHooker.java (96%) rename edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/{entry/hooker => _hooker}/HandleBindAppHooker.java (98%) rename edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/{entry/hooker => _hooker}/LoadedApkConstructorHooker.java (98%) rename edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/{entry/hooker => _hooker}/OnePlusWorkAroundHooker.java (97%) rename edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/{entry/hooker => _hooker}/StartBootstrapServicesHooker.java (97%) rename edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/{entry/hooker => _hooker}/SystemMainHooker.java (96%) rename edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/{entry/hooker => _hooker}/HandleBindAppHooker.java (98%) rename edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/{entry/hooker => _hooker}/LoadedApkConstructorHooker.java (98%) rename edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/{entry/hooker => _hooker}/OnePlusWorkAroundHooker.java (97%) rename edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/{entry/hooker => _hooker}/StartBootstrapServicesHooker.java (97%) rename edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/{entry/hooker => _hooker}/SystemMainHooker.java (96%) diff --git a/edxp-core/build.gradle b/edxp-core/build.gradle index 4712604d..04ab66e2 100644 --- a/edxp-core/build.gradle +++ b/edxp-core/build.gradle @@ -3,10 +3,10 @@ import org.gradle.internal.os.OperatingSystem apply plugin: 'com.android.library' -version "v0.4.2.2_beta" +version "v0.4.2.3_beta" ext { - versionCode = "4220" + versionCode = "4230" module_name = "EdXposed" jar_dest_dir = "${projectDir}/template_override/system/framework/" is_windows = OperatingSystem.current().isWindows() diff --git a/edxp-core/template_override/common/util_functions.sh b/edxp-core/template_override/common/util_functions.sh index b8864e59..fe9c6485 100644 --- a/edxp-core/template_override/common/util_functions.sh +++ b/edxp-core/template_override/common/util_functions.sh @@ -1,6 +1,6 @@ #!/system/bin/sh -EDXP_VERSION="0.4.2.2_beta (4220)" +EDXP_VERSION="0.4.2.3_beta (4230)" ANDROID_SDK=`getprop ro.build.version.sdk` BUILD_DESC=`getprop ro.build.description` PRODUCT=`getprop ro.build.product` diff --git a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/hooker/HandleBindAppHooker.java b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/_hooker/HandleBindAppHooker.java similarity index 98% rename from edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/hooker/HandleBindAppHooker.java rename to edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/_hooker/HandleBindAppHooker.java index aa5e494b..00613ac3 100644 --- a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/hooker/HandleBindAppHooker.java +++ b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/_hooker/HandleBindAppHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.sandhook.entry.hooker; +package com.elderdrivers.riru.edxp.sandhook._hooker; import android.app.ActivityThread; import android.app.LoadedApk; diff --git a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/hooker/LoadedApkConstructorHooker.java b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/_hooker/LoadedApkConstructorHooker.java similarity index 98% rename from edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/hooker/LoadedApkConstructorHooker.java rename to edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/_hooker/LoadedApkConstructorHooker.java index 6d6d2f5a..87f9c854 100644 --- a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/hooker/LoadedApkConstructorHooker.java +++ b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/_hooker/LoadedApkConstructorHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.sandhook.entry.hooker; +package com.elderdrivers.riru.edxp.sandhook._hooker; import android.app.ActivityThread; import android.app.AndroidAppHelper; diff --git a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/hooker/OnePlusWorkAroundHooker.java b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/_hooker/OnePlusWorkAroundHooker.java similarity index 97% rename from edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/hooker/OnePlusWorkAroundHooker.java rename to edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/_hooker/OnePlusWorkAroundHooker.java index 9066a112..59559d38 100644 --- a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/hooker/OnePlusWorkAroundHooker.java +++ b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/_hooker/OnePlusWorkAroundHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.sandhook.entry.hooker; +package com.elderdrivers.riru.edxp.sandhook._hooker; import com.elderdrivers.riru.common.KeepMembers; import com.elderdrivers.riru.edxp.Main; diff --git a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/hooker/StartBootstrapServicesHooker.java b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/_hooker/StartBootstrapServicesHooker.java similarity index 96% rename from edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/hooker/StartBootstrapServicesHooker.java rename to edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/_hooker/StartBootstrapServicesHooker.java index 082d0d36..2ebd3b73 100644 --- a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/hooker/StartBootstrapServicesHooker.java +++ b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/_hooker/StartBootstrapServicesHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.sandhook.entry.hooker; +package com.elderdrivers.riru.edxp.sandhook._hooker; import android.os.Build; @@ -7,7 +7,6 @@ import com.elderdrivers.riru.edxp.sandhook.entry.Router; import com.swift.sandhook.SandHook; import com.swift.sandhook.annotation.HookMethod; import com.swift.sandhook.annotation.HookMethodBackup; -import com.swift.sandhook.annotation.HookMode; import com.swift.sandhook.annotation.HookReflectClass; import com.swift.sandhook.annotation.SkipParamCheck; import com.swift.sandhook.annotation.ThisObject; diff --git a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/hooker/SystemMainHooker.java b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/_hooker/SystemMainHooker.java similarity index 96% rename from edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/hooker/SystemMainHooker.java rename to edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/_hooker/SystemMainHooker.java index b7bb5dba..d7fa2329 100644 --- a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/hooker/SystemMainHooker.java +++ b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/_hooker/SystemMainHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.sandhook.entry.hooker; +package com.elderdrivers.riru.edxp.sandhook._hooker; import android.app.ActivityThread; diff --git a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/core/HookMain.java b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/core/HookMain.java index eeaa50ca..88dcda91 100644 --- a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/core/HookMain.java +++ b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/core/HookMain.java @@ -2,7 +2,7 @@ package com.elderdrivers.riru.edxp.sandhook.core; import com.elderdrivers.riru.edxp.util.Utils; import com.elderdrivers.riru.edxp.Main; -import com.elderdrivers.riru.edxp.sandhook.entry.hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.sandhook._hooker.OnePlusWorkAroundHooker; import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/Router.java b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/Router.java index 2f6b06ee..d3cb802b 100644 --- a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/Router.java +++ b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/Router.java @@ -12,7 +12,7 @@ import com.elderdrivers.riru.edxp.sandhook.entry.bootstrap.AppBootstrapHookInfo; import com.elderdrivers.riru.edxp.sandhook.entry.bootstrap.SysBootstrapHookInfo; import com.elderdrivers.riru.edxp.sandhook.entry.bootstrap.SysInnerHookInfo; import com.elderdrivers.riru.edxp.sandhook.entry.bootstrap.WorkAroundHookInfo; -import com.elderdrivers.riru.edxp.sandhook.entry.hooker.SystemMainHooker; +import com.elderdrivers.riru.edxp.sandhook._hooker.SystemMainHooker; import com.elderdrivers.riru.edxp.util.Utils; import com.swift.sandhook.xposedcompat.XposedCompat; diff --git a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/AppBootstrapHookInfo.java b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/AppBootstrapHookInfo.java index ee352801..34856bf2 100644 --- a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/AppBootstrapHookInfo.java +++ b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/AppBootstrapHookInfo.java @@ -1,9 +1,9 @@ package com.elderdrivers.riru.edxp.sandhook.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.sandhook.entry.hooker.HandleBindAppHooker; -import com.elderdrivers.riru.edxp.sandhook.entry.hooker.LoadedApkConstructorHooker; -import com.elderdrivers.riru.edxp.sandhook.entry.hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.sandhook._hooker.HandleBindAppHooker; +import com.elderdrivers.riru.edxp.sandhook._hooker.LoadedApkConstructorHooker; +import com.elderdrivers.riru.edxp.sandhook._hooker.OnePlusWorkAroundHooker; public class AppBootstrapHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/SysBootstrapHookInfo.java b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/SysBootstrapHookInfo.java index c9b0fbc1..c1abc6e5 100644 --- a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/SysBootstrapHookInfo.java +++ b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/SysBootstrapHookInfo.java @@ -1,10 +1,10 @@ package com.elderdrivers.riru.edxp.sandhook.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.sandhook.entry.hooker.HandleBindAppHooker; -import com.elderdrivers.riru.edxp.sandhook.entry.hooker.LoadedApkConstructorHooker; -import com.elderdrivers.riru.edxp.sandhook.entry.hooker.OnePlusWorkAroundHooker; -import com.elderdrivers.riru.edxp.sandhook.entry.hooker.SystemMainHooker; +import com.elderdrivers.riru.edxp.sandhook._hooker.HandleBindAppHooker; +import com.elderdrivers.riru.edxp.sandhook._hooker.LoadedApkConstructorHooker; +import com.elderdrivers.riru.edxp.sandhook._hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.sandhook._hooker.SystemMainHooker; public class SysBootstrapHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/SysInnerHookInfo.java b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/SysInnerHookInfo.java index a89542ab..e1178361 100644 --- a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/SysInnerHookInfo.java +++ b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/SysInnerHookInfo.java @@ -1,7 +1,7 @@ package com.elderdrivers.riru.edxp.sandhook.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.sandhook.entry.hooker.StartBootstrapServicesHooker; +import com.elderdrivers.riru.edxp.sandhook._hooker.StartBootstrapServicesHooker; public class SysInnerHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/WorkAroundHookInfo.java b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/WorkAroundHookInfo.java index 7d255730..8a70e6f6 100644 --- a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/WorkAroundHookInfo.java +++ b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/bootstrap/WorkAroundHookInfo.java @@ -1,7 +1,7 @@ package com.elderdrivers.riru.edxp.sandhook.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.sandhook.entry.hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.sandhook._hooker.OnePlusWorkAroundHooker; public class WorkAroundHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/HandleBindAppHooker.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/_hooker/HandleBindAppHooker.java similarity index 98% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/HandleBindAppHooker.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/_hooker/HandleBindAppHooker.java index 871e277f..934bdde4 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/HandleBindAppHooker.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/_hooker/HandleBindAppHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.whale.entry.hooker; +package com.elderdrivers.riru.edxp.whale._hooker; import android.app.ActivityThread; import android.app.LoadedApk; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/LoadedApkConstructorHooker.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/_hooker/LoadedApkConstructorHooker.java similarity index 98% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/LoadedApkConstructorHooker.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/_hooker/LoadedApkConstructorHooker.java index e32e2ad2..2376ce82 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/LoadedApkConstructorHooker.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/_hooker/LoadedApkConstructorHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.whale.entry.hooker; +package com.elderdrivers.riru.edxp.whale._hooker; import android.app.ActivityThread; import android.app.AndroidAppHelper; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/OnePlusWorkAroundHooker.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/_hooker/OnePlusWorkAroundHooker.java similarity index 97% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/OnePlusWorkAroundHooker.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/_hooker/OnePlusWorkAroundHooker.java index 3f759804..85c53223 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/OnePlusWorkAroundHooker.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/_hooker/OnePlusWorkAroundHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.whale.entry.hooker; +package com.elderdrivers.riru.edxp.whale._hooker; import com.elderdrivers.riru.common.KeepMembers; import com.elderdrivers.riru.edxp.Main; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/StartBootstrapServicesHooker.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/_hooker/StartBootstrapServicesHooker.java similarity index 97% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/StartBootstrapServicesHooker.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/_hooker/StartBootstrapServicesHooker.java index 76f96512..b49dacef 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/StartBootstrapServicesHooker.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/_hooker/StartBootstrapServicesHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.whale.entry.hooker; +package com.elderdrivers.riru.edxp.whale._hooker; import android.os.Build; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/SystemMainHooker.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/_hooker/SystemMainHooker.java similarity index 96% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/SystemMainHooker.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/_hooker/SystemMainHooker.java index b2250399..707e6dd7 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/SystemMainHooker.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/_hooker/SystemMainHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.whale.entry.hooker; +package com.elderdrivers.riru.edxp.whale._hooker; import android.app.ActivityThread; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/core/HookMain.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/core/HookMain.java index 2755c0fa..d8337af0 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/core/HookMain.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/core/HookMain.java @@ -1,7 +1,7 @@ package com.elderdrivers.riru.edxp.whale.core; import com.elderdrivers.riru.edxp.Main; -import com.elderdrivers.riru.edxp.whale.entry.hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.whale._hooker.OnePlusWorkAroundHooker; import com.elderdrivers.riru.edxp.util.Utils; import java.lang.reflect.Constructor; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/Router.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/Router.java index 79753847..d4b1d39f 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/Router.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/Router.java @@ -12,7 +12,7 @@ import com.elderdrivers.riru.edxp.whale.entry.bootstrap.AppBootstrapHookInfo; import com.elderdrivers.riru.edxp.whale.entry.bootstrap.SysBootstrapHookInfo; import com.elderdrivers.riru.edxp.whale.entry.bootstrap.SysInnerHookInfo; import com.elderdrivers.riru.edxp.whale.entry.bootstrap.WorkAroundHookInfo; -import com.elderdrivers.riru.edxp.whale.entry.hooker.SystemMainHooker; +import com.elderdrivers.riru.edxp.whale._hooker.SystemMainHooker; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/AppBootstrapHookInfo.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/AppBootstrapHookInfo.java index fe70a71d..251a2727 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/AppBootstrapHookInfo.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/AppBootstrapHookInfo.java @@ -1,9 +1,9 @@ package com.elderdrivers.riru.edxp.whale.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.whale.entry.hooker.HandleBindAppHooker; -import com.elderdrivers.riru.edxp.whale.entry.hooker.LoadedApkConstructorHooker; -import com.elderdrivers.riru.edxp.whale.entry.hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.whale._hooker.HandleBindAppHooker; +import com.elderdrivers.riru.edxp.whale._hooker.LoadedApkConstructorHooker; +import com.elderdrivers.riru.edxp.whale._hooker.OnePlusWorkAroundHooker; public class AppBootstrapHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/SysBootstrapHookInfo.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/SysBootstrapHookInfo.java index 676413ff..38ccae83 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/SysBootstrapHookInfo.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/SysBootstrapHookInfo.java @@ -1,10 +1,10 @@ package com.elderdrivers.riru.edxp.whale.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.whale.entry.hooker.HandleBindAppHooker; -import com.elderdrivers.riru.edxp.whale.entry.hooker.LoadedApkConstructorHooker; -import com.elderdrivers.riru.edxp.whale.entry.hooker.OnePlusWorkAroundHooker; -import com.elderdrivers.riru.edxp.whale.entry.hooker.SystemMainHooker; +import com.elderdrivers.riru.edxp.whale._hooker.HandleBindAppHooker; +import com.elderdrivers.riru.edxp.whale._hooker.LoadedApkConstructorHooker; +import com.elderdrivers.riru.edxp.whale._hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.whale._hooker.SystemMainHooker; public class SysBootstrapHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/SysInnerHookInfo.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/SysInnerHookInfo.java index f250fd26..a08a012c 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/SysInnerHookInfo.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/SysInnerHookInfo.java @@ -1,7 +1,7 @@ package com.elderdrivers.riru.edxp.whale.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.whale.entry.hooker.StartBootstrapServicesHooker; +import com.elderdrivers.riru.edxp.whale._hooker.StartBootstrapServicesHooker; public class SysInnerHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/WorkAroundHookInfo.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/WorkAroundHookInfo.java index 47517882..8fe859e2 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/WorkAroundHookInfo.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/WorkAroundHookInfo.java @@ -1,7 +1,7 @@ package com.elderdrivers.riru.edxp.whale.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.whale.entry.hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.whale._hooker.OnePlusWorkAroundHooker; public class WorkAroundHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/HandleBindAppHooker.java b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/_hooker/HandleBindAppHooker.java similarity index 98% rename from edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/HandleBindAppHooker.java rename to edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/_hooker/HandleBindAppHooker.java index 602b5a3f..7d71512e 100644 --- a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/HandleBindAppHooker.java +++ b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/_hooker/HandleBindAppHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.entry.hooker; +package com.elderdrivers.riru.edxp.yahfa._hooker; import android.app.ActivityThread; import android.app.LoadedApk; diff --git a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/LoadedApkConstructorHooker.java b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/_hooker/LoadedApkConstructorHooker.java similarity index 98% rename from edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/LoadedApkConstructorHooker.java rename to edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/_hooker/LoadedApkConstructorHooker.java index f1ea4087..e3a55710 100644 --- a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/LoadedApkConstructorHooker.java +++ b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/_hooker/LoadedApkConstructorHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.entry.hooker; +package com.elderdrivers.riru.edxp.yahfa._hooker; import android.app.ActivityThread; import android.app.AndroidAppHelper; diff --git a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/OnePlusWorkAroundHooker.java b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/_hooker/OnePlusWorkAroundHooker.java similarity index 97% rename from edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/OnePlusWorkAroundHooker.java rename to edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/_hooker/OnePlusWorkAroundHooker.java index f3261f9d..3da4402a 100644 --- a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/OnePlusWorkAroundHooker.java +++ b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/_hooker/OnePlusWorkAroundHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.entry.hooker; +package com.elderdrivers.riru.edxp.yahfa._hooker; import com.elderdrivers.riru.common.KeepMembers; import com.elderdrivers.riru.edxp.Main; diff --git a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/StartBootstrapServicesHooker.java b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/_hooker/StartBootstrapServicesHooker.java similarity index 97% rename from edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/StartBootstrapServicesHooker.java rename to edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/_hooker/StartBootstrapServicesHooker.java index 7bc1c542..5965c06a 100644 --- a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/StartBootstrapServicesHooker.java +++ b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/_hooker/StartBootstrapServicesHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.entry.hooker; +package com.elderdrivers.riru.edxp.yahfa._hooker; import android.os.Build; diff --git a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/SystemMainHooker.java b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/_hooker/SystemMainHooker.java similarity index 96% rename from edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/SystemMainHooker.java rename to edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/_hooker/SystemMainHooker.java index 38d43612..a41423be 100644 --- a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/SystemMainHooker.java +++ b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/_hooker/SystemMainHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.entry.hooker; +package com.elderdrivers.riru.edxp.yahfa._hooker; import android.app.ActivityThread; diff --git a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/HookMain.java b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/HookMain.java index 13da190a..82b98da5 100644 --- a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/HookMain.java +++ b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/HookMain.java @@ -1,7 +1,7 @@ package com.elderdrivers.riru.edxp.yahfa.core; import com.elderdrivers.riru.edxp.Main; -import com.elderdrivers.riru.edxp.yahfa.entry.hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.yahfa._hooker.OnePlusWorkAroundHooker; import com.elderdrivers.riru.edxp.util.Utils; import java.lang.reflect.Constructor; diff --git a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/Router.java b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/Router.java index ee5ae5bf..c1b6aa03 100644 --- a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/Router.java +++ b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/Router.java @@ -13,7 +13,7 @@ import com.elderdrivers.riru.edxp.yahfa.entry.bootstrap.AppBootstrapHookInfo; import com.elderdrivers.riru.edxp.yahfa.entry.bootstrap.SysBootstrapHookInfo; import com.elderdrivers.riru.edxp.yahfa.entry.bootstrap.SysInnerHookInfo; import com.elderdrivers.riru.edxp.yahfa.entry.bootstrap.WorkAroundHookInfo; -import com.elderdrivers.riru.edxp.yahfa.entry.hooker.SystemMainHooker; +import com.elderdrivers.riru.edxp.yahfa._hooker.SystemMainHooker; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/AppBootstrapHookInfo.java b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/AppBootstrapHookInfo.java index 24aa7c29..f15f542f 100644 --- a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/AppBootstrapHookInfo.java +++ b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/AppBootstrapHookInfo.java @@ -1,9 +1,9 @@ package com.elderdrivers.riru.edxp.yahfa.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.yahfa.entry.hooker.HandleBindAppHooker; -import com.elderdrivers.riru.edxp.yahfa.entry.hooker.LoadedApkConstructorHooker; -import com.elderdrivers.riru.edxp.yahfa.entry.hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.yahfa._hooker.HandleBindAppHooker; +import com.elderdrivers.riru.edxp.yahfa._hooker.LoadedApkConstructorHooker; +import com.elderdrivers.riru.edxp.yahfa._hooker.OnePlusWorkAroundHooker; public class AppBootstrapHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysBootstrapHookInfo.java b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysBootstrapHookInfo.java index 2cb7e02e..06f53248 100644 --- a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysBootstrapHookInfo.java +++ b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysBootstrapHookInfo.java @@ -1,10 +1,10 @@ package com.elderdrivers.riru.edxp.yahfa.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.yahfa.entry.hooker.HandleBindAppHooker; -import com.elderdrivers.riru.edxp.yahfa.entry.hooker.LoadedApkConstructorHooker; -import com.elderdrivers.riru.edxp.yahfa.entry.hooker.OnePlusWorkAroundHooker; -import com.elderdrivers.riru.edxp.yahfa.entry.hooker.SystemMainHooker; +import com.elderdrivers.riru.edxp.yahfa._hooker.HandleBindAppHooker; +import com.elderdrivers.riru.edxp.yahfa._hooker.LoadedApkConstructorHooker; +import com.elderdrivers.riru.edxp.yahfa._hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.yahfa._hooker.SystemMainHooker; public class SysBootstrapHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysInnerHookInfo.java b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysInnerHookInfo.java index a185c0df..176dd744 100644 --- a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysInnerHookInfo.java +++ b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysInnerHookInfo.java @@ -1,7 +1,7 @@ package com.elderdrivers.riru.edxp.yahfa.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.yahfa.entry.hooker.StartBootstrapServicesHooker; +import com.elderdrivers.riru.edxp.yahfa._hooker.StartBootstrapServicesHooker; public class SysInnerHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/WorkAroundHookInfo.java b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/WorkAroundHookInfo.java index f0c5f065..650dda8e 100644 --- a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/WorkAroundHookInfo.java +++ b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/WorkAroundHookInfo.java @@ -1,7 +1,7 @@ package com.elderdrivers.riru.edxp.yahfa.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.yahfa.entry.hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.yahfa._hooker.OnePlusWorkAroundHooker; public class WorkAroundHookInfo implements KeepMembers { public static String[] hookItemNames = {