Minor fixes

Author: JingMatrix

xposed/src/main/kotlin/org/matrix/vector/impl/hooks/BaseInvoker.kt

@@ -4,6 +4,7 @@ import io.github.libxposed.api.XposedInterface.CtorInvoker
 import io.github.libxposed.api.XposedInterface.Invoker
 import java.lang.reflect.Constructor
 import java.lang.reflect.Executable
+import java.lang.reflect.InvocationTargetException
 import java.lang.reflect.Method
 import org.matrix.vector.impl.di.VectorBootstrap
 import org.matrix.vector.nativebridge.HookBridge
@@ -28,7 +29,11 @@ internal abstract class BaseInvoker<T : Invoker<T, U>, U : Executable>(
     protected fun proceedInvocation(thisObject: Any?, args: Array<out Any?>): Any? {
         return when (val currentType = type) {
             is Invoker.Type.Origin -> {
-                HookBridge.invokeOriginalMethod(executable, thisObject, *args)
+                try {
+                    HookBridge.invokeOriginalMethod(executable, thisObject, args)
+                } catch (e: InvocationTargetException) {
+                    throw e.cause ?: e
+                }
             }
             is Invoker.Type.Chain -> {
                 val snapshots =

xposed/src/main/kotlin/org/matrix/vector/impl/hooks/VectorChain.kt

@@ -86,8 +86,8 @@ class VectorChain(
         t: Throwable,
         record: VectorHookRecord,
         nextChain: VectorChain,
-        currentThis: Any,
-        currentArgs: Array<Any?>,
+        recoverThis: Any,
+        recoverArgs: Array<Any?>,
     ): Any? {
         if (record.exceptionMode == ExceptionMode.PASSTHROUGH) {
             throw t
@@ -97,9 +97,9 @@ class VectorChain(
         Log.e("VectorChain", "Hooker threw exception: ${record.hooker.javaClass.name}", t)
 
         if (!nextChain.proceedCalled) {
-            // Crash occurred BEFORE proceed(). Skip this hooker entirely and drive the chain
-            // manually.
-            return nextChain.proceedWith(currentThis, currentArgs)
+            // Crash occurred BEFORE proceed().
+            // Skip this hooker entirely and drive the chain manually.
+            return nextChain.proceedWith(recoverThis, recoverArgs)
         } else {
             // Crash occurred AFTER proceed(). Swallow the module's crash and return the real
             // downstream state.

xposed/src/main/kotlin/org/matrix/vector/impl/hooks/VectorNativeHooker.kt

@@ -98,15 +98,17 @@ class VectorNativeHooker<T : Executable>(private val method: T) {
         val result = rootChain.proceed()
 
         // Type safety validation before returning to C++
-        if (
-            returnType != null &&
-                !returnType.isPrimitive &&
-                result != null &&
-                !HookBridge.instanceOf(result, returnType)
-        ) {
-            throw ClassCastException(
-                "Return value's type from hook callback does not match the hooked method"
-            )
+        if (returnType != null && returnType != Void.TYPE) {
+            if (result == null && returnType.isPrimitive) {
+                throw NullPointerException(
+                    "Hook returned null for a primitive return type: $method"
+                )
+            }
+            if (result != null && HookBridge.instanceOf(result, returnType)) {
+                throw ClassCastException(
+                    "Hook return type mismatch. Expected ${returnType.name}, got ${result.javaClass.name}"
+                )
+            }
         }
 
         return result