Merge pull request #17 from WindySha/master

Fix bug: calling invokeOriginalMethod method caused a crash

Author: asLody

java/com/lody/whale/xposed/XposedBridge.java

@@ -41,6 +41,8 @@ public final class XposedBridge {
     // built-in handlers
     private static final Map<Member, CopyOnWriteSortedSet<XC_MethodHook>> sHookedMethodCallbacks = new HashMap<>();
 
+    private static final Map<Member, Long> sHookedMethodSlotMap = new HashMap<>();
+
     /**
      * Writes a message to the logcat error log.
      *
@@ -101,6 +103,9 @@ public static XC_MethodHook.Unhook hookMethod(final Member hookMethod, final XC_
             if (slot <= 0) {
                 throw new IllegalStateException("Failed to hook method: " + hookMethod);
             }
+            synchronized (sHookedMethodSlotMap) {
+                sHookedMethodSlotMap.put(hookMethod, slot);
+            }
         }
 
         return callback.new Unhook(hookMethod);
@@ -114,6 +119,9 @@ public static XC_MethodHook.Unhook hookMethod(final Member hookMethod, final XC_
      */
     @SuppressWarnings("all")
     public static void unhookMethod(final Member hookMethod, final XC_MethodHook callback) {
+        synchronized (sHookedMethodSlotMap) {
+            sHookedMethodSlotMap.remove(hookMethod);
+        }
         CopyOnWriteSortedSet<XC_MethodHook> callbacks;
         synchronized (sHookedMethodCallbacks) {
             callbacks = sHookedMethodCallbacks.get(hookMethod);
@@ -283,7 +291,7 @@ public static Object handleHookedMethod(Member method, long slot, Object additio
     public static Object invokeOriginalMethod(final Member method, final Object thisObject,
                                               final Object[] args)
             throws NullPointerException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
-        long slot = WhaleRuntime.getMethodSlot(method);
+        long slot = sHookedMethodSlotMap.get(method);
         return WhaleRuntime.invokeOriginalMethodNative(slot, thisObject, args);
     }