Merge pull request #1 from MlgmXyysd/master

Fix samsung service crash

Author: TimothyZhang023

LICENSE

@@ -1,24 +1,20 @@
-# Riru - Template
+# Riru - MiPushFake
 
-[Riru](https://github.com/RikkaApps/Riru) module template.
+![License GPL-3.0](https://img.shields.io/badge/license-GPLv3.0-green.svg)
 
-## Build
+Fake as a Xiaomi device by hook system_property_get.
 
-1. Replace all "template" to your name
-   
-   * `module/build.gradle`: "template" in variable `moduleId`, `moduleProp`
-   * `module/src/main/cpp/CMakeLists.txt`: "riru_template" in `set(MODULE_NAME )`
-   * `template/magisk_module/post-fs-data.sh`: `MODULE_ID="template"`
-   * `template/magisk_module/uninstall.sh`: `MODULE_ID="template"`
+Requires Riru - Core v19 or above installed.
 
-2. Write you codes
-3. Run gradle task `:module:assembleRelease` task from Android Studio or command line, zip will be saved in `out`.
+## What does this module do	
 
-## Notes
+By default, `__system_property_get` (`android::base::GetProperty` on Pie+) will be hooked in packages selected in	
+MiPushFramework with value map below	
 
-* DO NOT overwrite `android.os.SystemProperties#native_set` in core, or your data may be wiped
-  ([Detail info](https://github.com/RikkaApps/Riru/blob/v7/riru-core/jni/main/jni_native_method.cpp#L162-L176))
-  (If you really need to hook this, remember to clear exception)
-* DO NO print log (`__android_log_print`) in `nativeForkAndSpecialize(Pre/Post)` `nativeForkSystemServer(Pre/Post)` when in zygote process, or it may cause zygote not work
-  (magic not confirmed, [Detail info](https://github.com/RikkaApps/Riru/blob/77adfd6a4a6a81bfd20569c910bc4854f2f84f5e/riru-core/jni/main/jni_native_method.cpp#L55-L66))
-* Add `-ffixed-x18` to both compiler and linker parameter, or it will cause problems on Android Q (see template)
+* `ro.miui.ui.version.name` -> `V11`	
+* `ro.miui.ui.version.code` -> `9`	
+* `ro.miui.version.code_time` -> `1570636800`	
+* `ro.miui.internal.storage` -> `/sdcard/`	
+* `ro.product.manufacturer` -> `Xiaomi`	
+* `ro.product.brand` -> `Xiaomi`	
+* `ro.product.name` -> `Xiaomi`	

README.md

@@ -1,21 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -125,8 +109,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -154,19 +138,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=`expr $i + 1`
+        i=$((i+1))
     done
     case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,9 +159,14 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=`save "$@"`
+APP_ARGS=$(save "$@")
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "$@"

gradlew

@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -30,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradlew.bat

@@ -0,0 +1,22 @@
+ext {
+    moduleId = "mipush_fake"
+    riruApiVersion = 4
+
+    moduleProp = [
+            name       : "Riru - MiPushFake",
+            version    : "v13.0",
+            versionCode: "13",
+            author     : "Timothy, MlgmXyysd",
+            description: "Fake as a Xiaomi device by hook system_property_get. Requires Riru - Core v19 or above installed.",
+            api        : riruApiVersion
+    ]
+
+    magiskModuleProp = [
+            id         : "riru-${moduleId.replace('_', '-')}",
+            name       : "Riru - ${moduleProp['name']}",
+            version    : moduleProp['version'],
+            versionCode: moduleProp['versionCode'],
+            author     : moduleProp['author'],
+            description: moduleProp['description']
+    ]
+}

module.gradle

@@ -1,10 +1,16 @@
 apply plugin: 'com.android.library'
+apply from: file(rootProject.file('module.gradle'))
 
 android {
     compileSdkVersion rootProject.ext.targetSdkVersion
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
+        externalNativeBuild {
+            cmake {
+                arguments "-DMODULE_NAME:STRING=riru_$moduleId"
+            }
+        }
     }
     externalNativeBuild {
         cmake {
@@ -14,29 +20,10 @@ android {
     }
 }
 
-def moduleId = "mipush_fake"
-def moduleProp = [
-        name       : "MiPushFake",
-        version    : "v12.0",
-        versionCode: "12",
-        author     : "Timothy",
-        description: "Fake as XiaoMI device by hook system_property_get. Require Riru-Core installed..",
-        api        : 4
-]
-
-def magiskModuleProp = [
-        id         : "riru-${moduleId.replace('_', '-')}",
-        name       : "Riru - ${moduleProp['name']}",
-        version    : moduleProp['version'],
-        versionCode: moduleProp['versionCode'],
-        author     : moduleProp['author'],
-        description: moduleProp['description']
-]
-
 def outDir = file("$rootDir/out")
 def magiskDir = file("$outDir/magisk_module")
-def zipName = "magisk-${magiskModuleProp['id']}-${magiskModuleProp['version']}.zip"
-def riruDir = "$magiskDir/data/misc/riru/modules/${moduleId}"
+def zipName = "magisk-${magiskModuleProp['id'].replace('_', '-')}-${magiskModuleProp['version']}.zip"
+def riruDir = "$magiskDir/riru"
 
 import java.nio.file.Files
 import java.security.MessageDigest
@@ -55,6 +42,8 @@ static def renameOrFail(File from, File to) {
     }
 }
 
+import org.apache.tools.ant.filters.FixCrLfFilter
+
 android.libraryVariants.all { variant ->
     def task = variant.assembleProvider.get()
     task.doLast {
@@ -65,6 +54,19 @@ android.libraryVariants.all { variant ->
         copy {
             from "$rootDir/template/magisk_module"
             into magiskDir.path
+            exclude 'riru.sh'
+        }
+        // copy riru.sh
+        copy {
+            from "$rootDir/template/magisk_module"
+            into magiskDir.path
+            include 'riru.sh'
+            filter { line ->
+                line.replaceAll('%%%RIRU_MODULE_ID%%%', moduleId)
+                        .replaceAll('%%%RIRU_MIN_API_VERSION%%%', riruApiVersion.toString())
+            }
+            filter(FixCrLfFilter.class,
+                    eol: FixCrLfFilter.CrLf.newInstance("lf"))
         }
         // copy .git files manually since gradle exclude it by default
         Files.copy(file("$rootDir/template/magisk_module/.gitattributes").toPath(), file("${magiskDir.path}/.gitattributes").toPath())

module/build.gradle

@@ -1 +1 @@
-<manifest package="riru.template" />
+<manifest package="top.trumeet.mipushframework" />

module/src/main/AndroidManifest.xml

@@ -35,13 +35,13 @@ NEW_FUNC_DEF(int, __system_property_get, const char *key, char *value) {
     int res = old___system_property_get(key, value);
     if (key) {
         if (strcmp("ro.miui.ui.version.name", key) == 0) {
-            strcpy(value, "V9");
+            strcpy(value, "V11");
             //LOGI("system_property_get: %s -> %s", key, value);
         } else if (strcmp("ro.miui.ui.version.code", key) == 0) {
-            strcpy(value, "7");
+            strcpy(value, "9");
             //LOGI("system_property_get: %s -> %s", key, value);
         } else if (strcmp("ro.miui.version.code_time", key) == 0) {
-            strcpy(value, "1527550858");
+            strcpy(value, "1570636800");
             //LOGI("system_property_get: %s -> %s", key, value);
         } else if (strcmp("ro.miui.internal.storage", key) == 0) {
             strcpy(value, "/sdcard/");
@@ -65,13 +65,13 @@ NEW_FUNC_DEF(std::string, _ZN7android4base11GetPropertyERKNSt3__112basic_stringI
     std::string res = old__ZN7android4base11GetPropertyERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEES9_(key, default_value);
 
     if (strcmp("ro.miui.ui.version.name", key.c_str()) == 0) {
-        res = "V9";
+        res = "V11";
         //LOGI("android::base::GetProperty: %s -> %s", key.c_str(), res.c_str());
     } else if (strcmp("ro.miui.ui.version.code", key.c_str()) == 0) {
-        res = "7";
+        res = "9";
         //LOGI("android::base::GetProperty: %s -> %s", key.c_str(), res.c_str());
     } else if (strcmp("ro.miui.version.code_time", key.c_str()) == 0) {
-        res = "1527550858";
+        res = "1570636800";
         //LOGI("android::base::GetProperty: %s -> %s", key.c_str(), res.c_str());
     } else if (strcmp("ro.miui.internal.storage", key.c_str()) == 0) {
         res = "/sdcard/";

module/src/main/cpp/hook.cpp

@@ -7,20 +7,44 @@
 #include "logging.h"
 #include "hook.h"
 
-#define CONFIG_PATH "/data/misc/riru/modules/mipush_fake"
-
-#define FAKE_CONFIGURATION_GLOBAL "/data/misc/riru/modules/mipush_fake/packages/ALL"
+#if PLATFORM_SDK_VERSION >= 24
+#define CONFIG_PATH "/data/user_de/0/top.trumeet.mipush"
+#else
+#define CONFIG_PATH "/data/data/top.trumeet.mipush"
+#endif
 
 // You can remove functions you don't need
 static char package_name[256];
 static bool enable_hook;
 static int uid;
 
-static std::vector<std::string> globalPkgBlackList = {"com.google.android",
-                                             "de.robv.android.xposed.installer",
-                                             "com.xiaomi.xmsf",
-                                             "com.tencent.mm",
-                                             "top.trumeet.mipush"};
+static std::vector<std::string> globalPkgBlackList = {"com.xiaomi.xmsf",
+                                                      "top.trumeet.mipush",
+                                                      // Android
+                                                      "com.google.android",
+                                                      "android",
+                                                      "com.android",
+                                                      // Samsung
+                                                      "com.bst",
+                                                      "com.sec",
+                                                      "com.sem",
+                                                      "com.sgmc",
+                                                      "com.dsi.ant",
+                                                      "com.wsomacp",
+                                                      "com.samsung",
+                                                      "com.diotek.sec",
+                                                      "com.enhance.gameservice",
+                                                      // XDA
+                                                      "com.xda",
+                                                      // Wechat
+                                                      "com.tencent.mm",
+                                                      // Quickpay
+                                                      "com.example",
+                                                      // Magisk
+                                                      "com.topjohnwu.magisk",
+                                                      // Xposed
+                                                      "org.meowcat.edxposed.manager",
+                                                      "de.robv.android.xposed.installer"};
 
 
 bool isAppNeedHook(JNIEnv *pEnv, jstring pJstring);
@@ -173,7 +197,7 @@ bool isAppNeedHook(JNIEnv *env, jstring jAppDataDir) {
         }
     }
 
-    if (access(FAKE_CONFIGURATION_GLOBAL, F_OK) == 0) {
+    if (access(CONFIG_PATH "/packages/ALL", F_OK) == 0) {
         return true;
     }
 

module/src/main/cpp/main.cpp

@@ -3,7 +3,7 @@ META-INF/** text eol=lf
 *.prop text eol=lf
 *.sh text eol=lf
 *.md text eol=lf
-sepolicy.rule eol=lf
+sepolicy.rule text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
 system/** binary