From edf41b715f5fe65c89bace9f33d8c98a5cafe80f Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Thu, 11 Mar 2021 19:23:01 +0800
Subject: [PATCH] [core] Fix riru version check

---
 core/build.gradle.kts                    | 9 ++++-----
 core/template_override/util_functions.sh | 4 ++--
 core/tpl/module.prop.tpl                 | 4 +---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 1a5b406b..ffa53506 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -162,9 +162,7 @@ afterEvaluate {
                     expand("moduleId" to moduleId,
                             "versionName" to verName,
                             "versionCode" to verCode,
-                            "authorList" to authors,
-                            "apiCode" to apiCode,
-                            "minApi" to "$moduleMinRiruApiVersion")
+                            "authorList" to authors)
                     filter(mapOf("eol" to FixCrLfFilter.CrLf.newInstance("lf")), FixCrLfFilter::class.java)
                 }
                 copy {
@@ -195,8 +193,9 @@ afterEvaluate {
                     include("util_functions.sh")
                     filter { line ->
                         line.replace("%%%RIRU_MODULE_ID%%%", riruModuleId)
-                                .replace("%%%RIRU_MIN_API_VERSION%%%", moduleMinRiruApiVersion.toString())
-                                .replace("%%%RIRU_MIN_VERSION_NAME%%%", moduleMinRiruVersionName)
+                            .replace("%%%RIRU_MODULE_API_VERSION%%%", moduleMaxRiruApiVersion.toString())
+                            .replace("%%%RIRU_MODULE_MIN_API_VERSION%%%", moduleMinRiruApiVersion.toString())
+                            .replace("%%%RIRU_MODULE_MIN_RIRU_VERSION_NAME%%%", moduleMinRiruVersionName)
                     }
                     filter(mapOf("eol" to FixCrLfFilter.CrLf.newInstance("lf")), FixCrLfFilter::class.java)
                 }
diff --git a/core/template_override/util_functions.sh b/core/template_override/util_functions.sh
index 8cb4ad9b..73404f80 100644
--- a/core/template_override/util_functions.sh
+++ b/core/template_override/util_functions.sh
@@ -27,13 +27,13 @@ RIRU_MODULE_MIN_RIRU_VERSION_NAME="%%%RIRU_MODULE_MIN_RIRU_VERSION_NAME%%%"
 check_riru_version() {
   RIRU_CORE_MODULES_PATH=/data/adb/modules/riru-core
   RIRU_CORE_MODULES_UPDATE_PATH=/data/adb/modules_update/riru-core
-  if [ ! -f "$RIRU_CORE_MODULES_UPDATE_PATH/api_version" ] && [ ! -f "$RIRU_CORE_MODULES_PATH/api_version" ] && [ ! -f "/data/adb/riru/api_version" ] && [ ! -f "/data/adb/riru/api_version.new" ]; then
+  if [ ! -f "$RIRU_CORE_MODULES_UPDATE_PATH/api_version" ] && [ ! -f "$RIRU_CORE_MODULES_PATH/api_version" ]; then
     ui_print "*********************************************************"
     ui_print "! Riru $RIRU_MODULE_MIN_RIRU_VERSION_NAME or above is required"
     ui_print "! Please install Riru from Magisk Manager or https://github.com/RikkaApps/Riru/releases"
     abort "*********************************************************"
   fi
-  RIRU_API=$(cat "$RIRU_CORE_MODULES_UPDATE_PATH/api_version") || RIRU_API=$(cat "$RIRU_CORE_MODULES_PATH/api_version") || RIRU_API=$(cat "/data/adb/riru/api_version.new") || RIRU_API=$(cat "/data/adb/riru/api_version") || RIRU_API=0
+  RIRU_API=$(cat "$RIRU_CORE_MODULES_UPDATE_PATH/api_version") || RIRU_API=$(cat "$RIRU_CORE_MODULES_PATH/api_version") || RIRU_API=0
   [ "$RIRU_API" -eq "$RIRU_API" ] || RIRU_API=0
   ui_print "- Riru API version: $RIRU_API"
   if [ "$RIRU_API" -lt $RIRU_MODULE_MIN_API_VERSION ]; then
diff --git a/core/tpl/module.prop.tpl b/core/tpl/module.prop.tpl
index 496de1db..2bfecab4 100644
--- a/core/tpl/module.prop.tpl
+++ b/core/tpl/module.prop.tpl
@@ -3,6 +3,4 @@ name=Riru - LSPosed
 version=${versionName}
 versionCode=${versionCode}
 author=${authorList}
-api=${apiCode}
-description=Another enhanced implementation of Xposed Framework. Supports Android 8.1 ~ 12 DP1. Requires Riru v23 or above installed.
-minApi=${minApi}
\ No newline at end of file
+description=Another enhanced implementation of Xposed Framework. Supports Android 8.1 ~ 12 DP1. Requires Riru v23 or above installed.
\ No newline at end of file