Improve compatibility with 8.1/9.0

Author: Rprop

README.md

@@ -12,6 +12,9 @@ AndHook is a lightweight hook framework for android. It is primarily written in
 # How the method was intercepted?
 ![CallFlow](https://github.com/Rprop/AndHook/raw/master/CallFlow.png)
 
+# Special Thanks
+- cly.comp
+
 # References
 - [Cydia Substrate](https://github.com/Rprop/AndHook/tree/6cca8575771d13cbe3907442e4ed6808381b6fd5/jni/utils/Substrate) (armeabi-v7a, x86, x86_64)
 - [And64InlineHook](https://github.com/Rprop/And64InlineHook) (arm64-v8a)

app/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "27.0.3"
 
     defaultConfig {
-        applicationId "andhook.ui"
+        applicationId "andhook.test"
         minSdkVersion 14
         targetSdkVersion 27
         compileOptions {

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="andhook.test"
     android:versionCode="3"
-    android:versionName="3.5.2">
+    android:versionName="3.5.6">
 
     <uses-sdk
         android:minSdkVersion="14"

app/src/main/java/andhook/test/JNI.java

@@ -14,7 +14,7 @@ public static void test() {
 
         try {
             // libAndHook.so must be loaded before libmyjnihook.so
-            AndHook.ensureNativeLibraryLoaded();
+            AndHook.ensureNativeLibraryLoaded(null);
             System.loadLibrary("myjnihook");
         } catch (final Throwable t) {
             MainActivity.alert(t);

app/src/main/java/andhook/test/app/MainApplication.java

@@ -15,9 +15,10 @@ public final class MainApplication extends Application {
     public void onCreate() {
         super.onCreate();
         installDefaultUncaughtExceptionHandler();
+        AndHook.ensureNativeLibraryLoaded(null);
 
         Log.i(AndTest.LOG_TAG, "\nApplication started.\n--------------------------------");
-        AndHook.ensureNativeLibraryLoaded();
+
         sApp = new WeakReference<Application>(this);
     }
 

app/src/main/jni/Android.mk

@@ -9,11 +9,11 @@ LOCAL_LDFLAGS += -Wl,--strip-all
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_SRC_FILES := myjnihook.cpp
 LOCAL_LDLIBS := -llog
-#LOCAL_SHARED_LIBRARIES += libAndHook
-LOCAL_LDLIBS += -L$(LOCAL_PATH)/../../../../lib/src/main/jniLibs/$(TARGET_ARCH_ABI)/ -lAndHook
+#LOCAL_SHARED_LIBRARIES += libAK
+LOCAL_LDLIBS += -L$(LOCAL_PATH)/../../../../lib/src/main/jniLibs/$(TARGET_ARCH_ABI)/ -lAK
 include $(BUILD_SHARED_LIBRARY)
 
 #include $(CLEAR_VARS)
-#OCAL_MODULE := libAndHook
-#LOCAL_SRC_FILES := libAndHook.so
+#OCAL_MODULE := libAK
+#LOCAL_SRC_FILES := libAK
 #include $(PREBUILT_SHARED_LIBRARY)

lib/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="andhook.lib"
     android:versionCode="3"
-    android:versionName="3.5.2">
+    android:versionName="3.5.6">
 
     <application android:hasCode="true" />
 </manifest>

lib/src/main/java/andhook/lib/AndHook.java

@@ -9,44 +9,61 @@
 
 /**
  * @author Rprop
- * @version 3.5.2
+ * @version 3.5.6
  */
 @SuppressWarnings({"unused", "WeakerAccess", "JniMissingFunction"})
 public final class AndHook {
-    public final static String VERSION = "3.5.2";
+    private final static String LIB_NAME = "AK";
+    public final static String VERSION = "3.5.6";
     public final static String LOG_TAG = "AndHook";
 
-    static {
+    @SuppressWarnings("all")
+    public static void ensureNativeLibraryLoaded(final File lib_dir) {
+        try {
+            getVersionInfo();
+            return;
+        } catch (final UnsatisfiedLinkError ignored) {
+        }
+
         // Check if there is a usable directory for temporary files
-        final File tmpdir = new File(System.getProperty("java.io.tmpdir", "/data/local/tmp/"));
+        final File tmpdir = new File(System.getProperty("java.io.tmpdir",
+                "/data/local/tmp/"));
         if (!tmpdir.canWrite() || !tmpdir.canExecute())
-            throw new RuntimeException("Unable to load AndHook due to missing cache directory");
+            throw new RuntimeException(
+                    "Unable to load AndHook due to missing cache directory");
 
         try {
-            System.loadLibrary("AndHook");
+            if (lib_dir == null) {
+                System.loadLibrary(LIB_NAME);
+            } else {
+                System.load(new File(lib_dir, "lib" + LIB_NAME + ".so")
+                        .getAbsolutePath());
+            }
         } catch (final UnsatisfiedLinkError e) {
             try {
                 // compatible with libhoudini
-                System.loadLibrary("AndHookCompat");
+                if (lib_dir == null) {
+                    System.loadLibrary(LIB_NAME + "Compat");
+                } else {
+                    System.load(new File(lib_dir, "lib" + LIB_NAME + "Compat"
+                            + ".so").getAbsolutePath());
+                }
             } catch (final UnsatisfiedLinkError ignored) {
-                throw new RuntimeException("Incompatible platform", e);
+                throw new RuntimeException("Incompatible platform "
+                        + android.os.Build.VERSION.SDK_INT, e);
             }
         }
     }
 
-    public static void ensureNativeLibraryLoaded() {
-        new AndHook();
-    }
-
     public static native String getVersionInfo();
 
     public static native int backup(final Member origin);
 
     public static native int backup(final Class<?> clazz, final String name,
                                     final String signature);
 
-    public static native boolean hook(final Member origin,
-                                      final Object extra, int shared_backup);
+    public static native boolean hook(final Member origin, final Object extra,
+                                      int shared_backup);
 
     public static native boolean hook(final Class<?> clazz, final String name,
                                       final String signature, final Object extra, int shared_backup);
@@ -94,8 +111,8 @@ public static void hookNoBackup(final Class<?> clazz, final String name,
     @SuppressWarnings("all")
     public static boolean ensureClassInitialized(final Class<?> clazz) {
         if (clazz.isInterface() || Modifier.isAbstract(clazz.getModifiers())) {
-            Log.w(LOG_TAG, "interface or abstract class `" + clazz.getName() +
-                    "` cannot be initialized!");
+            Log.w(LOG_TAG, "interface or abstract class `" + clazz.getName()
+                    + "` cannot be initialized!");
             return false;
         }
         return initializeClass(clazz);
@@ -218,9 +235,12 @@ public static <T> T invokeObjectMethod(final int slot,
      * Returns the result of dynamically invoking this method. Equivalent to
      * {@code receiver.methodName(arg1, arg2, ... , argN)}.
      * <p>
-     * <p>If the method is static, the receiver argument is ignored (and may be null).
      * <p>
-     * <p>If the invocation completes normally, the return value itself is
+     * If the method is static, the receiver argument is ignored (and may be
+     * null).
+     * <p>
+     * <p>
+     * If the invocation completes normally, the return value itself is
      * returned. If the method is declared to return a primitive type, the
      * return value is boxed. If the return type is void, null is returned.
      */

lib/src/main/java/andhook/lib/xposed/XposedBridge.java

@@ -17,7 +17,7 @@
  * This class contains most of Xposed's central logic, such as initialization and callbacks used by
  * the native side. It also includes methods to add new hooks.
  * <p>
- * Latest Update 2018/04/16
+ * Latest Update 2018/04/20
  */
 @SuppressWarnings("WeakerAccess")
 public final class XposedBridge {
@@ -37,6 +37,10 @@ public final class XposedBridge {
     // built-in handlers
     private static final ConcurrentHashMap<Member, AdditionalHookInfo> sHookedMethodInfos = new ConcurrentHashMap<>();
 
+    static {
+        AndHook.ensureNativeLibraryLoaded(null);
+    }
+
     /**
      * Writes a message to the logcat error log.
      *