From a05f0ff4a9d6b94d6744e8f9a7f539c8b1b6ed36 Mon Sep 17 00:00:00 2001 From: Levi Buzolic Date: Thu, 4 Apr 2024 16:23:18 +1100 Subject: [PATCH 1/2] Remove `package` name from AndroidManfiest.xml to support AGP 8 Remove the `package` manifest key to support AGP 8+ This means the library will now only support AGP 7+ --- android/build.gradle | 6 +----- android/src/main/AndroidManifest.xml | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 9fa551c..71c7519 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,14 +5,10 @@ def safeExtGet(prop, fallback) { apply plugin: 'com.android.library' android { + namespace 'com.gantix.JailMonkey' compileSdkVersion safeExtGet('compileSdkVersion', 31) buildToolsVersion safeExtGet('buildToolsVersion', "31.0.0") - def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger() - if (agpVersion >= 7) { - namespace 'com.gantix.JailMonkey' - } - defaultConfig { minSdkVersion safeExtGet('minSdkVersion', 21) targetSdkVersion safeExtGet('targetSdkVersion', 31) diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 73f0aea..a2f47b6 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + From 7025fcbc4f94f727ad622c9b2b425715827d2b99 Mon Sep 17 00:00:00 2001 From: Levi Buzolic Date: Thu, 4 Apr 2024 16:38:06 +1100 Subject: [PATCH 2/2] Fix syntax in HookDetectionCheck.java --- .../JailMonkey/HookDetection/HookDetectionCheck.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/android/src/main/java/com/gantix/JailMonkey/HookDetection/HookDetectionCheck.java b/android/src/main/java/com/gantix/JailMonkey/HookDetection/HookDetectionCheck.java index 0655b4a..c59ada1 100644 --- a/android/src/main/java/com/gantix/JailMonkey/HookDetection/HookDetectionCheck.java +++ b/android/src/main/java/com/gantix/JailMonkey/HookDetection/HookDetectionCheck.java @@ -20,9 +20,9 @@ public static boolean hookDetected(Context context) { PackageManager packageManager = context.getPackageManager(); List applicationInfoList = packageManager.getInstalledApplications(PackageManager.GET_META_DATA); String[] dangerousPackages = { - "de.robv.android.xposed.installer", - "com.saurik.substrate", - "de.robv.android.xposed" + "de.robv.android.xposed.installer", + "com.saurik.substrate", + "de.robv.android.xposed", "com.noshufou.android.su.elite", "eu.chainfire.supersu", "com.koushikdutta.superuser", @@ -45,7 +45,7 @@ public static boolean hookDetected(Context context) { "eu.chainfire.supersu.pro", "com.kingouser.com", "com.topjohnwu.magisk" - }; + }; if (applicationInfoList != null) { for (ApplicationInfo applicationInfo : applicationInfoList) {