diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/Main.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/Main.java index 78741c92..2bf72fb4 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/Main.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/Main.java @@ -5,14 +5,12 @@ import android.os.Build; import android.os.Process; import com.elderdrivers.riru.common.KeepAll; -import com.elderdrivers.riru.edxp.BuildConfig; import com.elderdrivers.riru.edxp.config.InstallerChooser; -import com.elderdrivers.riru.edxp.yahfa.core.HookMethodResolver; -import com.elderdrivers.riru.edxp.yahfa.entry.Router; -import com.elderdrivers.riru.edxp.yahfa.proxy.BlackWhiteListProxy; -import com.elderdrivers.riru.edxp.yahfa.proxy.NormalProxy; +import com.elderdrivers.riru.edxp.whale.core.HookMethodResolver; +import com.elderdrivers.riru.edxp.whale.entry.Router; +import com.elderdrivers.riru.edxp.whale.proxy.BlackWhiteListProxy; +import com.elderdrivers.riru.edxp.whale.proxy.NormalProxy; import com.elderdrivers.riru.edxp.util.Utils; -import com.lody.whale.WhaleRuntime; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/WhaleEdxpConfig.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/config/WhaleEdxpConfig.java similarity index 83% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/WhaleEdxpConfig.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/config/WhaleEdxpConfig.java index 60f364bd..3e5a2216 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/WhaleEdxpConfig.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/config/WhaleEdxpConfig.java @@ -1,9 +1,9 @@ -package com.elderdrivers.riru.edxp.yahfa.config; +package com.elderdrivers.riru.edxp.whale.config; import com.elderdrivers.riru.edxp.config.EdXpConfig; import com.elderdrivers.riru.edxp.config.InstallerChooser; import com.elderdrivers.riru.edxp.Main; -import com.elderdrivers.riru.edxp.yahfa.entry.hooker.XposedBlackListHooker; +import com.elderdrivers.riru.edxp.whale.entry.hooker.XposedBlackListHooker; public class WhaleEdxpConfig implements EdXpConfig { @Override diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/WhaleHookProvider.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/config/WhaleHookProvider.java similarity index 90% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/WhaleHookProvider.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/config/WhaleHookProvider.java index cb94160b..cbd15cb0 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/WhaleHookProvider.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/config/WhaleHookProvider.java @@ -1,7 +1,7 @@ -package com.elderdrivers.riru.edxp.yahfa.config; +package com.elderdrivers.riru.edxp.whale.config; import com.elderdrivers.riru.edxp.hook.HookProvider; -import com.elderdrivers.riru.edxp.yahfa.util.PrebuiltMethodsDeopter; +import com.elderdrivers.riru.edxp.whale.util.PrebuiltMethodsDeopter; import com.lody.whale.WhaleRuntime; import java.lang.reflect.Member; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/HookMain.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/core/HookMain.java similarity index 98% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/HookMain.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/core/HookMain.java index 13da190a..2755c0fa 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/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.yahfa.core; +package com.elderdrivers.riru.edxp.whale.core; import com.elderdrivers.riru.edxp.Main; -import com.elderdrivers.riru.edxp.yahfa.entry.hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.whale.entry.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/yahfa/core/HookMethodResolver.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/core/HookMethodResolver.java similarity index 99% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/HookMethodResolver.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/core/HookMethodResolver.java index d8f616b5..5cdb9f02 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/HookMethodResolver.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/core/HookMethodResolver.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.core; +package com.elderdrivers.riru.edxp.whale.core; import android.os.Build; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DexLog.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/dexmaker/DexLog.java similarity index 92% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DexLog.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/dexmaker/DexLog.java index f7729737..234dfaad 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DexLog.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/dexmaker/DexLog.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.dexmaker; +package com.elderdrivers.riru.edxp.whale.dexmaker; import android.util.Log; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/MethodInfo.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/dexmaker/MethodInfo.java similarity index 98% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/MethodInfo.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/dexmaker/MethodInfo.java index 27ea86e0..1879a4a0 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/MethodInfo.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/dexmaker/MethodInfo.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.dexmaker; +package com.elderdrivers.riru.edxp.whale.dexmaker; import java.lang.reflect.Constructor; import java.lang.reflect.Member; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/Router.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/Router.java similarity index 87% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/Router.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/Router.java index 0a3347b3..cde84956 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/Router.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/Router.java @@ -1,18 +1,18 @@ -package com.elderdrivers.riru.edxp.yahfa.entry; +package com.elderdrivers.riru.edxp.whale.entry; import android.app.AndroidAppHelper; import android.text.TextUtils; import com.elderdrivers.riru.edxp.config.EdXpConfigGlobal; import com.elderdrivers.riru.edxp.util.Utils; -import com.elderdrivers.riru.edxp.yahfa.config.WhaleHookProvider; -import com.elderdrivers.riru.edxp.yahfa.config.WhaleEdxpConfig; -import com.elderdrivers.riru.edxp.yahfa.core.HookMain; -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.whale.config.WhaleHookProvider; +import com.elderdrivers.riru.edxp.whale.config.WhaleEdxpConfig; +import com.elderdrivers.riru.edxp.whale.core.HookMain; +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 java.util.concurrent.atomic.AtomicBoolean; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/AppBootstrapHookInfo.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/AppBootstrapHookInfo.java similarity index 59% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/AppBootstrapHookInfo.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/AppBootstrapHookInfo.java index 24aa7c29..fe70a71d 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/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.yahfa.entry.bootstrap; +package com.elderdrivers.riru.edxp.whale.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.whale.entry.hooker.HandleBindAppHooker; +import com.elderdrivers.riru.edxp.whale.entry.hooker.LoadedApkConstructorHooker; +import com.elderdrivers.riru.edxp.whale.entry.hooker.OnePlusWorkAroundHooker; public class AppBootstrapHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysBootstrapHookInfo.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/SysBootstrapHookInfo.java similarity index 56% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysBootstrapHookInfo.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/SysBootstrapHookInfo.java index 2cb7e02e..676413ff 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/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.yahfa.entry.bootstrap; +package com.elderdrivers.riru.edxp.whale.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.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; public class SysBootstrapHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysInnerHookInfo.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/SysInnerHookInfo.java similarity index 65% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/SysInnerHookInfo.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/SysInnerHookInfo.java index a185c0df..f250fd26 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/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.yahfa.entry.bootstrap; +package com.elderdrivers.riru.edxp.whale.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.yahfa.entry.hooker.StartBootstrapServicesHooker; +import com.elderdrivers.riru.edxp.whale.entry.hooker.StartBootstrapServicesHooker; public class SysInnerHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/WorkAroundHookInfo.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/WorkAroundHookInfo.java similarity index 65% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/bootstrap/WorkAroundHookInfo.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/bootstrap/WorkAroundHookInfo.java index f0c5f065..47517882 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/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.yahfa.entry.bootstrap; +package com.elderdrivers.riru.edxp.whale.entry.bootstrap; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.yahfa.entry.hooker.OnePlusWorkAroundHooker; +import com.elderdrivers.riru.edxp.whale.entry.hooker.OnePlusWorkAroundHooker; public class WorkAroundHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/HandleBindAppHooker.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/HandleBindAppHooker.java similarity index 95% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/HandleBindAppHooker.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/HandleBindAppHooker.java index 12d7ef2c..b8117640 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/HandleBindAppHooker.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/HandleBindAppHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.entry.hooker; +package com.elderdrivers.riru.edxp.whale.entry.hooker; import android.app.ActivityThread; import android.app.LoadedApk; @@ -9,7 +9,7 @@ import android.content.res.CompatibilityInfo; import com.elderdrivers.riru.common.KeepMembers; import com.elderdrivers.riru.edxp.util.Utils; import com.elderdrivers.riru.edxp.Main; -import com.elderdrivers.riru.edxp.yahfa.entry.Router; +import com.elderdrivers.riru.edxp.whale.entry.Router; import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.XposedHelpers; @@ -18,7 +18,7 @@ import de.robv.android.xposed.callbacks.XC_LoadPackage; import static com.elderdrivers.riru.edxp.config.InstallerChooser.INSTALLER_PACKAGE_NAME; import static com.elderdrivers.riru.edxp.util.ClassLoaderUtils.replaceParentClassLoader; -import static com.elderdrivers.riru.edxp.yahfa.entry.hooker.XposedBlackListHooker.BLACK_LIST_PACKAGE_NAME; +import static com.elderdrivers.riru.edxp.whale.entry.hooker.XposedBlackListHooker.BLACK_LIST_PACKAGE_NAME; // normal process initialization (for new Activity, Service, BroadcastReceiver etc.) public class HandleBindAppHooker implements KeepMembers { diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/LoadedApkConstructorHooker.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/LoadedApkConstructorHooker.java similarity index 97% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/LoadedApkConstructorHooker.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/LoadedApkConstructorHooker.java index ce2f7605..74e31a2f 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/LoadedApkConstructorHooker.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/LoadedApkConstructorHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.entry.hooker; +package com.elderdrivers.riru.edxp.whale.entry.hooker; import android.app.ActivityThread; import android.app.AndroidAppHelper; @@ -8,7 +8,7 @@ import android.content.res.CompatibilityInfo; import android.util.Log; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.yahfa.entry.Router; +import com.elderdrivers.riru.edxp.whale.entry.Router; import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.XposedHelpers; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/OnePlusWorkAroundHooker.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/OnePlusWorkAroundHooker.java similarity index 94% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/OnePlusWorkAroundHooker.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/OnePlusWorkAroundHooker.java index f3261f9d..3f759804 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/OnePlusWorkAroundHooker.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/OnePlusWorkAroundHooker.java @@ -1,8 +1,8 @@ -package com.elderdrivers.riru.edxp.yahfa.entry.hooker; +package com.elderdrivers.riru.edxp.whale.entry.hooker; import com.elderdrivers.riru.common.KeepMembers; import com.elderdrivers.riru.edxp.Main; -import com.elderdrivers.riru.edxp.yahfa.entry.Router; +import com.elderdrivers.riru.edxp.whale.entry.Router; import de.robv.android.xposed.XposedBridge; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/StartBootstrapServicesHooker.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/StartBootstrapServicesHooker.java similarity index 95% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/StartBootstrapServicesHooker.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/StartBootstrapServicesHooker.java index 7bc1c542..76f96512 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/StartBootstrapServicesHooker.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/StartBootstrapServicesHooker.java @@ -1,9 +1,9 @@ -package com.elderdrivers.riru.edxp.yahfa.entry.hooker; +package com.elderdrivers.riru.edxp.whale.entry.hooker; import android.os.Build; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.yahfa.entry.Router; +import com.elderdrivers.riru.edxp.whale.entry.Router; import de.robv.android.xposed.XC_MethodReplacement; import de.robv.android.xposed.XposedBridge; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/SystemMainHooker.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/SystemMainHooker.java similarity index 87% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/SystemMainHooker.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/SystemMainHooker.java index 2478f2e6..a9417db8 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/SystemMainHooker.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/SystemMainHooker.java @@ -1,10 +1,10 @@ -package com.elderdrivers.riru.edxp.yahfa.entry.hooker; +package com.elderdrivers.riru.edxp.whale.entry.hooker; import android.app.ActivityThread; import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.yahfa.util.PrebuiltMethodsDeopter; -import com.elderdrivers.riru.edxp.yahfa.entry.Router; +import com.elderdrivers.riru.edxp.whale.util.PrebuiltMethodsDeopter; +import com.elderdrivers.riru.edxp.whale.entry.Router; import de.robv.android.xposed.XposedBridge; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/XposedBlackListHooker.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/XposedBlackListHooker.java similarity index 98% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/XposedBlackListHooker.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/XposedBlackListHooker.java index 7261f63b..465093a5 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/XposedBlackListHooker.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/XposedBlackListHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.entry.hooker; +package com.elderdrivers.riru.edxp.whale.entry.hooker; import android.annotation.TargetApi; import android.app.Activity; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/XposedInstallerHooker.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/XposedInstallerHooker.java similarity index 98% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/XposedInstallerHooker.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/XposedInstallerHooker.java index 07931306..81f26df3 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/entry/hooker/XposedInstallerHooker.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/entry/hooker/XposedInstallerHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.entry.hooker; +package com.elderdrivers.riru.edxp.whale.entry.hooker; import com.elderdrivers.riru.edxp.util.Utils; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/proxy/BlackWhiteListProxy.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/proxy/BlackWhiteListProxy.java similarity index 96% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/proxy/BlackWhiteListProxy.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/proxy/BlackWhiteListProxy.java index ba9842d9..bee43070 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/proxy/BlackWhiteListProxy.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/proxy/BlackWhiteListProxy.java @@ -1,11 +1,11 @@ -package com.elderdrivers.riru.edxp.yahfa.proxy; +package com.elderdrivers.riru.edxp.whale.proxy; import android.text.TextUtils; import com.elderdrivers.riru.edxp.Main; import com.elderdrivers.riru.edxp.config.ConfigManager; -import com.elderdrivers.riru.edxp.yahfa.entry.Router; -import com.elderdrivers.riru.edxp.yahfa.util.PrebuiltMethodsDeopter; +import com.elderdrivers.riru.edxp.whale.entry.Router; +import com.elderdrivers.riru.edxp.whale.util.PrebuiltMethodsDeopter; import com.elderdrivers.riru.edxp.util.ProcessUtils; import com.elderdrivers.riru.edxp.util.Utils; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/proxy/NormalProxy.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/proxy/NormalProxy.java similarity index 95% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/proxy/NormalProxy.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/proxy/NormalProxy.java index 9c1d3dba..1dddf90e 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/proxy/NormalProxy.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/proxy/NormalProxy.java @@ -1,9 +1,9 @@ -package com.elderdrivers.riru.edxp.yahfa.proxy; +package com.elderdrivers.riru.edxp.whale.proxy; import com.elderdrivers.riru.edxp.Main; import com.elderdrivers.riru.edxp.config.ConfigManager; -import com.elderdrivers.riru.edxp.yahfa.util.PrebuiltMethodsDeopter; -import com.elderdrivers.riru.edxp.yahfa.entry.Router; +import com.elderdrivers.riru.edxp.whale.util.PrebuiltMethodsDeopter; +import com.elderdrivers.riru.edxp.whale.entry.Router; import static com.elderdrivers.riru.edxp.util.FileUtils.getDataPathPrefix; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/util/InlinedMethodCallers.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/util/InlinedMethodCallers.java similarity index 97% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/util/InlinedMethodCallers.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/util/InlinedMethodCallers.java index 15fffeb0..5e3597cc 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/util/InlinedMethodCallers.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/util/InlinedMethodCallers.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.util; +package com.elderdrivers.riru.edxp.whale.util; import java.util.HashMap; diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/util/PrebuiltMethodsDeopter.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/util/PrebuiltMethodsDeopter.java similarity index 87% rename from edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/util/PrebuiltMethodsDeopter.java rename to edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/util/PrebuiltMethodsDeopter.java index ecd8813d..fba8dd7f 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/yahfa/util/PrebuiltMethodsDeopter.java +++ b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/util/PrebuiltMethodsDeopter.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.util; +package com.elderdrivers.riru.edxp.whale.util; import com.elderdrivers.riru.edxp.util.Utils; import com.elderdrivers.riru.edxp.Main; @@ -7,8 +7,8 @@ import java.util.Arrays; import de.robv.android.xposed.XposedHelpers; -import static com.elderdrivers.riru.edxp.yahfa.util.InlinedMethodCallers.KEY_BOOT_IMAGE; -import static com.elderdrivers.riru.edxp.yahfa.util.InlinedMethodCallers.KEY_SYSTEM_SERVER; +import static com.elderdrivers.riru.edxp.whale.util.InlinedMethodCallers.KEY_BOOT_IMAGE; +import static com.elderdrivers.riru.edxp.whale.util.InlinedMethodCallers.KEY_SYSTEM_SERVER; public class PrebuiltMethodsDeopter {