From 0339bb631a201cc837e3bbf7e4163b7e1b7a4e83 Mon Sep 17 00:00:00 2001 From: Nullptr Date: Sat, 14 Jan 2023 23:57:28 +0800 Subject: [PATCH] Move package to .api --- .../java/de/robv/android/xposed/XC_MethodHook.java | 2 +- .../java/de/robv/android/xposed/XposedBridge.java | 2 +- .../xposed/callbacks/XC_InitPackageResources.java | 2 +- .../robv/android/xposed/callbacks/XC_LoadPackage.java | 2 +- .../org/lsposed/lspd/hooker/LoadedApkGetCLHooker.java | 2 +- .../lspd/hooker/StartBootstrapServicesHooker.java | 2 +- .../java/org/lsposed/lspd/impl/LSPosedContext.java | 11 +++++------ .../lsposed/lspd/impl/LSPosedRemotePreferences.java | 2 -- .../org/lsposed/lspd/impl/utils/LSPosedDexParser.java | 2 +- .../lsposed/lspd/nativebridge/DexParserBridge.java | 2 +- 10 files changed, 13 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/de/robv/android/xposed/XC_MethodHook.java b/core/src/main/java/de/robv/android/xposed/XC_MethodHook.java index 9575252a..f8576165 100644 --- a/core/src/main/java/de/robv/android/xposed/XC_MethodHook.java +++ b/core/src/main/java/de/robv/android/xposed/XC_MethodHook.java @@ -33,7 +33,7 @@ import java.util.HashMap; import de.robv.android.xposed.callbacks.IXUnhook; import de.robv.android.xposed.callbacks.XCallback; -import io.github.libxposed.XposedInterface; +import io.github.libxposed.api.XposedInterface; /** * Callback class for method hooks. diff --git a/core/src/main/java/de/robv/android/xposed/XposedBridge.java b/core/src/main/java/de/robv/android/xposed/XposedBridge.java index 628cdbcf..e3c4b291 100644 --- a/core/src/main/java/de/robv/android/xposed/XposedBridge.java +++ b/core/src/main/java/de/robv/android/xposed/XposedBridge.java @@ -42,7 +42,7 @@ import java.util.concurrent.CopyOnWriteArraySet; import de.robv.android.xposed.callbacks.XC_InitPackageResources; import de.robv.android.xposed.callbacks.XC_LoadPackage; -import io.github.libxposed.XposedInterface; +import io.github.libxposed.api.XposedInterface; /** * This class contains most of Xposed's central logic, such as initialization and callbacks used by diff --git a/core/src/main/java/de/robv/android/xposed/callbacks/XC_InitPackageResources.java b/core/src/main/java/de/robv/android/xposed/callbacks/XC_InitPackageResources.java index 9da796f2..5c39ec96 100644 --- a/core/src/main/java/de/robv/android/xposed/callbacks/XC_InitPackageResources.java +++ b/core/src/main/java/de/robv/android/xposed/callbacks/XC_InitPackageResources.java @@ -29,7 +29,7 @@ import androidx.annotation.Nullable; import java.util.concurrent.CopyOnWriteArraySet; import de.robv.android.xposed.IXposedHookInitPackageResources; -import io.github.libxposed.XposedModuleInterface; +import io.github.libxposed.api.XposedModuleInterface; /** * This class is only used for internal purposes, except for the {@link InitPackageResourcesParam} diff --git a/core/src/main/java/de/robv/android/xposed/callbacks/XC_LoadPackage.java b/core/src/main/java/de/robv/android/xposed/callbacks/XC_LoadPackage.java index 99d53146..848e3eeb 100644 --- a/core/src/main/java/de/robv/android/xposed/callbacks/XC_LoadPackage.java +++ b/core/src/main/java/de/robv/android/xposed/callbacks/XC_LoadPackage.java @@ -30,7 +30,7 @@ import java.util.concurrent.CopyOnWriteArraySet; import de.robv.android.xposed.IXposedHookLoadPackage; import de.robv.android.xposed.XposedBridge.CopyOnWriteSortedSet; -import io.github.libxposed.XposedModuleInterface; +import io.github.libxposed.api.XposedModuleInterface; /** * This class is only used for internal purposes, except for the {@link LoadPackageParam} diff --git a/core/src/main/java/org/lsposed/lspd/hooker/LoadedApkGetCLHooker.java b/core/src/main/java/org/lsposed/lspd/hooker/LoadedApkGetCLHooker.java index 406bba0a..176743f3 100644 --- a/core/src/main/java/org/lsposed/lspd/hooker/LoadedApkGetCLHooker.java +++ b/core/src/main/java/org/lsposed/lspd/hooker/LoadedApkGetCLHooker.java @@ -45,7 +45,7 @@ import de.robv.android.xposed.XC_MethodReplacement; import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.XposedHelpers; import de.robv.android.xposed.callbacks.XC_LoadPackage; -import io.github.libxposed.XposedModuleInterface; +import io.github.libxposed.api.XposedModuleInterface; public class LoadedApkGetCLHooker extends XC_MethodHook { private final LoadedApk loadedApk; diff --git a/core/src/main/java/org/lsposed/lspd/hooker/StartBootstrapServicesHooker.java b/core/src/main/java/org/lsposed/lspd/hooker/StartBootstrapServicesHooker.java index 800f8679..fe81ec15 100644 --- a/core/src/main/java/org/lsposed/lspd/hooker/StartBootstrapServicesHooker.java +++ b/core/src/main/java/org/lsposed/lspd/hooker/StartBootstrapServicesHooker.java @@ -34,7 +34,7 @@ import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.XposedInit; import de.robv.android.xposed.callbacks.XC_LoadPackage; -import io.github.libxposed.XposedModuleInterface; +import io.github.libxposed.api.XposedModuleInterface; public class StartBootstrapServicesHooker extends XC_MethodHook { diff --git a/core/src/main/java/org/lsposed/lspd/impl/LSPosedContext.java b/core/src/main/java/org/lsposed/lspd/impl/LSPosedContext.java index 5b29d194..2847217e 100644 --- a/core/src/main/java/org/lsposed/lspd/impl/LSPosedContext.java +++ b/core/src/main/java/org/lsposed/lspd/impl/LSPosedContext.java @@ -61,11 +61,11 @@ import java.util.concurrent.ConcurrentHashMap; import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.XposedHelpers; -import io.github.libxposed.XposedContext; -import io.github.libxposed.XposedModule; -import io.github.libxposed.XposedModuleInterface; -import io.github.libxposed.errors.HookFailedError; -import io.github.libxposed.utils.DexParser; +import io.github.libxposed.api.XposedContext; +import io.github.libxposed.api.XposedModule; +import io.github.libxposed.api.XposedModuleInterface; +import io.github.libxposed.api.errors.HookFailedError; +import io.github.libxposed.api.utils.DexParser; public class LSPosedContext extends XposedContext { @@ -883,7 +883,6 @@ public class LSPosedContext extends XposedContext { } }; } - log("Cannot hook " + hookMethod); throw new HookFailedError("Cannot hook " + hookMethod); } diff --git a/core/src/main/java/org/lsposed/lspd/impl/LSPosedRemotePreferences.java b/core/src/main/java/org/lsposed/lspd/impl/LSPosedRemotePreferences.java index 7e9892d3..0da81e72 100644 --- a/core/src/main/java/org/lsposed/lspd/impl/LSPosedRemotePreferences.java +++ b/core/src/main/java/org/lsposed/lspd/impl/LSPosedRemotePreferences.java @@ -16,8 +16,6 @@ import java.util.TreeMap; import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; -import de.robv.android.xposed.XposedBridge; - @SuppressWarnings("unchecked") public class LSPosedRemotePreferences implements SharedPreferences { diff --git a/core/src/main/java/org/lsposed/lspd/impl/utils/LSPosedDexParser.java b/core/src/main/java/org/lsposed/lspd/impl/utils/LSPosedDexParser.java index ff1f381f..fbd74c69 100644 --- a/core/src/main/java/org/lsposed/lspd/impl/utils/LSPosedDexParser.java +++ b/core/src/main/java/org/lsposed/lspd/impl/utils/LSPosedDexParser.java @@ -8,7 +8,7 @@ import org.lsposed.lspd.nativebridge.DexParserBridge; import java.io.IOException; import java.nio.ByteBuffer; -import io.github.libxposed.utils.DexParser; +import io.github.libxposed.api.utils.DexParser; public class LSPosedDexParser implements DexParser { long cookie; diff --git a/core/src/main/java/org/lsposed/lspd/nativebridge/DexParserBridge.java b/core/src/main/java/org/lsposed/lspd/nativebridge/DexParserBridge.java index afe8066c..49883479 100644 --- a/core/src/main/java/org/lsposed/lspd/nativebridge/DexParserBridge.java +++ b/core/src/main/java/org/lsposed/lspd/nativebridge/DexParserBridge.java @@ -5,7 +5,7 @@ import java.lang.reflect.Method; import java.nio.ByteBuffer; import dalvik.annotation.optimization.FastNative; -import io.github.libxposed.utils.DexParser; +import io.github.libxposed.api.utils.DexParser; public class DexParserBridge { @FastNative