From 760f0bb0eb280f62073042a4d299a8517449baf3 Mon Sep 17 00:00:00 2001
From: Howard Wu <40033067+Howard20181@users.noreply.github.com>
Date: Mon, 6 Feb 2023 00:19:55 +0800
Subject: [PATCH] All flavors require Magisk 24.0+ (#2368)

Magisk 23 is missing some SELinux policies

This fixes a permissions issue with the Dex2Oat wrapper

```
02-04 23:45:00.212  4396  4396 E LSPosedDex2Oat: failed to connect to /dev/c951326ba095346b/dex2oat.sock failed with 13: Permission denied
02-04 23:45:00.209  4396  4396 W dex2oat64: type=1400 audit(0.0:8403): avc: denied { write } for name="dex2oat.sock" dev="tmpfs" ino=26722 scontext=u:r:installd:s0 tcontext=u:object_r:magisk_file:s0 tclass=sock_file permissive=0
02-04 23:45:00.213  1510  3805 V installd: DexInv: --- END '/data/app/~~M2S57MD185N1tyyKQy9PKw==/com.google.android.gm-7Q68xrTQSACXisBuDI6oBg==/base.apk' --- status=0x 100, process failed
02-04 23:45:00.213  1510  3805 E installd: Dex2oat invocation for /data/app/~~M2S57MD185N1tyyKQy9PKw==/com.google.android.gm-7Q68xrTQSACXisBuDI6oBg==/base.apk failed: unspecified dex2oat error (256)
```

Additional rules first appeared in Magisk version 24000
https://github.com/topjohnwu/Magisk/commit/2c44e1bb934768ad36e00d1200f8d52d6aa43089
---
 README.md                                     |  2 +-
 gradle.properties                             |  2 +-
 magisk-loader/magisk_module/util_functions.sh | 14 +++-----------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 1257c252..3eac0457 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Android 8.1 ~ 13
 
 ## Install
 
-1. Install Magisk v23+ (Riru) / v24+ (Zygisk)
+1. Install Magisk v24+
 2. (For Riru flavor) Install [Riru](https://github.com/RikkaApps/Riru/releases) v25+ from Magisk repo
 3. [Download](#download) and install LSPosed in Magisk app
 4. Reboot
diff --git a/gradle.properties b/gradle.properties
index b25ead97..0dfa0785 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,6 +18,6 @@ android.nonTransitiveRClass=true
 android.enableR8.fullMode=true
 android.useAndroidX=true
 
-agpVersion=7.4.0
+agpVersion=7.4.1
 navVersion=2.5.3
 kotlinVersion=1.8.0
diff --git a/magisk-loader/magisk_module/util_functions.sh b/magisk-loader/magisk_module/util_functions.sh
index 220bf281..7ab25f63 100644
--- a/magisk-loader/magisk_module/util_functions.sh
+++ b/magisk-loader/magisk_module/util_functions.sh
@@ -20,15 +20,7 @@
 
 check_magisk_version() {
   ui_print "- Magisk version: $MAGISK_VER_CODE"
-  if [ "$FLAVOR" == "riru" ]; then
-    if [ "$MAGISK_VER_CODE" -lt 23000 ]; then
-      ui_print "*********************************************************"
-      ui_print "! Please install Magisk v23+"
-      ui_print "! If you already have Magisk v23+ installed, "
-      ui_print "! Re-install Magisk from Magisk app"
-      abort    "*********************************************************"
-    fi
-  elif [ "$FLAVOR" == "zygisk" ]; then
+  if [ "$FLAVOR" == "riru" ] || [ "$FLAVOR" == "zygisk" ]; then
     if [ "$MAGISK_VER_CODE" -lt 24000 ]; then
       ui_print "*********************************************************"
       ui_print "! Please install Magisk v24+"
@@ -44,8 +36,8 @@ check_magisk_version() {
 require_new_android() {
   ui_print "*********************************************************"
   ui_print "! Unsupported Android version ${1} (below Oreo MR1)"
-  ui_print "! Learn more from our GitHub Wiki"
-  [ "$BOOTMODE" == "true" ] && am start -a android.intent.action.VIEW -d https://github.com/LSPosed/LSPosed/wiki/Available-Android-versions
+  ui_print "! Learn more from our GitHub"
+  [ "$BOOTMODE" == "true" ] && am start -a android.intent.action.VIEW -d https://github.com/LSPosed/LSPosed/#supported-versions
   abort    "*********************************************************"
 }