From 0f1674b2a03b3eb974431d7d0193de514f2e6d0c Mon Sep 17 00:00:00 2001 From: swift_gan Date: Fri, 22 Mar 2019 15:36:57 +0800 Subject: [PATCH] SandHook: remove useless logic --- .../riru/edxp/sandhook/entry/Router.java | 42 ++----------------- 1 file changed, 4 insertions(+), 38 deletions(-) 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 b2a4af39..c23bf8b9 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 @@ -30,12 +30,6 @@ public class Router { private static volatile AtomicBoolean bootstrapHooked = new AtomicBoolean(false); - static boolean useSandHook; - - static { - useSandHook = EdXpConfigGlobal.getHookProvider() instanceof SandHookProvider; - } - public static void prepare(boolean isSystem) { // this flag is needed when loadModules @@ -86,46 +80,18 @@ public class Router { Utils.logD("startBootstrapHook starts: isSystem = " + isSystem); ClassLoader classLoader = XposedBridge.BOOTCLASSLOADER; if (isSystem) { - if (useSandHook) { - XposedCompat.addHookers(classLoader, SysBootstrapHookInfo.hookItems); - } else { - HookMain.doHookDefault( - Router.class.getClassLoader(), - classLoader, - SysBootstrapHookInfo.class.getName()); - } + XposedCompat.addHookers(classLoader, SysBootstrapHookInfo.hookItems); } else { - if (useSandHook) { - XposedCompat.addHookers(classLoader, AppBootstrapHookInfo.hookItems); - } else { - HookMain.doHookDefault( - Router.class.getClassLoader(), - classLoader, - AppBootstrapHookInfo.class.getName()); - } + XposedCompat.addHookers(classLoader, AppBootstrapHookInfo.hookItems); } } public static void startSystemServerHook() { - if (useSandHook) { - XposedCompat.addHookers(SystemMainHooker.systemServerCL, SysInnerHookInfo.hookItems); - } else { - HookMain.doHookDefault( - Router.class.getClassLoader(), - SystemMainHooker.systemServerCL, - SysInnerHookInfo.class.getName()); - } + XposedCompat.addHookers(SystemMainHooker.systemServerCL, SysInnerHookInfo.hookItems); } public static void startWorkAroundHook() { - if (useSandHook) { - XposedCompat.addHookers(XposedBridge.BOOTCLASSLOADER, WorkAroundHookInfo.hookItems); - } else { - HookMain.doHookDefault( - Router.class.getClassLoader(), - XposedBridge.BOOTCLASSLOADER, - WorkAroundHookInfo.class.getName()); - } + XposedCompat.addHookers(XposedBridge.BOOTCLASSLOADER, WorkAroundHookInfo.hookItems); } public static void onEnterChildProcess() {