diff --git a/.gitmodules b/.gitmodules index 4b52baa..e8fcb19 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,8 @@ -[submodule "mmp"] - path = mmp - url = https://github.com/327135569/LSPosed.git - branch = lspatch [submodule "apksigner"] path = apksigner url = https://android.googlesource.com/platform/tools/apksig.git branch = android10-release +[submodule "core"] + path = core + url = https://github.com/LSPosed/LSPosed.git + branch = lspatch diff --git a/app/src/main/java/org/lsposed/lspatch/tester/MainActivity.java b/app/src/main/java/org/lsposed/lspatch/tester/MainActivity.java index 861c9d0..ea75e87 100644 --- a/app/src/main/java/org/lsposed/lspatch/tester/MainActivity.java +++ b/app/src/main/java/org/lsposed/lspatch/tester/MainActivity.java @@ -26,6 +26,12 @@ public class MainActivity extends Activity { param.setResult(true); } }); + XposedHelpers.findAndHookMethod(this.getClass(), "checkXposed2", new XC_MethodHook() { + @Override + protected void beforeHookedMethod(MethodHookParam param) throws Throwable { + param.setResult(true); + } + }); TextView textView = findViewById(R.id.msg); if (checkXposed() && checkXposed2()) { @@ -43,7 +49,7 @@ public class MainActivity extends Activity { return false; } - public boolean checkXposed2() { + public static boolean checkXposed2() { return false; } } diff --git a/core b/core new file mode 160000 index 0000000..90b37a6 --- /dev/null +++ b/core @@ -0,0 +1 @@ +Subproject commit 90b37a68aa32e79ea2dc58048f7657ba66abed89 diff --git a/mmp b/mmp deleted file mode 160000 index f52b623..0000000 --- a/mmp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f52b62307bcf5f08a483a3c28f630e036bd8355d diff --git a/settings.gradle b/settings.gradle index 5e96534..bf820ec 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,15 +1,15 @@ include ':app' rootProject.name='LSPatch' include ':lspcore' -project(':lspcore').projectDir = new File('mmp/core') +project(':lspcore').projectDir = new File('core/core') include ':hiddenapi-stubs' -project(':hiddenapi-stubs').projectDir = new File('mmp/hiddenapi-stubs') +project(':hiddenapi-stubs').projectDir = new File('core/hiddenapi-stubs') include ':interface' -project(':interface').projectDir = new File('mmp/service/interface') +project(':interface').projectDir = new File('core/service/interface') include ':hiddenapi-bridge' -project(':hiddenapi-bridge').projectDir = new File('mmp/hiddenapi-bridge') +project(':hiddenapi-bridge').projectDir = new File('core/hiddenapi-bridge') include ':manager-service' -project(':manager-service').projectDir = new File('mmp/manager-service') +project(':manager-service').projectDir = new File('core/manager-service') include ':patch' include ':axmlprinter' include ':share'