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 dd54159a..5b29d194 100644 --- a/core/src/main/java/org/lsposed/lspd/impl/LSPosedContext.java +++ b/core/src/main/java/org/lsposed/lspd/impl/LSPosedContext.java @@ -1,7 +1,5 @@ package org.lsposed.lspd.impl; -import static de.robv.android.xposed.callbacks.XCallback.PRIORITY_DEFAULT; - import android.app.ActivityThread; import android.app.LoadedApk; import android.content.BroadcastReceiver; @@ -66,6 +64,7 @@ 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; public class LSPosedContext extends XposedContext { @@ -885,77 +884,77 @@ public class LSPosedContext extends XposedContext { }; } log("Cannot hook " + hookMethod); - return null; + throw new HookFailedError("Cannot hook " + hookMethod); } @Override - @Nullable + @NonNull public MethodUnhooker, Method> hookBefore(@NonNull Method origin, @NonNull BeforeHooker hooker) { return doHook(origin, PRIORITY_DEFAULT, hooker); } @Override - @Nullable + @NonNull public MethodUnhooker, Method> hookAfter(@NonNull Method origin, @NonNull AfterHooker hooker) { return doHook(origin, PRIORITY_DEFAULT, hooker); } @Override - @Nullable + @NonNull public MethodUnhooker, Method> hook(@NonNull Method origin, @NonNull Hooker hooker) { return doHook(origin, PRIORITY_DEFAULT, hooker); } @Override - @Nullable + @NonNull public MethodUnhooker, Method> hookBefore(@NonNull Method origin, int priority, @NonNull BeforeHooker hooker) { return doHook(origin, priority, hooker); } @Override - @Nullable + @NonNull public MethodUnhooker, Method> hookAfter(@NonNull Method origin, int priority, @NonNull AfterHooker hooker) { return doHook(origin, priority, hooker); } @Override - @Nullable + @NonNull public MethodUnhooker, Method> hook(@NonNull Method origin, int priority, @NonNull Hooker hooker) { return doHook(origin, priority, hooker); } @Override - @Nullable + @NonNull public MethodUnhooker>, Constructor> hookBefore(@NonNull Constructor origin, @NonNull BeforeHooker> hooker) { return doHook(origin, PRIORITY_DEFAULT, hooker); } @Override - @Nullable + @NonNull public MethodUnhooker>, Constructor> hookAfter(@NonNull Constructor origin, @NonNull AfterHooker> hooker) { return doHook(origin, PRIORITY_DEFAULT, hooker); } @Override - @Nullable + @NonNull public MethodUnhooker>, Constructor> hook(@NonNull Constructor origin, @NonNull Hooker> hooker) { return doHook(origin, PRIORITY_DEFAULT, hooker); } @Override - @Nullable + @NonNull public MethodUnhooker>, Constructor> hookBefore(@NonNull Constructor origin, int priority, @NonNull BeforeHooker> hooker) { return doHook(origin, priority, hooker); } @Override - @Nullable + @NonNull public MethodUnhooker>, Constructor> hookAfter(@NonNull Constructor origin, int priority, @NonNull AfterHooker> hooker) { return doHook(origin, priority, hooker); } @Override - @Nullable + @NonNull public MethodUnhooker>, Constructor> hook(@NonNull Constructor origin, int priority, @NonNull Hooker> hooker) { return doHook(origin, priority, hooker); }