Merge pull request #228 from ElderDrivers/resources-hook

Resources hook for ROMs with custom Resources subclass
ElderDrivers · May 1, 2019 · 71449e2 · 71449e2
2 parents edda665 + 17c703e
commit 71449e2
Show file tree

Hide file tree

Showing 38 changed files with 283 additions and 184 deletions.
diff --git a/edxp-common/src/main/java/com/elderdrivers/riru/edxp/config/BaseHookProvider.java b/edxp-common/src/main/java/com/elderdrivers/riru/edxp/config/BaseHookProvider.java
@@ -1,8 +1,5 @@
 package com.elderdrivers.riru.edxp.config;
 
-import android.content.res.Resources;
-import android.content.res.XResources;
-
 import com.elderdrivers.riru.edxp.deopt.PrebuiltMethodsDeopter;
 import com.elderdrivers.riru.edxp.hook.HookProvider;
 
@@ -40,9 +37,4 @@ public void deoptMethodNative(Object method) {
     public boolean initXResourcesNative() {
         return false;
     }
-
-    @Override
-    public void rewriteXmlReferencesNative(long parserPtr, XResources origRes, Resources repRes) {
-
-    }
 }
diff --git a/edxp-common/src/main/java/com/elderdrivers/riru/edxp/deopt/InlinedMethodCallers.java b/edxp-common/src/main/java/com/elderdrivers/riru/edxp/deopt/InlinedMethodCallers.java
@@ -26,7 +26,22 @@ public class InlinedMethodCallers {
      */
     private static final String[][] BOOT_IMAGE = {
             // callers of Application#attach(Context)
-            {"android.app.Instrumentation", "newApplication", "(Ljava/lang/ClassLoader;Ljava/lang/String;Landroid/content/Context;)Landroid/app/Application;"}
+            {"android.app.Instrumentation", "newApplication", "(Ljava/lang/ClassLoader;Ljava/lang/String;Landroid/content/Context;)Landroid/app/Application;"},
+
+            // for MIUI resources hooking
+            {"android.content.res.MiuiResources", "init", "(Ljava/lang/String;)V"},
+            {"android.content.res.MiuiResources", "updateMiuiImpl", "()V"},
+            {"android.content.res.MiuiResources", "setImpl", "(Landroid/content/res/ResourcesImpl;)V"},
+            {"android.content.res.MiuiResources", "loadOverlayValue", "(Landroid/util/TypedValue;I)V"},
+            {"android.content.res.MiuiResources", "getThemeString", "(I)Ljava/lang/CharSequence;"},
+            {"android.content.res.MiuiResources", "<init>", "(Ljava/lang/ClassLoader;)V"},
+            {"android.content.res.MiuiResources", "<init>", "()V"},
+            {"android.content.res.MiuiResources", "<init>", "(Landroid/content/res/AssetManager;Landroid/util/DisplayMetrics;Landroid/content/res/Configuration;)V"},
+            {"android.miui.ResourcesManager", "initMiuiResource", "(Landroid/content/res/Resources;Ljava/lang/String;)V"},
+            {"android.app.LoadedApk", "getResources", "()Landroid/content/res/Resources;"},
+            {"android.content.res.Resources", "getSystem", "()Landroid/content/res/Resources;"},
+            {"android.app.ApplicationPackageManager", "getResourcesForApplication", "(Landroid/content/pm/ApplicationInfo;)Landroid/content/res/Resources;"},
+            {"android.app.ContextImpl", "setResources", "(Landroid/content/res/Resources;)V"},
     };
 
     private static final String[][] SYSTEM_SERVER = {};

diff --git a/edxp-common/src/main/java/com/elderdrivers/riru/edxp/deopt/PrebuiltMethodsDeopter.java b/edxp-common/src/main/java/com/elderdrivers/riru/edxp/deopt/PrebuiltMethodsDeopter.java
@@ -19,8 +19,12 @@ public static void deoptMethods(String where, ClassLoader cl) {
         }
         for (String[] caller : callers) {
             try {
+                Class clazz = XposedHelpers.findClassIfExists(caller[0], cl);
+                if (clazz == null) {
+                    continue;
+                }
                 Object method = EdXpConfigGlobal.getHookProvider().findMethodNative(
-                        XposedHelpers.findClass(caller[0], cl), caller[1], caller[2]);
+                        clazz, caller[1], caller[2]);
                 if (method != null) {
                     EdXpConfigGlobal.getHookProvider().deoptMethodNative(method);
                 }

diff --git a/edxp-core/.gitignore b/edxp-core/.gitignore
@@ -3,6 +3,8 @@
 /libs
 /obj
 /release
+/template_override/module.prop
+/template_override/riru_module.prop
 /template_override/system
 /template_override/system_x86
 *.iml
diff --git a/edxp-core/build.gradle b/edxp-core/build.gradle
@@ -2,13 +2,17 @@ import org.gradle.internal.os.OperatingSystem
 
 apply plugin: 'com.android.library'
 
-version "v0.4.0.1_beta-SNAPSHOT"
+version "v0.4.1.2_beta"
 
 ext {
+    versionCode = "4120"
     module_name = "EdXposed"
     jar_dest_dir = "${projectDir}/template_override/system/framework/"
     is_windows = OperatingSystem.current().isWindows()
-    backends = ["Yahfa", "Sandhook", "Whale"]
+    backends = ["YAHFA", "SandHook", "Whale"]
+    yahfa_authors = "solohsu, rk700 & MlgmXyysd"
+    sandhook_authors = "solohsu, ganyao114 & MlgmXyysd"
+    whale_authors = "solohsu, asLody & MlgmXyysd"
 }
 
 android {
@@ -72,21 +76,34 @@ afterEvaluate {
 
         backends.each { backend ->
 
-            def backendCapped = backend.capitalize()
             def backendLowered = backend.toLowerCase()
+            def backendCapped = backendLowered.capitalize()
+            def authorList = property("${backendLowered}" + "_authors")
 
             def zipTask = task("zip${backendCapped}${variantCapped}", type: Exec) {
                 dependsOn cleanTemplate, copyDalvikdxJar, copyDexmakerJar
                 dependsOn tasks.getByPath(":edxp-${backendLowered}:makeAndCopy${variantCapped}")
                 workingDir '..'
                 commandLine 'sh', 'build.sh', project.name,
-                        "${backendLowered}-${project.version}-${variantLowered}", "${module_name}"
+                        "${backend}-${project.version}-${variantLowered}", "${module_name}"
                 doFirst {
                     copy {
-                        from "${projectDir}/edconfig.tpl"
+                        from "${projectDir}/tpl/edconfig.tpl"
                         into templateFrameworkPath
                         rename "edconfig.tpl", "edconfig.jar"
-                        expand(backend: "$backendCapped")
+                        expand(version: "$version", backend: "$backend")
+                    }
+                    copy {
+                        from "${projectDir}/tpl/module.prop.tpl"
+                        into templateRootPath
+                        rename "module.prop.tpl", "module.prop"
+                        expand(backend: "$backendCapped", versionName: "$version" +  "($backend)",
+                                versionCode: "$versionCode", authorList: "$authorList")
+                    }
+                    copy {
+                        from "${templateRootPath}/module.prop"
+                        into templateRootPath
+                        rename "module.prop", "riru_module.prop"
                     }
                 }
             }
@@ -95,7 +112,7 @@ afterEvaluate {
                 dependsOn zipTask
                 workingDir "${projectDir}/release"
                 def commands = ["adb", "push",
-                                "magisk-${module_name}-${backendLowered}-${project.version}-${variantLowered}.zip",
+                                "magisk-${module_name}-${backend}-${project.version}-${variantLowered}.zip",
                                 "/sdcard/"]
                 if (is_windows) {
                     commandLine 'cmd', '/c', commands.join(" ")

diff --git a/edxp-core/edconfig.tpl b/edxp-core/edconfig.tpl
diff --git a/edxp-core/jni/main/java_hook/java_hook.cpp b/edxp-core/jni/main/java_hook/java_hook.cpp
@@ -73,6 +73,19 @@ void setMethodNonCompilable(JNIEnv *env, jclass, jobject member) {
     setNonCompilable(artMethod);
 }
 
+static constexpr uint32_t kAccFinal = 0x0010;
+
+jboolean removeFinalFlag(JNIEnv *env, jclass, jclass clazz) {
+    if (clazz) {
+        jfieldID java_lang_Class_accessFlags = env->GetFieldID(
+                env->FindClass("java/lang/Class"), "accessFlags", "I");
+        jint access_flags = env->GetIntField(clazz, java_lang_Class_accessFlags);
+        env->SetIntField(clazz, java_lang_Class_accessFlags, access_flags & ~kAccFinal);
+        return true;
+    }
+    return false;
+}
+
 static JNINativeMethod hookMethods[] = {
         {
                 "init",
@@ -131,7 +144,7 @@ static JNINativeMethod hookMethods[] = {
                 "initXResourcesNative", "()Z", (void *) XposedBridge_initXResourcesNative
         },
         {
-                "rewriteXmlReferencesNative", "(JLandroid/content/res/XResources;Landroid/content/res/Resources;)V", (void *) XResources_rewriteXmlReferencesNative
+                "removeFinalFlagNative", "(Ljava/lang/Class;)Z", (void *) removeFinalFlag
         }
 };
 

diff --git a/edxp-core/jni/main/native_hook/native_hook.cpp b/edxp-core/jni/main/native_hook/native_hook.cpp
@@ -59,6 +59,13 @@ static bool onIsInSamePackageCalled(void *thiz, void *that) {
         || strstr(thatDesc, "com/elderdrivers/riru/") != nullptr) {
         return true;
     }
+    // for MIUI resources hooking
+    if (strstr(thisDesc, "android/content/res/MiuiTypedArray") != nullptr
+        || strstr(thatDesc, "android/content/res/MiuiTypedArray") != nullptr
+        || strstr(thisDesc, "android/content/res/XResources$XTypedArray") != nullptr
+        || strstr(thatDesc, "android/content/res/XResources$XTypedArray") != nullptr) {
+        return true;
+    }
     return (*isInSamePackageBackup)(thiz, that);
 }
 

diff --git a/edxp-core/jni/main/native_hook/resource_hook.cpp b/edxp-core/jni/main/native_hook/resource_hook.cpp
@@ -6,6 +6,7 @@
 #include <include/ByteOrder.h>
 #include <include/logging.h>
 #include <dlfcn.h>
+#include <java_hook/java_hook.h>
 #include "resource_hook.h"
 
 #define CLASS_XRESOURCES     "android/content/res/XResources"
@@ -44,7 +45,7 @@ bool prepareSymbols() {
 #if defined(__LP64__)
             "_ZNK7android12ResXMLParser18getAttributeNameIDEm"
 #else
-            "_ZNK7android12ResXMLParser18getAttributeNameIDEj"
+                                                                                       "_ZNK7android12ResXMLParser18getAttributeNameIDEj"
 #endif
     ));
     if (!ResXMLParser_getAttributeNameID) {
@@ -66,6 +67,15 @@ bool prepareSymbols() {
     return true;
 }
 
+int register_natives_XResources(JNIEnv *env, jclass clazz) {
+    const JNINativeMethod methods[] = {
+            {"rewriteXmlReferencesNative",
+                    "(JLandroid/content/res/XResources;Landroid/content/res/Resources;)V",
+                    (void *) XResources_rewriteXmlReferencesNative},
+    };
+    return env->RegisterNatives(clazz, methods, NELEM(methods));
+}
+
 jboolean XposedBridge_initXResourcesNative(JNIEnv *env, jclass) {
     classXResources = env->FindClass(CLASS_XRESOURCES);
     if (classXResources == NULL) {
@@ -75,6 +85,12 @@ jboolean XposedBridge_initXResourcesNative(JNIEnv *env, jclass) {
     }
     classXResources = reinterpret_cast<jclass>(env->NewGlobalRef(classXResources));
 
+    if (register_natives_XResources(env, classXResources) != JNI_OK) {
+        LOGE("Could not register natives for '%s'", CLASS_XRESOURCES);
+        env->ExceptionClear();
+        return false;
+    }
+
     methodXResourcesTranslateResId = env->GetStaticMethodID(classXResources, "translateResId",
                                                             "(ILandroid/content/res/XResources;Landroid/content/res/Resources;)I");
     if (methodXResourcesTranslateResId == NULL) {

diff --git a/edxp-core/template_override/common/util_functions.sh b/edxp-core/template_override/common/util_functions.sh
@@ -1,6 +1,6 @@
 #!/system/bin/sh
 
-EDXP_VERSION="0.4.0.1_beta-SNAPSHOT (4010)"
+EDXP_VERSION="0.4.1.2_beta (4120)"
 ANDROID_SDK=`getprop ro.build.version.sdk`
 BUILD_DESC=`getprop ro.build.description`
 PRODUCT=`getprop ro.build.product`

diff --git a/edxp-core/template_override/config.sh b/edxp-core/template_override/config.sh
@@ -41,7 +41,7 @@ LATESTARTSERVICE=false
 
 print_modname() {
   ui_print "************************************"
-  ui_print " Riru - Ed Xposed v0.4.0.1          "
+  ui_print " Riru - Ed Xposed                   "
   ui_print "************************************"
 }
 

diff --git a/edxp-core/template_override/riru_module.prop b/edxp-core/template_override/riru_module.prop
diff --git a/edxp-core/tpl/edconfig.tpl b/edxp-core/tpl/edconfig.tpl
@@ -0,0 +1,5 @@
+version=90.0-$version ($backend)
+arch=arm64
+minsdk=26
+maxsdk=28
+requires:fbe_aware=1
diff --git a/edxp-core/template_override/module.prop → edxp-core/tpl/module.prop.tpl b/edxp-core/template_override/module.prop → edxp-core/tpl/module.prop.tpl
@@ -1,7 +1,7 @@
 id=riru_edxposed
 name=Riru - Ed Xposed
-version=v0.4.0.1_beta-SNAPSHOT
-versionCode=4010
-author=solohsu & MlgmXyysd
+version=${versionName}
+versionCode=${versionCode}
+author=${authorList}
 description=Magisk version of Xposed. Require Riru - Core installed.
 minMagisk=17000
diff --git a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/Main.java b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/Main.java
@@ -1,19 +1,17 @@
 package com.elderdrivers.riru.edxp;
 
 import android.annotation.SuppressLint;
-import android.content.res.Resources;
-import android.content.res.XResources;
 import android.os.Build;
 import android.os.Process;
 
 import com.elderdrivers.riru.common.KeepAll;
-import com.elderdrivers.riru.edxp.sandhook.BuildConfig;
 import com.elderdrivers.riru.edxp.config.InstallerChooser;
-import com.elderdrivers.riru.edxp.util.Utils;
+import com.elderdrivers.riru.edxp.sandhook.BuildConfig;
 import com.elderdrivers.riru.edxp.sandhook.core.HookMethodResolver;
 import com.elderdrivers.riru.edxp.sandhook.entry.Router;
 import com.elderdrivers.riru.edxp.sandhook.proxy.BlackWhiteListProxy;
 import com.elderdrivers.riru.edxp.sandhook.proxy.NormalProxy;
+import com.elderdrivers.riru.edxp.util.Utils;
 import com.swift.sandhook.xposedcompat.XposedCompat;
 import com.swift.sandhook.xposedcompat.methodgen.SandHookXposedBridge;
 
@@ -152,5 +150,5 @@ public static void forkSystemServerPost(int pid) {
 
     public static native boolean initXResourcesNative();
 
-    public static native void rewriteXmlReferencesNative(long parserPtr, XResources origRes, Resources repRes);
+    public static native boolean removeFinalFlagNative(Class clazz);
 }
diff --git a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/config/SandHookProvider.java b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/config/SandHookProvider.java
@@ -1,7 +1,5 @@
 package com.elderdrivers.riru.edxp.sandhook.config;
 
-import android.content.res.Resources;
-import android.content.res.XResources;
 import android.util.Log;
 
 import com.elderdrivers.riru.edxp.Main;
@@ -67,7 +65,7 @@ public boolean initXResourcesNative() {
     }
 
     @Override
-    public void rewriteXmlReferencesNative(long parserPtr, XResources origRes, Resources repRes) {
-        Main.rewriteXmlReferencesNative(parserPtr, origRes, repRes);
+    public boolean removeFinalFlagNative(Class clazz) {
+        return Main.removeFinalFlagNative(clazz);
     }
 }
diff --git a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/Router.java b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/Router.java
@@ -14,7 +14,6 @@
 import com.elderdrivers.riru.edxp.sandhook.entry.bootstrap.WorkAroundHookInfo;
 import com.elderdrivers.riru.edxp.sandhook.entry.hooker.SystemMainHooker;
 import com.elderdrivers.riru.edxp.util.Utils;
-import com.swift.sandhook.SandHookConfig;
 import com.swift.sandhook.xposedcompat.XposedCompat;
 
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -32,10 +31,14 @@ public class Router {
 
     static boolean useSandHook = false;
 
+    public static void initResourcesHook() {
+        startWorkAroundHook(); // for OnePlus devices
+        XposedBridge.initXResources();
+    }
+
     public static void prepare(boolean isSystem) {
         // this flag is needed when loadModules
         startsSystemServer = isSystem;
-//        InstallerChooser.setup();
     }
 
     public static void checkHookState(String appDataDir) {
@@ -124,8 +127,15 @@ public static void startWorkAroundHook() {
         }
     }
 
-    public static void onEnterChildProcess() {
+    public static void onForkStart() {
+        forkCompleted = false;
+    }
+
+    public static void onForkFinish() {
         forkCompleted = true;
+    }
+
+    public static void onEnterChildProcess() {
         DynamicBridge.onForkPost();
         //enable compile in child process
         //SandHook.enableCompiler(!XposedInit.startsSystemServer);
@@ -144,5 +154,6 @@ public static void logE(String prefix, Throwable throwable) {
     public static void injectConfig() {
         EdXpConfigGlobal.sConfig = new SandHookEdxpConfig();
         EdXpConfigGlobal.sHookProvider = new SandHookProvider();
+        XposedBridge.log("using HookProvider: " + EdXpConfigGlobal.sHookProvider.getClass().getName());
     }
 }