WeiguangTWK
/
api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Make all hooks non-null" 

This reverts commit 0cf4d3170e.
This commit is contained in:
Nullptr 2023-01-12 00:59:29 +08:00
parent 0cf4d3170e
commit 1eff0ee2c9
No known key found for this signature in database
2 changed files with 24 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
api/src/main/java/io/github/libxposed/XposedContextWrapper.java
View File

@ -80,73 +80,73 @@ public class XposedContextWrapper extends ContextWrapper implements XposedInterf
return getBaseContext().featuredMethod(name, args); return getBaseContext().featuredMethod(name, args);
} }
@NonNull @Nullable
@Override @Override
final public MethodUnhooker<BeforeHooker<Method>, Method> hookBefore(@NonNull Method origin, @NonNull BeforeHooker<Method> hooker) { final public MethodUnhooker<BeforeHooker<Method>, Method> hookBefore(@NonNull Method origin, @NonNull BeforeHooker<Method> hooker) {
return getBaseContext().hookBefore(origin, hooker); return getBaseContext().hookBefore(origin, hooker);
} }
@NonNull @Nullable
@Override @Override
final public MethodUnhooker<AfterHooker<Method>, Method> hookAfter(@NonNull Method origin, @NonNull AfterHooker<Method> hooker) { final public MethodUnhooker<AfterHooker<Method>, Method> hookAfter(@NonNull Method origin, @NonNull AfterHooker<Method> hooker) {
return getBaseContext().hookAfter(origin, hooker); return getBaseContext().hookAfter(origin, hooker);
} }
@NonNull @Nullable
@Override @Override
final public MethodUnhooker<Hooker<Method>, Method> hook(@NonNull Method origin, @NonNull Hooker<Method> hooker) { final public MethodUnhooker<Hooker<Method>, Method> hook(@NonNull Method origin, @NonNull Hooker<Method> hooker) {
return getBaseContext().hook(origin, hooker); return getBaseContext().hook(origin, hooker);
} }
@NonNull @Nullable
@Override @Override
final public MethodUnhooker<BeforeHooker<Method>, Method> hookBefore(@NonNull Method origin, int priority, @NonNull BeforeHooker<Method> hooker) { final public MethodUnhooker<BeforeHooker<Method>, Method> hookBefore(@NonNull Method origin, int priority, @NonNull BeforeHooker<Method> hooker) {
return getBaseContext().hookBefore(origin, priority, hooker); return getBaseContext().hookBefore(origin, priority, hooker);
} }
@NonNull @Nullable
@Override @Override
final public MethodUnhooker<AfterHooker<Method>, Method> hookAfter(@NonNull Method origin, int priority, @NonNull AfterHooker<Method> hooker) { final public MethodUnhooker<AfterHooker<Method>, Method> hookAfter(@NonNull Method origin, int priority, @NonNull AfterHooker<Method> hooker) {
return getBaseContext().hookAfter(origin, priority, hooker); return getBaseContext().hookAfter(origin, priority, hooker);
} }
@NonNull @Nullable
@Override @Override
final public MethodUnhooker<Hooker<Method>, Method> hook(@NonNull Method origin, int priority, @NonNull Hooker<Method> hooker) { final public MethodUnhooker<Hooker<Method>, Method> hook(@NonNull Method origin, int priority, @NonNull Hooker<Method> hooker) {
return getBaseContext().hook(origin, priority, hooker); return getBaseContext().hook(origin, priority, hooker);
} }
@NonNull @Nullable
@Override @Override
final public <T> MethodUnhooker<BeforeHooker<Constructor<T>>, Constructor<T>> hookBefore(@NonNull Constructor<T> origin, @NonNull BeforeHooker<Constructor<T>> hooker) { final public <T> MethodUnhooker<BeforeHooker<Constructor<T>>, Constructor<T>> hookBefore(@NonNull Constructor<T> origin, @NonNull BeforeHooker<Constructor<T>> hooker) {
return getBaseContext().hookBefore(origin, hooker); return getBaseContext().hookBefore(origin, hooker);
} }
@NonNull @Nullable
@Override @Override
final public <T> MethodUnhooker<AfterHooker<Constructor<T>>, Constructor<T>> hookAfter(@NonNull Constructor<T> origin, @NonNull AfterHooker<Constructor<T>> hooker) { final public <T> MethodUnhooker<AfterHooker<Constructor<T>>, Constructor<T>> hookAfter(@NonNull Constructor<T> origin, @NonNull AfterHooker<Constructor<T>> hooker) {
return getBaseContext().hookAfter(origin, hooker); return getBaseContext().hookAfter(origin, hooker);
} }
@NonNull @Nullable
@Override @Override
final public <T> MethodUnhooker<Hooker<Constructor<T>>, Constructor<T>> hook(@NonNull Constructor<T> origin, @NonNull Hooker<Constructor<T>> hooker) { final public <T> MethodUnhooker<Hooker<Constructor<T>>, Constructor<T>> hook(@NonNull Constructor<T> origin, @NonNull Hooker<Constructor<T>> hooker) {
return getBaseContext().hook(origin, hooker); return getBaseContext().hook(origin, hooker);
} }
@NonNull @Nullable
@Override @Override
final public <T> MethodUnhooker<BeforeHooker<Constructor<T>>, Constructor<T>> hookBefore(@NonNull Constructor<T> origin, int priority, @NonNull BeforeHooker<Constructor<T>> hooker) { final public <T> MethodUnhooker<BeforeHooker<Constructor<T>>, Constructor<T>> hookBefore(@NonNull Constructor<T> origin, int priority, @NonNull BeforeHooker<Constructor<T>> hooker) {
return getBaseContext().hookBefore(origin, priority, hooker); return getBaseContext().hookBefore(origin, priority, hooker);
} }
@NonNull @Nullable
@Override @Override
final public <T> MethodUnhooker<AfterHooker<Constructor<T>>, Constructor<T>> hookAfter(@NonNull Constructor<T> origin, int priority, @NonNull AfterHooker<Constructor<T>> hooker) { final public <T> MethodUnhooker<AfterHooker<Constructor<T>>, Constructor<T>> hookAfter(@NonNull Constructor<T> origin, int priority, @NonNull AfterHooker<Constructor<T>> hooker) {
return getBaseContext().hookAfter(origin, priority, hooker); return getBaseContext().hookAfter(origin, priority, hooker);
} }
@NonNull @Nullable
@Override @Override
final public <T> MethodUnhooker<Hooker<Constructor<T>>, Constructor<T>> hook(@NonNull Constructor<T> origin, int priority, @NonNull Hooker<Constructor<T>> hooker) { final public <T> MethodUnhooker<Hooker<Constructor<T>>, Constructor<T>> hook(@NonNull Constructor<T> origin, int priority, @NonNull Hooker<Constructor<T>> hooker) {
return getBaseContext().hook(origin, priority, hooker); return getBaseContext().hook(origin, priority, hooker);

68
api/src/main/java/io/github/libxposed/XposedInterface.java
View File

@ -45,19 +45,6 @@ public interface XposedInterface {
*/ */
int FRAMEWORK_PRIVILEGE_EMBEDDED = 3; int FRAMEWORK_PRIVILEGE_EMBEDDED = 3;
/**
* The default hook priority.
*/
int PRIORITY_DEFAULT = 50;
/**
* Execute the hook callback late.
*/
int PRIORITY_LOWEST = -10000;
/**
* Execute the hook callback early.
*/
int PRIORITY_HIGHEST = 10000;
/** /**
* The interface Before hook callback. * The interface Before hook callback.
* *
@ -319,24 +306,6 @@ public interface XposedInterface {
void unhook(); void unhook();
} }
/**
* The exception thrown when a hook fails
*/
class HookFailedException extends RuntimeException {
public HookFailedException(String message) {
super(message);
}
public HookFailedException(Throwable cause) {
super(cause);
}
public HookFailedException(String message, Throwable cause) {
super(message, cause);
}
}
/** /**
* Gets framework name. * Gets framework name.
* *
@ -374,7 +343,6 @@ public interface XposedInterface {
* @param args the args * @param args the args
* @return the object * @return the object
*/ */
@Nullable
Object featuredMethod(String name, Object... args); Object featuredMethod(String name, Object... args);
/** /**
@ -383,9 +351,8 @@ public interface XposedInterface {
* @param origin the origin * @param origin the origin
* @param hooker the hooker * @param hooker the hooker
* @return the method unhooker * @return the method unhooker
* @throws HookFailedException if hook fails
*/ */
@NonNull @Nullable
MethodUnhooker<BeforeHooker<Method>, Method> hookBefore(@NonNull Method origin, @NonNull BeforeHooker<Method> hooker); MethodUnhooker<BeforeHooker<Method>, Method> hookBefore(@NonNull Method origin, @NonNull BeforeHooker<Method> hooker);
/** /**
@ -394,9 +361,8 @@ public interface XposedInterface {
* @param origin the origin * @param origin the origin
* @param hooker the hooker * @param hooker the hooker
* @return the method unhooker * @return the method unhooker
* @throws HookFailedException if hook fails
*/ */
@NonNull @Nullable
MethodUnhooker<AfterHooker<Method>, Method> hookAfter(@NonNull Method origin, @NonNull AfterHooker<Method> hooker); MethodUnhooker<AfterHooker<Method>, Method> hookAfter(@NonNull Method origin, @NonNull AfterHooker<Method> hooker);
/** /**
@ -405,9 +371,8 @@ public interface XposedInterface {
* @param origin the origin * @param origin the origin
* @param hooker the hooker * @param hooker the hooker
* @return the method unhooker * @return the method unhooker
* @throws HookFailedException if hook fails
*/ */
@NonNull @Nullable
MethodUnhooker<Hooker<Method>, Method> hook(@NonNull Method origin, @NonNull Hooker<Method> hooker); MethodUnhooker<Hooker<Method>, Method> hook(@NonNull Method origin, @NonNull Hooker<Method> hooker);
/** /**
@ -417,9 +382,8 @@ public interface XposedInterface {
* @param priority the priority * @param priority the priority
* @param hooker the hooker * @param hooker the hooker
* @return the method unhooker * @return the method unhooker
* @throws HookFailedException if hook fails
*/ */
@NonNull @Nullable
MethodUnhooker<BeforeHooker<Method>, Method> hookBefore(@NonNull Method origin, int priority, @NonNull BeforeHooker<Method> hooker); MethodUnhooker<BeforeHooker<Method>, Method> hookBefore(@NonNull Method origin, int priority, @NonNull BeforeHooker<Method> hooker);
/** /**
@ -429,9 +393,8 @@ public interface XposedInterface {
* @param priority the priority * @param priority the priority
* @param hooker the hooker * @param hooker the hooker
* @return the method unhooker * @return the method unhooker
* @throws HookFailedException if hook fails
*/ */
@NonNull @Nullable
MethodUnhooker<AfterHooker<Method>, Method> hookAfter(@NonNull Method origin, int priority, @NonNull AfterHooker<Method> hooker); MethodUnhooker<AfterHooker<Method>, Method> hookAfter(@NonNull Method origin, int priority, @NonNull AfterHooker<Method> hooker);
/** /**
@ -441,9 +404,8 @@ public interface XposedInterface {
* @param priority the priority * @param priority the priority
* @param hooker the hooker * @param hooker the hooker
* @return the method unhooker * @return the method unhooker
* @throws HookFailedException if hook fails
*/ */
@NonNull @Nullable
MethodUnhooker<Hooker<Method>, Method> hook(@NonNull Method origin, int priority, @NonNull Hooker<Method> hooker); MethodUnhooker<Hooker<Method>, Method> hook(@NonNull Method origin, int priority, @NonNull Hooker<Method> hooker);
/** /**
@ -453,9 +415,8 @@ public interface XposedInterface {
* @param origin the origin * @param origin the origin
* @param hooker the hooker * @param hooker the hooker
* @return the method unhooker * @return the method unhooker
* @throws HookFailedException if hook fails
*/ */
@NonNull @Nullable
<T> MethodUnhooker<BeforeHooker<Constructor<T>>, Constructor<T>> hookBefore(@NonNull Constructor<T> origin, @NonNull BeforeHooker<Constructor<T>> hooker); <T> MethodUnhooker<BeforeHooker<Constructor<T>>, Constructor<T>> hookBefore(@NonNull Constructor<T> origin, @NonNull BeforeHooker<Constructor<T>> hooker);
/** /**
@ -465,9 +426,8 @@ public interface XposedInterface {
* @param origin the origin * @param origin the origin
* @param hooker the hooker * @param hooker the hooker
* @return the method unhooker * @return the method unhooker
* @throws HookFailedException if hook fails
*/ */
@NonNull @Nullable
<T> MethodUnhooker<AfterHooker<Constructor<T>>, Constructor<T>> hookAfter(@NonNull Constructor<T> origin, @NonNull AfterHooker<Constructor<T>> hooker); <T> MethodUnhooker<AfterHooker<Constructor<T>>, Constructor<T>> hookAfter(@NonNull Constructor<T> origin, @NonNull AfterHooker<Constructor<T>> hooker);
/** /**
@ -477,9 +437,8 @@ public interface XposedInterface {
* @param origin the origin * @param origin the origin
* @param hooker the hooker * @param hooker the hooker
* @return the method unhooker * @return the method unhooker
* @throws HookFailedException if hook fails
*/ */
@NonNull @Nullable
<T> MethodUnhooker<Hooker<Constructor<T>>, Constructor<T>> hook(@NonNull Constructor<T> origin, @NonNull Hooker<Constructor<T>> hooker); <T> MethodUnhooker<Hooker<Constructor<T>>, Constructor<T>> hook(@NonNull Constructor<T> origin, @NonNull Hooker<Constructor<T>> hooker);
/** /**
@ -490,9 +449,8 @@ public interface XposedInterface {
* @param priority the priority * @param priority the priority
* @param hooker the hooker * @param hooker the hooker
* @return the method unhooker * @return the method unhooker
* @throws HookFailedException if hook fails
*/ */
@NonNull @Nullable
<T> MethodUnhooker<BeforeHooker<Constructor<T>>, Constructor<T>> hookBefore(@NonNull Constructor<T> origin, int priority, @NonNull BeforeHooker<Constructor<T>> hooker); <T> MethodUnhooker<BeforeHooker<Constructor<T>>, Constructor<T>> hookBefore(@NonNull Constructor<T> origin, int priority, @NonNull BeforeHooker<Constructor<T>> hooker);
/** /**
@ -503,9 +461,8 @@ public interface XposedInterface {
* @param priority the priority * @param priority the priority
* @param hooker the hooker * @param hooker the hooker
* @return the method unhooker * @return the method unhooker
* @throws HookFailedException if hook fails
*/ */
@NonNull @Nullable
<T> MethodUnhooker<AfterHooker<Constructor<T>>, Constructor<T>> hookAfter(@NonNull Constructor<T> origin, int priority, @NonNull AfterHooker<Constructor<T>> hooker); <T> MethodUnhooker<AfterHooker<Constructor<T>>, Constructor<T>> hookAfter(@NonNull Constructor<T> origin, int priority, @NonNull AfterHooker<Constructor<T>> hooker);
/** /**
@ -516,9 +473,8 @@ public interface XposedInterface {
* @param priority the priority * @param priority the priority
* @param hooker the hooker * @param hooker the hooker
* @return the method unhooker * @return the method unhooker
* @throws HookFailedException if hook fails
*/ */
@NonNull @Nullable
<T> MethodUnhooker<Hooker<Constructor<T>>, Constructor<T>> hook(@NonNull Constructor<T> origin, int priority, @NonNull Hooker<Constructor<T>> hooker); <T> MethodUnhooker<Hooker<Constructor<T>>, Constructor<T>> hook(@NonNull Constructor<T> origin, int priority, @NonNull Hooker<Constructor<T>> hooker);
/** /**