diff --git a/Bridge/build.gradle b/Bridge/build.gradle index 37b44fa3..d223e8bc 100644 --- a/Bridge/build.gradle +++ b/Bridge/build.gradle @@ -122,17 +122,11 @@ afterEvaluate { def nameCapped = variant.name.capitalize() def nameLowered = variant.name.toLowerCase() - def makeAndCopyTask = task("makeAndCopy${nameCapped}", type: Copy, dependsOn: "assemble${nameCapped}") { - from "build/intermediates/transforms/dexMerger/${nameLowered}/0/classes.dex" - into '../Core/template_override/system/framework' - rename("classes.dex", "edxposed.dex") + def makeAndCopyTask = task("makeAndCopy${nameCapped}", type: Jar, dependsOn: "assemble${nameCapped}") { + from "build/intermediates/transforms/dexMerger/${nameLowered}/0/" + destinationDir file("../Core/template_override/system/framework/") + baseName "edxp" } - -// def makeAndCopyTask = task("makeAndCopy${nameCapped}", type: Jar, dependsOn: "assemble${nameCapped}") { -// from "build/intermediates/transforms/dexMerger/${nameLowered}/0/" -// destinationDir file("../Core/template_override/system/framework/") -// baseName "edxposed" -// } } } \ No newline at end of file diff --git a/Bridge/src/main/AndroidManifest.xml b/Bridge/src/main/AndroidManifest.xml index 4208d992..cd2f6ed7 100644 --- a/Bridge/src/main/AndroidManifest.xml +++ b/Bridge/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/config/ConfigManager.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/config/ConfigManager.java similarity index 90% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/config/ConfigManager.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/config/ConfigManager.java index 784cdfb1..bfee37ed 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/config/ConfigManager.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/config/ConfigManager.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.xposed.config; +package com.elderdrivers.riru.edxp.config; import java.util.Collections; import java.util.HashMap; @@ -6,8 +6,8 @@ import java.util.Set; import de.robv.android.xposed.SELinuxHelper; -import static com.elderdrivers.riru.xposed.config.InstallerChooser.INSTALLER_DATA_BASE_DIR; -import static com.elderdrivers.riru.xposed.config.InstallerChooser.INSTALLER_PACKAGE_NAME; +import static com.elderdrivers.riru.edxp.config.InstallerChooser.INSTALLER_DATA_BASE_DIR; +import static com.elderdrivers.riru.edxp.config.InstallerChooser.INSTALLER_PACKAGE_NAME; public class ConfigManager { diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/config/InstallerChooser.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/config/InstallerChooser.java similarity index 94% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/config/InstallerChooser.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/config/InstallerChooser.java index f0aeb624..1caa1491 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/config/InstallerChooser.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/config/InstallerChooser.java @@ -1,16 +1,16 @@ -package com.elderdrivers.riru.xposed.config; +package com.elderdrivers.riru.edxp.config; import android.annotation.SuppressLint; import android.os.Build; -import com.elderdrivers.riru.xposed.util.Utils; +import com.elderdrivers.riru.edxp.util.Utils; import java.util.concurrent.atomic.AtomicBoolean; import de.robv.android.xposed.SELinuxHelper; import de.robv.android.xposed.services.BaseService; -import static com.elderdrivers.riru.xposed.Main.getInstallerPkgName; +import static com.elderdrivers.riru.edxp.yahfa.Main.getInstallerPkgName; public class InstallerChooser { diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/util/ClassLoaderUtils.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/util/ClassLoaderUtils.java similarity index 95% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/util/ClassLoaderUtils.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/util/ClassLoaderUtils.java index 49712d72..82528cff 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/util/ClassLoaderUtils.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/util/ClassLoaderUtils.java @@ -1,9 +1,9 @@ -package com.elderdrivers.riru.xposed.util; +package com.elderdrivers.riru.edxp.util; import android.os.Build; import android.util.ArrayMap; -import com.elderdrivers.riru.xposed.BuildConfig; +import com.elderdrivers.riru.edxp.BuildConfig; import java.lang.reflect.Field; import java.util.ArrayList; @@ -14,7 +14,7 @@ import dalvik.system.PathClassLoader; public class ClassLoaderUtils { - public static final String DEXPATH = "/system/framework/edxposed.dex:/system/framework/eddalvikdx.dex:/system/framework/eddexmaker.dex"; + public static final String DEXPATH = "/system/framework/edxp.jar:/system/framework/eddalvikdx.jar:/system/framework/eddexmaker.jar"; public static void replaceParentClassLoader(ClassLoader appClassLoader) { if (appClassLoader == null) { diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/util/DexUtils.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/util/DexUtils.java similarity index 97% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/util/DexUtils.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/util/DexUtils.java index 7ef4ebec..eea9f75c 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/util/DexUtils.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/util/DexUtils.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.xposed.util; +package com.elderdrivers.riru.edxp.util; import android.annotation.TargetApi; import android.os.Build; @@ -8,7 +8,6 @@ import java.lang.reflect.Field; import dalvik.system.BaseDexClassLoader; import dalvik.system.DexClassLoader; -import dalvik.system.PathClassLoader; /** * For 6.0 only. diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/util/FileUtils.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/util/FileUtils.java similarity index 95% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/util/FileUtils.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/util/FileUtils.java index 4443380a..d7802db0 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/util/FileUtils.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/util/FileUtils.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.xposed.util; +package com.elderdrivers.riru.edxp.util; import android.annotation.SuppressLint; import android.os.Build; @@ -12,7 +12,7 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; -import static com.elderdrivers.riru.xposed.util.ProcessUtils.PER_USER_RANGE; +import static com.elderdrivers.riru.edxp.util.ProcessUtils.PER_USER_RANGE; public class FileUtils { diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/util/InlinedMethodCallers.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/util/InlinedMethodCallers.java similarity index 97% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/util/InlinedMethodCallers.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/util/InlinedMethodCallers.java index eb8a29cc..f4efe27d 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/util/InlinedMethodCallers.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/util/InlinedMethodCallers.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.xposed.util; +package com.elderdrivers.riru.edxp.util; import java.util.HashMap; diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/util/PrebuiltMethodsDeopter.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/util/PrebuiltMethodsDeopter.java similarity index 80% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/util/PrebuiltMethodsDeopter.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/util/PrebuiltMethodsDeopter.java index 7ef0fff6..caee422b 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/util/PrebuiltMethodsDeopter.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/util/PrebuiltMethodsDeopter.java @@ -1,13 +1,13 @@ -package com.elderdrivers.riru.xposed.util; +package com.elderdrivers.riru.edxp.util; -import com.elderdrivers.riru.xposed.Main; +import com.elderdrivers.riru.edxp.yahfa.Main; import java.util.Arrays; import de.robv.android.xposed.XposedHelpers; -import static com.elderdrivers.riru.xposed.util.InlinedMethodCallers.KEY_BOOT_IMAGE; -import static com.elderdrivers.riru.xposed.util.InlinedMethodCallers.KEY_SYSTEM_SERVER; +import static com.elderdrivers.riru.edxp.util.InlinedMethodCallers.KEY_BOOT_IMAGE; +import static com.elderdrivers.riru.edxp.util.InlinedMethodCallers.KEY_SYSTEM_SERVER; public class PrebuiltMethodsDeopter { diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/util/ProcessUtils.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/util/ProcessUtils.java similarity index 93% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/util/ProcessUtils.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/util/ProcessUtils.java index 3021b38f..a860c8a0 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/util/ProcessUtils.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/util/ProcessUtils.java @@ -1,9 +1,9 @@ -package com.elderdrivers.riru.xposed.util; +package com.elderdrivers.riru.edxp.util; import android.os.Process; import android.text.TextUtils; -import com.elderdrivers.riru.xposed.Main; +import com.elderdrivers.riru.edxp.yahfa.Main; import java.io.BufferedReader; import java.io.File; @@ -27,7 +27,7 @@ public class ProcessUtils { /** * a common solution from https://stackoverflow.com/a/21389402 *

- * use {@link com.elderdrivers.riru.xposed.Main#appProcessName} to get current process name + * use {@link Main#appProcessName} to get current process name */ public static String getProcessName(int pid) { BufferedReader cmdlineReader = null; diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/util/Utils.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/util/Utils.java similarity index 91% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/util/Utils.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/util/Utils.java index 46f25e1b..bb3598fb 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/util/Utils.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/util/Utils.java @@ -1,8 +1,8 @@ -package com.elderdrivers.riru.xposed.util; +package com.elderdrivers.riru.edxp.util; import android.util.Log; -import com.elderdrivers.riru.xposed.BuildConfig; +import com.elderdrivers.riru.edxp.BuildConfig; public class Utils { diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/Main.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/Main.java similarity index 94% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/Main.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/Main.java index 2d535039..a7b9933d 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/Main.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/Main.java @@ -1,16 +1,16 @@ -package com.elderdrivers.riru.xposed; +package com.elderdrivers.riru.edxp.yahfa; import android.annotation.SuppressLint; import android.os.Build; import android.os.Process; import com.elderdrivers.riru.common.KeepAll; -import com.elderdrivers.riru.xposed.core.HookMethodResolver; -import com.elderdrivers.riru.xposed.proxy.yahfa.BlackWhiteListProxy; -import com.elderdrivers.riru.xposed.proxy.yahfa.NormalProxy; -import com.elderdrivers.riru.xposed.util.Utils; +import com.elderdrivers.riru.edxp.BuildConfig; +import com.elderdrivers.riru.edxp.yahfa.core.HookMethodResolver; +import com.elderdrivers.riru.edxp.yahfa.proxy.BlackWhiteListProxy; +import com.elderdrivers.riru.edxp.yahfa.proxy.NormalProxy; +import com.elderdrivers.riru.edxp.util.Utils; -import java.lang.reflect.Member; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/core/HookMain.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/HookMain.java similarity index 95% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/core/HookMain.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/HookMain.java index 7faa9186..bbf7d68a 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/core/HookMain.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/HookMain.java @@ -1,8 +1,8 @@ -package com.elderdrivers.riru.xposed.core; +package com.elderdrivers.riru.edxp.yahfa.core; -import com.elderdrivers.riru.xposed.Main; -import com.elderdrivers.riru.xposed.entry.hooker.OnePlusWorkAroundHooker; -import com.elderdrivers.riru.xposed.util.Utils; +import com.elderdrivers.riru.edxp.yahfa.Main; +import com.elderdrivers.riru.edxp.yahfa.entry.hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.util.Utils; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -14,8 +14,8 @@ import java.util.Set; import de.robv.android.xposed.XposedHelpers; -import static com.elderdrivers.riru.xposed.Main.backupAndHookNative; -import static com.elderdrivers.riru.xposed.Main.findMethodNative; +import static com.elderdrivers.riru.edxp.yahfa.Main.backupAndHookNative; +import static com.elderdrivers.riru.edxp.yahfa.Main.findMethodNative; public class HookMain { diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/core/HookMethodResolver.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/HookMethodResolver.java similarity index 97% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/core/HookMethodResolver.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/HookMethodResolver.java index ab97aba8..9b2d496b 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/core/HookMethodResolver.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/HookMethodResolver.java @@ -1,10 +1,9 @@ -package com.elderdrivers.riru.xposed.core; +package com.elderdrivers.riru.edxp.yahfa.core; import android.os.Build; -import android.util.Log; -import com.elderdrivers.riru.xposed.Main; -import com.elderdrivers.riru.xposed.util.Utils; +import com.elderdrivers.riru.edxp.yahfa.Main; +import com.elderdrivers.riru.edxp.util.Utils; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/dexmaker/DexLog.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DexLog.java similarity index 86% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/dexmaker/DexLog.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DexLog.java index 3802e49c..f7729737 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/dexmaker/DexLog.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DexLog.java @@ -1,8 +1,8 @@ -package com.elderdrivers.riru.xposed.dexmaker; +package com.elderdrivers.riru.edxp.yahfa.dexmaker; import android.util.Log; -import com.elderdrivers.riru.xposed.BuildConfig; +import com.elderdrivers.riru.edxp.BuildConfig; public class DexLog { diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/dexmaker/DexMakerUtils.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DexMakerUtils.java similarity index 98% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/dexmaker/DexMakerUtils.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DexMakerUtils.java index 9f99619f..4083e370 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/dexmaker/DexMakerUtils.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DexMakerUtils.java @@ -1,11 +1,11 @@ -package com.elderdrivers.riru.xposed.dexmaker; +package com.elderdrivers.riru.edxp.yahfa.dexmaker; import android.app.AndroidAppHelper; import android.os.Build; import android.text.TextUtils; -import com.elderdrivers.riru.xposed.Main; -import com.elderdrivers.riru.xposed.config.ConfigManager; +import com.elderdrivers.riru.edxp.yahfa.Main; +import com.elderdrivers.riru.edxp.config.ConfigManager; import java.security.MessageDigest; import java.util.HashMap; diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/dexmaker/DynamicBridge.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DynamicBridge.java similarity index 91% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/dexmaker/DynamicBridge.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DynamicBridge.java index 22039ee3..2905a53b 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/dexmaker/DynamicBridge.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DynamicBridge.java @@ -1,6 +1,6 @@ -package com.elderdrivers.riru.xposed.dexmaker; +package com.elderdrivers.riru.edxp.yahfa.dexmaker; -import com.elderdrivers.riru.xposed.Main; +import com.elderdrivers.riru.edxp.yahfa.Main; import java.io.File; import java.lang.reflect.Constructor; @@ -13,10 +13,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import de.robv.android.xposed.XposedBridge; -import static com.elderdrivers.riru.xposed.dexmaker.DexMakerUtils.shouldUseInMemoryHook; -import static com.elderdrivers.riru.xposed.util.FileUtils.getDataPathPrefix; -import static com.elderdrivers.riru.xposed.util.FileUtils.getPackageName; -import static com.elderdrivers.riru.xposed.util.ProcessUtils.getCurrentProcessName; +import static com.elderdrivers.riru.edxp.yahfa.dexmaker.DexMakerUtils.shouldUseInMemoryHook; +import static com.elderdrivers.riru.edxp.util.FileUtils.getDataPathPrefix; +import static com.elderdrivers.riru.edxp.util.FileUtils.getPackageName; +import static com.elderdrivers.riru.edxp.util.ProcessUtils.getCurrentProcessName; public final class DynamicBridge { diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/dexmaker/HookerDexMaker.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/HookerDexMaker.java similarity index 98% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/dexmaker/HookerDexMaker.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/HookerDexMaker.java index 39507c75..3b281da5 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/dexmaker/HookerDexMaker.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/HookerDexMaker.java @@ -1,11 +1,11 @@ -package com.elderdrivers.riru.xposed.dexmaker; +package com.elderdrivers.riru.edxp.yahfa.dexmaker; import android.annotation.TargetApi; import android.os.Build; import android.text.TextUtils; -import com.elderdrivers.riru.xposed.Main; -import com.elderdrivers.riru.xposed.core.HookMain; +import com.elderdrivers.riru.edxp.yahfa.Main; +import com.elderdrivers.riru.edxp.yahfa.core.HookMain; import java.io.File; import java.lang.reflect.Constructor; @@ -29,10 +29,10 @@ import external.com.android.dx.Local; import external.com.android.dx.MethodId; import external.com.android.dx.TypeId; -import static com.elderdrivers.riru.xposed.dexmaker.DexMakerUtils.autoBoxIfNecessary; -import static com.elderdrivers.riru.xposed.dexmaker.DexMakerUtils.autoUnboxIfNecessary; -import static com.elderdrivers.riru.xposed.dexmaker.DexMakerUtils.createResultLocals; -import static com.elderdrivers.riru.xposed.dexmaker.DexMakerUtils.getObjTypeIdIfPrimitive; +import static com.elderdrivers.riru.edxp.yahfa.dexmaker.DexMakerUtils.autoBoxIfNecessary; +import static com.elderdrivers.riru.edxp.yahfa.dexmaker.DexMakerUtils.autoUnboxIfNecessary; +import static com.elderdrivers.riru.edxp.yahfa.dexmaker.DexMakerUtils.createResultLocals; +import static com.elderdrivers.riru.edxp.yahfa.dexmaker.DexMakerUtils.getObjTypeIdIfPrimitive; public class HookerDexMaker { diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/dexmaker/MethodInfo.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/MethodInfo.java similarity index 98% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/dexmaker/MethodInfo.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/MethodInfo.java index 03d141c7..27ea86e0 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/dexmaker/MethodInfo.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/MethodInfo.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.xposed.dexmaker; +package com.elderdrivers.riru.edxp.yahfa.dexmaker; import java.lang.reflect.Constructor; import java.lang.reflect.Member; diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/Router.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/Router.java similarity index 82% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/Router.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/Router.java index 5510caa9..bc931e41 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/Router.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/Router.java @@ -1,15 +1,15 @@ -package com.elderdrivers.riru.xposed.entry; +package com.elderdrivers.riru.edxp.yahfa.entry; import android.text.TextUtils; -import com.elderdrivers.riru.xposed.core.HookMain; -import com.elderdrivers.riru.xposed.dexmaker.DynamicBridge; -import com.elderdrivers.riru.xposed.entry.bootstrap.AppBootstrapHookInfo; -import com.elderdrivers.riru.xposed.entry.bootstrap.SysBootstrapHookInfo; -import com.elderdrivers.riru.xposed.entry.bootstrap.SysInnerHookInfo; -import com.elderdrivers.riru.xposed.entry.bootstrap.WorkAroundHookInfo; -import com.elderdrivers.riru.xposed.entry.hooker.SystemMainHooker; -import com.elderdrivers.riru.xposed.util.Utils; +import com.elderdrivers.riru.edxp.yahfa.core.HookMain; +import com.elderdrivers.riru.edxp.yahfa.dexmaker.DynamicBridge; +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.util.Utils; import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.XposedInit; diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/bootstrap/AppBootstrapHookInfo.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/AppBootstrapHookInfo.java similarity index 52% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/bootstrap/AppBootstrapHookInfo.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/AppBootstrapHookInfo.java index 714ea2fc..24aa7c29 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/bootstrap/AppBootstrapHookInfo.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/AppBootstrapHookInfo.java @@ -1,9 +1,9 @@ -package com.elderdrivers.riru.xposed.entry.bootstrap; +package com.elderdrivers.riru.edxp.yahfa.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.xposed.entry.hooker.HandleBindAppHooker; -import com.elderdrivers.riru.xposed.entry.hooker.LoadedApkConstructorHooker; -import com.elderdrivers.riru.xposed.entry.hooker.OnePlusWorkAroundHooker; +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; public class AppBootstrapHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/bootstrap/SysBootstrapHookInfo.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysBootstrapHookInfo.java similarity index 50% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/bootstrap/SysBootstrapHookInfo.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysBootstrapHookInfo.java index cca1e6b8..2cb7e02e 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/bootstrap/SysBootstrapHookInfo.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysBootstrapHookInfo.java @@ -1,10 +1,10 @@ -package com.elderdrivers.riru.xposed.entry.bootstrap; +package com.elderdrivers.riru.edxp.yahfa.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.xposed.entry.hooker.HandleBindAppHooker; -import com.elderdrivers.riru.xposed.entry.hooker.LoadedApkConstructorHooker; -import com.elderdrivers.riru.xposed.entry.hooker.OnePlusWorkAroundHooker; -import com.elderdrivers.riru.xposed.entry.hooker.SystemMainHooker; +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; public class SysBootstrapHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/bootstrap/SysInnerHookInfo.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysInnerHookInfo.java similarity index 60% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/bootstrap/SysInnerHookInfo.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysInnerHookInfo.java index c08293d7..a185c0df 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/bootstrap/SysInnerHookInfo.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysInnerHookInfo.java @@ -1,7 +1,7 @@ -package com.elderdrivers.riru.xposed.entry.bootstrap; +package com.elderdrivers.riru.edxp.yahfa.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.xposed.entry.hooker.StartBootstrapServicesHooker; +import com.elderdrivers.riru.edxp.yahfa.entry.hooker.StartBootstrapServicesHooker; public class SysInnerHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/bootstrap/WorkAroundHookInfo.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/WorkAroundHookInfo.java similarity index 61% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/bootstrap/WorkAroundHookInfo.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/WorkAroundHookInfo.java index 58ffcb99..f0c5f065 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/bootstrap/WorkAroundHookInfo.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/WorkAroundHookInfo.java @@ -1,7 +1,7 @@ -package com.elderdrivers.riru.xposed.entry.bootstrap; +package com.elderdrivers.riru.edxp.yahfa.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.xposed.entry.hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.yahfa.entry.hooker.OnePlusWorkAroundHooker; public class WorkAroundHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/HandleBindAppHooker.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/HandleBindAppHooker.java similarity index 89% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/HandleBindAppHooker.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/HandleBindAppHooker.java index 0f7aa822..5292f0b2 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/HandleBindAppHooker.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/HandleBindAppHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.xposed.entry.hooker; +package com.elderdrivers.riru.edxp.yahfa.entry.hooker; import android.app.ActivityThread; import android.app.LoadedApk; @@ -7,15 +7,15 @@ import android.content.pm.ApplicationInfo; import android.content.res.CompatibilityInfo; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.xposed.Main; -import com.elderdrivers.riru.xposed.util.Utils; +import com.elderdrivers.riru.edxp.yahfa.Main; +import com.elderdrivers.riru.edxp.util.Utils; import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.callbacks.XC_LoadPackage; -import static com.elderdrivers.riru.xposed.config.InstallerChooser.INSTALLER_PACKAGE_NAME; -import static com.elderdrivers.riru.xposed.entry.hooker.XposedBlackListHooker.BLACK_LIST_PACKAGE_NAME; -import static com.elderdrivers.riru.xposed.util.ClassLoaderUtils.replaceParentClassLoader; +import static com.elderdrivers.riru.edxp.config.InstallerChooser.INSTALLER_PACKAGE_NAME; +import static com.elderdrivers.riru.edxp.yahfa.entry.hooker.XposedBlackListHooker.BLACK_LIST_PACKAGE_NAME; +import static com.elderdrivers.riru.edxp.util.ClassLoaderUtils.replaceParentClassLoader; import static de.robv.android.xposed.XposedHelpers.getObjectField; import static de.robv.android.xposed.XposedHelpers.setObjectField; import static de.robv.android.xposed.XposedInit.loadedPackagesInProcess; diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/LoadedApkConstructorHooker.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/LoadedApkConstructorHooker.java similarity index 96% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/LoadedApkConstructorHooker.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/LoadedApkConstructorHooker.java index 01ccbab7..44302a9e 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/LoadedApkConstructorHooker.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/LoadedApkConstructorHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.xposed.entry.hooker; +package com.elderdrivers.riru.edxp.yahfa.entry.hooker; import android.app.ActivityThread; import android.app.AndroidAppHelper; @@ -12,7 +12,7 @@ import com.elderdrivers.riru.common.KeepMembers; import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.callbacks.XC_LoadPackage; -import static com.elderdrivers.riru.xposed.util.ClassLoaderUtils.replaceParentClassLoader; +import static com.elderdrivers.riru.edxp.util.ClassLoaderUtils.replaceParentClassLoader; import static de.robv.android.xposed.XposedHelpers.getBooleanField; import static de.robv.android.xposed.XposedHelpers.getObjectField; import static de.robv.android.xposed.XposedInit.loadedPackagesInProcess; diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/OnePlusWorkAroundHooker.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/OnePlusWorkAroundHooker.java similarity index 88% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/OnePlusWorkAroundHooker.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/OnePlusWorkAroundHooker.java index f545da8e..40bfe6ab 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/OnePlusWorkAroundHooker.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/OnePlusWorkAroundHooker.java @@ -1,7 +1,8 @@ -package com.elderdrivers.riru.xposed.entry.hooker; +package com.elderdrivers.riru.edxp.yahfa.entry.hooker; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.xposed.entry.Router; +import com.elderdrivers.riru.edxp.yahfa.entry.Router; +import com.elderdrivers.riru.edxp.yahfa.Main; import de.robv.android.xposed.XposedBridge; @@ -14,7 +15,7 @@ import static de.robv.android.xposed.XposedInit.logD; * system prop "persist.sys.oem.region" set to "CN".(detail of related source code: * https://gist.github.com/solohsu/ecc07141759958fc096ba0781fac0a5f) * If we invoke intZygoteCallbacks in - * {@link com.elderdrivers.riru.xposed.Main#forkAndSpecializePre}, where in zygote process, + * {@link Main#forkAndSpecializePre}, where in zygote process, * we would get a chance to invoke findclass, leaving fd of /dev/binder open in zygote process, * which is not allowed because /dev/binder is not in predefined whitelist here: * http://androidxref.com/9.0.0_r3/xref/frameworks/base/core/jni/fd_utils.cpp#35 diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/StartBootstrapServicesHooker.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/StartBootstrapServicesHooker.java similarity index 92% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/StartBootstrapServicesHooker.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/StartBootstrapServicesHooker.java index 9ab4a1e3..0156eebe 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/StartBootstrapServicesHooker.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/StartBootstrapServicesHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.xposed.entry.hooker; +package com.elderdrivers.riru.edxp.yahfa.entry.hooker; import android.os.Build; @@ -9,8 +9,8 @@ import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.XposedHelpers; import de.robv.android.xposed.callbacks.XC_LoadPackage; -import static com.elderdrivers.riru.xposed.util.ClassLoaderUtils.replaceParentClassLoader; -import static com.elderdrivers.riru.xposed.util.Utils.logD; +import static com.elderdrivers.riru.edxp.util.ClassLoaderUtils.replaceParentClassLoader; +import static com.elderdrivers.riru.edxp.util.Utils.logD; import static de.robv.android.xposed.XposedHelpers.findAndHookMethod; import static de.robv.android.xposed.XposedInit.loadedPackagesInProcess; import static de.robv.android.xposed.XposedInit.logE; diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/SystemMainHooker.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/SystemMainHooker.java similarity index 88% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/SystemMainHooker.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/SystemMainHooker.java index 1f51c3d2..9941ee74 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/SystemMainHooker.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/SystemMainHooker.java @@ -1,10 +1,10 @@ -package com.elderdrivers.riru.xposed.entry.hooker; +package com.elderdrivers.riru.edxp.yahfa.entry.hooker; import android.app.ActivityThread; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.xposed.entry.Router; -import com.elderdrivers.riru.xposed.util.PrebuiltMethodsDeopter; +import com.elderdrivers.riru.edxp.yahfa.entry.Router; +import com.elderdrivers.riru.edxp.util.PrebuiltMethodsDeopter; import de.robv.android.xposed.XposedBridge; diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/XposedBlackListHooker.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/XposedBlackListHooker.java similarity index 92% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/XposedBlackListHooker.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/XposedBlackListHooker.java index 18c2be59..1fe6572a 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/XposedBlackListHooker.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/XposedBlackListHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.xposed.entry.hooker; +package com.elderdrivers.riru.edxp.yahfa.entry.hooker; import android.annotation.TargetApi; import android.app.Activity; @@ -6,7 +6,7 @@ import android.content.Context; import android.content.ContextWrapper; import android.os.Build; -import com.elderdrivers.riru.xposed.util.Utils; +import com.elderdrivers.riru.edxp.util.Utils; import java.io.File; import java.util.Arrays; @@ -18,8 +18,8 @@ import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XSharedPreferences; import de.robv.android.xposed.XposedBridge; -import static com.elderdrivers.riru.xposed.config.InstallerChooser.INSTALLER_PACKAGE_NAME; -import static com.elderdrivers.riru.xposed.util.FileUtils.IS_USING_PROTECTED_STORAGE; +import static com.elderdrivers.riru.edxp.config.InstallerChooser.INSTALLER_PACKAGE_NAME; +import static com.elderdrivers.riru.edxp.util.FileUtils.IS_USING_PROTECTED_STORAGE; import static de.robv.android.xposed.XposedHelpers.findAndHookMethod; public class XposedBlackListHooker { diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/XposedInstallerHooker.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/XposedInstallerHooker.java similarity index 93% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/XposedInstallerHooker.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/XposedInstallerHooker.java index 9eeb6bcc..17ca675d 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/hooker/XposedInstallerHooker.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/XposedInstallerHooker.java @@ -1,6 +1,6 @@ -package com.elderdrivers.riru.xposed.entry.hooker; +package com.elderdrivers.riru.edxp.yahfa.entry.hooker; -import com.elderdrivers.riru.xposed.util.Utils; +import com.elderdrivers.riru.edxp.util.Utils; import java.io.File; import java.io.FileInputStream; @@ -10,7 +10,7 @@ import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XC_MethodReplacement; import de.robv.android.xposed.XposedBridge; -import static com.elderdrivers.riru.xposed.config.InstallerChooser.LEGACY_INSTALLER_PACKAGE_NAME; +import static com.elderdrivers.riru.edxp.config.InstallerChooser.LEGACY_INSTALLER_PACKAGE_NAME; import static de.robv.android.xposed.XposedHelpers.callStaticMethod; import static de.robv.android.xposed.XposedHelpers.findAndHookMethod; import static de.robv.android.xposed.XposedHelpers.findClass; @@ -38,7 +38,7 @@ public class XposedInstallerHooker { Utils.logD("reloadXposedProp already done, skip..."); return; } - File file = new File("/system/framework/edconfig.dex"); + File file = new File("/system/framework/edconfig.jar"); FileInputStream is = null; try { is = new FileInputStream(file); diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/proxy/yahfa/BlackWhiteListProxy.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/proxy/BlackWhiteListProxy.java similarity index 90% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/proxy/yahfa/BlackWhiteListProxy.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/proxy/BlackWhiteListProxy.java index c0c5ab1b..aa0ba58c 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/proxy/yahfa/BlackWhiteListProxy.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/proxy/BlackWhiteListProxy.java @@ -1,18 +1,18 @@ -package com.elderdrivers.riru.xposed.proxy.yahfa; +package com.elderdrivers.riru.edxp.yahfa.proxy; import android.text.TextUtils; -import com.elderdrivers.riru.xposed.Main; -import com.elderdrivers.riru.xposed.config.ConfigManager; -import com.elderdrivers.riru.xposed.entry.Router; -import com.elderdrivers.riru.xposed.util.PrebuiltMethodsDeopter; -import com.elderdrivers.riru.xposed.util.ProcessUtils; -import com.elderdrivers.riru.xposed.util.Utils; +import com.elderdrivers.riru.edxp.yahfa.Main; +import com.elderdrivers.riru.edxp.config.ConfigManager; +import com.elderdrivers.riru.edxp.yahfa.entry.Router; +import com.elderdrivers.riru.edxp.util.PrebuiltMethodsDeopter; +import com.elderdrivers.riru.edxp.util.ProcessUtils; +import com.elderdrivers.riru.edxp.util.Utils; import de.robv.android.xposed.XposedBridge; -import static com.elderdrivers.riru.xposed.Main.isAppNeedHook; -import static com.elderdrivers.riru.xposed.util.FileUtils.getDataPathPrefix; +import static com.elderdrivers.riru.edxp.yahfa.Main.isAppNeedHook; +import static com.elderdrivers.riru.edxp.util.FileUtils.getDataPathPrefix; /** * 1. Non dynamic mode diff --git a/Bridge/src/main/java/com/elderdrivers/riru/xposed/proxy/yahfa/NormalProxy.java b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/proxy/NormalProxy.java similarity index 89% rename from Bridge/src/main/java/com/elderdrivers/riru/xposed/proxy/yahfa/NormalProxy.java rename to Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/proxy/NormalProxy.java index b60e9e0c..2ccd5963 100644 --- a/Bridge/src/main/java/com/elderdrivers/riru/xposed/proxy/yahfa/NormalProxy.java +++ b/Bridge/src/main/java/com/elderdrivers/riru/edxp/yahfa/proxy/NormalProxy.java @@ -1,11 +1,11 @@ -package com.elderdrivers.riru.xposed.proxy.yahfa; +package com.elderdrivers.riru.edxp.yahfa.proxy; -import com.elderdrivers.riru.xposed.Main; -import com.elderdrivers.riru.xposed.config.ConfigManager; -import com.elderdrivers.riru.xposed.entry.Router; -import com.elderdrivers.riru.xposed.util.PrebuiltMethodsDeopter; +import com.elderdrivers.riru.edxp.yahfa.Main; +import com.elderdrivers.riru.edxp.config.ConfigManager; +import com.elderdrivers.riru.edxp.util.PrebuiltMethodsDeopter; +import com.elderdrivers.riru.edxp.yahfa.entry.Router; -import static com.elderdrivers.riru.xposed.util.FileUtils.getDataPathPrefix; +import static com.elderdrivers.riru.edxp.util.FileUtils.getDataPathPrefix; public class NormalProxy { diff --git a/Bridge/src/main/java/de/robv/android/xposed/GeneClass_Template.java b/Bridge/src/main/java/de/robv/android/xposed/GeneClass_Template.java deleted file mode 100644 index 7d0e096e..00000000 --- a/Bridge/src/main/java/de/robv/android/xposed/GeneClass_Template.java +++ /dev/null @@ -1,74 +0,0 @@ -package de.robv.android.xposed; - -public class GeneClass_Template { - public static java.lang.reflect.Member method; - public static de.robv.android.xposed.XposedBridge.AdditionalHookInfo tAdditionalInfoObj; - - public static boolean backup(java.lang.Object obj, int i) { - return false; - } - - public static boolean hook(java.lang.Object obj, int i) throws Throwable { - java.lang.Throwable th; - if (!de.robv.android.xposed.XposedBridge.disableHooks) { - java.lang.Object[] snapshot = tAdditionalInfoObj.callbacks.getSnapshot(); - int length = snapshot.length; - if (length != 0) { - de.robv.android.xposed.XC_MethodHook.MethodHookParam methodHookParam = new de.robv.android.xposed.XC_MethodHook.MethodHookParam(); - methodHookParam.method = method; - java.lang.Object[] objArr = new java.lang.Object[1]; - methodHookParam.args = objArr; - methodHookParam.thisObject = obj; - objArr[0] = java.lang.Integer.valueOf(i); - int i2 = 0; - do { - try { - ((de.robv.android.xposed.XC_MethodHook) snapshot[i2]).callBeforeHookedMethod(methodHookParam); - if (methodHookParam.returnEarly) { - i2++; - break; - } - } catch (java.lang.Throwable th2) { - de.robv.android.xposed.XposedBridge.log(th2); - methodHookParam.setResult(null); - methodHookParam.returnEarly = false; - } - i2++; - } while (i2 < length); - if (!methodHookParam.returnEarly) { - try { - methodHookParam.setResult(java.lang.Boolean.valueOf(backup(obj, i))); - } catch (java.lang.Throwable th3) { - methodHookParam.setThrowable(th3); - } - } - i2--; - do { - java.lang.Object result = methodHookParam.getResult(); - Throwable th2 = methodHookParam.getThrowable(); - try { - ((de.robv.android.xposed.XC_MethodHook) snapshot[i2]).callAfterHookedMethod(methodHookParam); - } catch (java.lang.Throwable th4) { - de.robv.android.xposed.XposedBridge.log(th4); - if (th2 == null) { - methodHookParam.setResult(result); - } else { - methodHookParam.setThrowable(th2); - } - } - i2--; - } while (i2 >= 0); - if (!methodHookParam.hasThrowable()) { - return ((java.lang.Boolean) methodHookParam.getResult()).booleanValue(); - } - throw methodHookParam.getThrowable(); - } - } - return backup(obj, i); - } - - public static void setup(java.lang.reflect.Member member, de.robv.android.xposed.XposedBridge.AdditionalHookInfo additionalHookInfo) { - method = member; - tAdditionalInfoObj = additionalHookInfo; - } -} \ No newline at end of file diff --git a/Bridge/src/main/java/de/robv/android/xposed/XposedBridge.java b/Bridge/src/main/java/de/robv/android/xposed/XposedBridge.java index 82972fed..95758d63 100644 --- a/Bridge/src/main/java/de/robv/android/xposed/XposedBridge.java +++ b/Bridge/src/main/java/de/robv/android/xposed/XposedBridge.java @@ -3,9 +3,9 @@ package de.robv.android.xposed; import android.annotation.SuppressLint; import android.util.Log; -import com.elderdrivers.riru.xposed.core.HookMain; -import com.elderdrivers.riru.xposed.dexmaker.DynamicBridge; -import com.elderdrivers.riru.xposed.dexmaker.MethodInfo; +import com.elderdrivers.riru.edxp.yahfa.core.HookMain; +import com.elderdrivers.riru.edxp.yahfa.dexmaker.DynamicBridge; +import com.elderdrivers.riru.edxp.yahfa.dexmaker.MethodInfo; import java.io.File; import java.io.IOException; diff --git a/Bridge/src/main/java/de/robv/android/xposed/XposedInit.java b/Bridge/src/main/java/de/robv/android/xposed/XposedInit.java index 20700ebb..9e53b3cd 100644 --- a/Bridge/src/main/java/de/robv/android/xposed/XposedInit.java +++ b/Bridge/src/main/java/de/robv/android/xposed/XposedInit.java @@ -6,10 +6,9 @@ import android.text.TextUtils; import android.util.Log; import com.android.internal.os.ZygoteInit; -import com.elderdrivers.riru.xposed.BuildConfig; -import com.elderdrivers.riru.xposed.config.ConfigManager; -import com.elderdrivers.riru.xposed.entry.Router; -import com.elderdrivers.riru.xposed.util.Utils; +import com.elderdrivers.riru.edxp.config.ConfigManager; +import com.elderdrivers.riru.edxp.yahfa.entry.Router; +import com.elderdrivers.riru.edxp.util.Utils; import java.io.BufferedReader; import java.io.File; @@ -25,8 +24,8 @@ import dalvik.system.DexFile; import dalvik.system.PathClassLoader; import de.robv.android.xposed.services.BaseService; -import static com.elderdrivers.riru.xposed.config.InstallerChooser.INSTALLER_DATA_BASE_DIR; -import static com.elderdrivers.riru.xposed.entry.hooker.XposedBlackListHooker.BLACK_LIST_PACKAGE_NAME; +import static com.elderdrivers.riru.edxp.config.InstallerChooser.INSTALLER_DATA_BASE_DIR; +import static com.elderdrivers.riru.edxp.yahfa.entry.hooker.XposedBlackListHooker.BLACK_LIST_PACKAGE_NAME; import static de.robv.android.xposed.XposedHelpers.closeSilently; import static de.robv.android.xposed.XposedHelpers.findClass; import static de.robv.android.xposed.XposedHelpers.findFieldIfExists; diff --git a/Bridge/src/main/java/de/robv/android/xposed/callbacks/XCallback.java b/Bridge/src/main/java/de/robv/android/xposed/callbacks/XCallback.java index 4de87157..8e17e916 100644 --- a/Bridge/src/main/java/de/robv/android/xposed/callbacks/XCallback.java +++ b/Bridge/src/main/java/de/robv/android/xposed/callbacks/XCallback.java @@ -2,8 +2,7 @@ package de.robv.android.xposed.callbacks; import android.os.Bundle; -import com.elderdrivers.riru.xposed.entry.Router; -import com.elderdrivers.riru.xposed.util.PrebuiltMethodsDeopter; +import com.elderdrivers.riru.edxp.util.PrebuiltMethodsDeopter; import java.io.Serializable; diff --git a/Core/.gitignore b/Core/.gitignore index 57726a41..4780015e 100644 --- a/Core/.gitignore +++ b/Core/.gitignore @@ -3,5 +3,5 @@ /libs /obj /release -/template_override/system/framework/edxposed.dex +/template_override/system/framework/edxp.jar *.iml \ No newline at end of file diff --git a/Core/jni/main/include/config.h b/Core/jni/main/include/config.h index 8921a95e..cd963cad 100644 --- a/Core/jni/main/include/config.h +++ b/Core/jni/main/include/config.h @@ -8,8 +8,8 @@ //#define DEBUG #define INJECT_DEX_PATH \ -"/system/framework/edxposed.dex:/system/framework/eddalvikdx.dex:/system/framework/eddexmaker.dex" +"/system/framework/edxp.jar:/system/framework/eddalvikdx.jar:/system/framework/eddexmaker.jar" -#define ENTRY_CLASS_NAME "com.elderdrivers.riru.xposed.Main" +#define ENTRY_CLASS_NAME "com.elderdrivers.riru.edxp.yahfa.Main" #endif //CONFIG_H \ No newline at end of file diff --git a/Core/src/main/AndroidManifest.xml b/Core/src/main/AndroidManifest.xml index 6dcea510..ac58c54b 100644 --- a/Core/src/main/AndroidManifest.xml +++ b/Core/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/Core/template_override/system/framework/edconfig.dex b/Core/template_override/system/framework/edconfig.jar similarity index 100% rename from Core/template_override/system/framework/edconfig.dex rename to Core/template_override/system/framework/edconfig.jar diff --git a/Core/template_override/system/framework/eddalvikdx.dex b/Core/template_override/system/framework/eddalvikdx.dex deleted file mode 100644 index d733ee64..00000000 Binary files a/Core/template_override/system/framework/eddalvikdx.dex and /dev/null differ diff --git a/Core/template_override/system/framework/eddalvikdx.jar b/Core/template_override/system/framework/eddalvikdx.jar new file mode 100644 index 00000000..98fb5d9f Binary files /dev/null and b/Core/template_override/system/framework/eddalvikdx.jar differ diff --git a/Core/template_override/system/framework/eddexmaker.dex b/Core/template_override/system/framework/eddexmaker.dex deleted file mode 100644 index 6d194a63..00000000 Binary files a/Core/template_override/system/framework/eddexmaker.dex and /dev/null differ diff --git a/Core/template_override/system/framework/eddexmaker.jar b/Core/template_override/system/framework/eddexmaker.jar new file mode 100644 index 00000000..04344d19 Binary files /dev/null and b/Core/template_override/system/framework/eddexmaker.jar differ diff --git a/README.md b/README.md index 7a90408c..49bb3a42 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ and zip binaries can be downloaded from [here](http://gnuwin32.sourceforge.net/p ## Build -1. run `:Bridge:makeAndCopyRelease` in Gradle window to build `edxposed.dex` +1. run `:Bridge:makeAndCopyRelease` in Gradle window to build `edxp.jar` 2. run `:Core:zipRelease` to build Magisk Riru module flashable zip file 3. find the flashable under `Core/release/` 4. flash the zip in recovery mode or in Magisk Manager