初次提交

Author: matsuzaka-yuki

README.md

@@ -1,88 +1,43 @@
 <div align="center">
-<a href="https://github.com/bmax121/APatch/releases/latest"><img src="https://images.weserv.nl/?url=https://raw.githubusercontent.com/bmax121/APatch/main/app/src/main/ic_launcher-playstore.png&mask=circle" style="width: 128px;" alt="logo"></a>
+<a href="https://github.com/matsuzaka-yuki/APatch-Ultra/releases/latest"><img src="logo.png" style="width: 128px;" alt="logo"></a>
 
-<h1 align="center">APatch</h1>
+<h1 align="center">APatch Ultra</h1>
 
-[![Latest Release](https://img.shields.io/github/v/release/bmax121/APatch?label=Release&logo=github)](https://github.com/bmax121/APatch/releases/latest)
-[![Nightly Release](https://img.shields.io/badge/Nightly%20release-gray?logo=hackthebox&logoColor=fff)](https://nightly.link/bmax121/APatch/workflows/build/main/APatch)
-[![Weblate](https://img.shields.io/badge/Localization-Weblate-teal?logo=weblate)](https://hosted.weblate.org/engage/APatch)
-[![Channel](https://img.shields.io/badge/Follow-Telegram-blue.svg?logo=telegram)](https://t.me/APatchGroup)
+[![Latest Release](https://img.shields.io/github/v/release/matsuzaka-yuki/APatch-Ultra?label=Release&logo=github)](https://github.com/matsuzaka-yuki/APatch-Ultra/releases/latest)
+[![Channel](https://img.shields.io/badge/Follow-Telegram-blue.svg?logo=telegram)](https://t.me/APatchUltra)
 [![GitHub License](https://img.shields.io/github/license/bmax121/APatch?logo=gnu)](/LICENSE)
 
 </div>
 
-The patching of Android kernel and Android system.
+**语言 / Language:** [中文](README.md) | [English](README_EN.md)
 
-- A new kernel-based root solution for Android devices.
-- APM: Support for modules similar to Magisk.
-- KPM: Support for modules that allow you to inject any code into the kernel (Provides kernel function `inline-hook` and `syscall-table-hook`).
-- APatch relies on [KernelPatch](https://github.com/bmax121/KernelPatch/).
-- The APatch UI and the APModule source code have been derived and modified from [KernelSU](https://github.com/tiann/KernelSU).
+**APatch Ultra** 是基于 [APatch](https://github.com/bmax121/APatch) 开发的增强版本，提供了更强大的功能和更好的用户体验。
 
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-     alt="Get it on F-Droid"
-     height="80">](https://f-droid.org/packages/me.bmax.apatch/)
+## 主要特性
 
-Or download the latest APK from the [Releases Section](https://github.com/bmax121/APatch/releases/latest).
+- 基于内核的Android设备Root解决方案
+- APM：支持类似Magisk的模块系统
+- KPM：支持将任何代码注入内核的模块（提供内核函数`inline-hook`和`syscall-table-hook`）
+- 移除了自动更新功能，提供更稳定的用户体验
+- 更好的自定义系统,支持自定义壁纸
 
-## Supported Versions
+## 下载安装
 
-- Only supports the ARM64 architecture.
-- Only supports Android kernel versions 3.18 - 6.12
+从 [发布页面](https://github.com/matsuzaka-yuki/APatch-Ultra/releases/latest) 下载最新的APK。
 
-Support for Samsung devices with security protection: Planned
+## 系统要求
 
-## Requirement
+- 支持ARM64架构
+- 支持Android内核版本 3.18 - 6.6
 
-Kernel configs:
+## 开源信息
 
-- `CONFIG_KALLSYMS=y` and `CONFIG_KALLSYMS_ALL=y`
+本项目基于以下开源项目：
 
-- `CONFIG_KALLSYMS=y` and `CONFIG_KALLSYMS_ALL=n`: Initial support
+- [KernelPatch](https://github.com/bmax121/KernelPatch/) - 核心组件
+- [Magisk](https://github.com/topjohnwu/Magisk) - magiskboot和magiskpolicy
+- [KernelSU](https://github.com/tiann/KernelSU) - 应用UI和类似Magisk的模块支持
 
-## Security Alert
+## 许可证
 
-The **SuperKey** has higher privileges than root access.  
-Weak or compromised keys can lead to unauthorized control of your device.  
-It is critical to use robust keys and safeguard them from exposure to maintain the security of your device.
-
-## Translation
-
-To help translate APatch or improve existing translations, please use [Weblate](https://hosted.weblate.org/engage/apatch/). PR of APatch translation is no longer accepted, because it will conflict with Weblate.
-
-<div align="center">
-
-[![Translation Status](https://hosted.weblate.org/widget/APatch/open-graph.png)](https://hosted.weblate.org/engage/APatch/)
-
-</div>
-
-## Get Help
-
-### Usage
-
-For usage, please refer to [our official documentation](https://apatch.dev).  
-It's worth noting that the documentation is currently not quite complete, and the content may change at any time.  
-Furthermore, we need more volunteers to [contribute to the documentation](https://github.com/AndroidPatch/APatchDocs) in other languages.
-
-### Updates
-
-- Telegram Channel: [@APatchUpdates](https://t.me/APatchChannel)
-
-### Discussions
-
-- Telegram Group: [@APatchDiscussions(EN/CN)](https://t.me/Apatch_discuss)
-- Telegram Group: [中文](https://t.me/APatch_CN_Group)
-
-### More Information
-
-- [Documents](docs/)
-
-## Credits
-
-- [KernelPatch](https://github.com/bmax121/KernelPatch/): The core.
-- [Magisk](https://github.com/topjohnwu/Magisk): magiskboot and magiskpolicy.
-- [KernelSU](https://github.com/tiann/KernelSU): App UI, and Magisk module like support.
-
-## License
-
-APatch is licensed under the GNU General Public License v3 [GPL-3](http://www.gnu.org/copyleft/gpl.html).
+APatch Ultra 遵循 GNU General Public License v3 [GPL-3](http://www.gnu.org/copyleft/gpl.html) 许可证开源。

README_EN.md

@@ -0,0 +1,43 @@
+<div align="center">
+<a href="https://github.com/matsuzaka-yuki/APatch-Ultra/releases/latest"><img src="logo.png" style="width: 128px;" alt="logo"></a>
+
+<h1 align="center">APatch Ultra</h1>
+
+[![Latest Release](https://img.shields.io/github/v/release/matsuzaka-yuki/APatch-Ultra?label=Release&logo=github)](https://github.com/matsuzaka-yuki/APatch-Ultra/releases/latest)
+[![Channel](https://img.shields.io/badge/Follow-Telegram-blue.svg?logo=telegram)](https://t.me/APatchUltra)
+[![GitHub License](https://img.shields.io/github/license/matsuzaka-yuki/APatch-Ultra?logo=gnu)](/LICENSE)
+
+</div>
+
+**Language / 语言:** [English](README_EN.md) | [中文](README.md)
+
+**APatch Ultra** is an enhanced version based on [APatch](https://github.com/bmax121/APatch), providing more powerful features and a better user experience.
+
+## Key Features
+
+- A kernel-based root solution for Android devices
+- APM: Support for modules similar to Magisk
+- KPM: Support for modules that allow you to inject any code into the kernel (Provides kernel function `inline-hook` and `syscall-table-hook`)
+- Removed auto-update functionality for a more stable user experience
+- Better custom system support, including custom wallpapers
+
+## Download & Install
+
+Download the latest APK from the [Releases Section](https://github.com/matsuzaka-yuki/APatch-Ultra/releases/latest).
+
+## System Requirements
+
+- Supports the ARM64 architecture
+- Supports Android kernel versions 3.18 - 6.6
+
+## Open Source Credits
+
+This project is based on the following open source projects:
+
+- [KernelPatch](https://github.com/bmax121/KernelPatch/) - The core
+- [Magisk](https://github.com/topjohnwu/Magisk) - magiskboot and magiskpolicy
+- [KernelSU](https://github.com/tiann/KernelSU) - App UI, and Magisk module like support
+
+## License
+
+APatch Ultra is licensed under the GNU General Public License v3 [GPL-3](http://www.gnu.org/copyleft/gpl.html).

apatch_log.txt

@@ -15,7 +15,7 @@ fn get_git_version() -> Result<(u32, String), std::io::Error> {
         .trim()
         .parse()
         .map_err(|_| std::io::Error::new(std::io::ErrorKind::Other, "Failed to parse git count"))?;
-    let version_code = 10000 + 200 + version_code; // For historical reasons
+    let version_code = std::cmp::max(10000 + 200 + version_code, 10762); // For historical reasons and ensure minimum version
 
     let version_name = String::from_utf8(
         Command::new("git")

apd/build.rs

@@ -19,7 +19,7 @@ fn parse_single_word(input: &str) -> IResult<&str, &str> {
     take_while1(is_sepolicy_char).parse(input)
 }
 
-fn parse_bracket_objs(input: &str) -> IResult<&str, SeObject> {
+fn parse_bracket_objs(input: &str) -> IResult<&str, SeObject<'_>> {
     let (input, (_, words, _)) = (
         tag("{"),
         take_while_m_n(1, 100, |c: char| is_sepolicy_char(c) || c.is_whitespace()),
@@ -29,25 +29,25 @@ fn parse_bracket_objs(input: &str) -> IResult<&str, SeObject> {
     Ok((input, words.split_whitespace().collect()))
 }
 
-fn parse_single_obj(input: &str) -> IResult<&str, SeObject> {
+fn parse_single_obj(input: &str) -> IResult<&str, SeObject<'_>> {
     let (input, word) = take_while1(is_sepolicy_char).parse(input)?;
     Ok((input, vec![word]))
 }
 
-fn parse_star(input: &str) -> IResult<&str, SeObject> {
+fn parse_star(input: &str) -> IResult<&str, SeObject<'_>> {
     let (input, _) = tag("*").parse(input)?;
     Ok((input, vec!["*"]))
 }
 
 // 1. a single sepolicy word
 // 2. { obj1 obj2 obj3 ...}
 // 3. *
-fn parse_seobj(input: &str) -> IResult<&str, SeObject> {
+fn parse_seobj(input: &str) -> IResult<&str, SeObject<'_>> {
     let (input, strs) = alt((parse_single_obj, parse_bracket_objs, parse_star)).parse(input)?;
     Ok((input, strs))
 }
 
-fn parse_seobj_no_star(input: &str) -> IResult<&str, SeObject> {
+fn parse_seobj_no_star(input: &str) -> IResult<&str, SeObject<'_>> {
     let (input, strs) = alt((parse_single_obj, parse_bracket_objs)).parse(input)?;
     Ok((input, strs))
 }
@@ -379,7 +379,7 @@ const CMD_GENFSCON: u32 = 9;
 #[derive(Debug, Default)]
 enum PolicyObject {
     All, // for "*", stand for all objects, and is NULL in ffi
-    One([u8; SEPOLICY_MAX_LEN]),
+    One(#[allow(dead_code)] [u8; SEPOLICY_MAX_LEN]), // Field is used in to_c_ptr function
     #[default]
     None,
 }
@@ -406,13 +406,13 @@ impl TryFrom<&str> for PolicyObject {
 struct AtomicStatement {
     cmd: u32,
     subcmd: u32,
-    sepol1: PolicyObject,
-    sepol2: PolicyObject,
-    sepol3: PolicyObject,
-    sepol4: PolicyObject,
-    sepol5: PolicyObject,
-    sepol6: PolicyObject,
-    sepol7: PolicyObject,
+    #[allow(dead_code)] sepol1: PolicyObject, // Used in FfiPolicy conversion
+    #[allow(dead_code)] sepol2: PolicyObject, // Used in FfiPolicy conversion
+    #[allow(dead_code)] sepol3: PolicyObject, // Used in FfiPolicy conversion
+    #[allow(dead_code)] sepol4: PolicyObject, // Used in FfiPolicy conversion
+    #[allow(dead_code)] sepol5: PolicyObject, // Used in FfiPolicy conversion
+    #[allow(dead_code)] sepol6: PolicyObject, // Used in FfiPolicy conversion
+    #[allow(dead_code)] sepol7: PolicyObject, // Used in FfiPolicy conversion
 }
 
 impl<'a> TryFrom<&'a NormalPerm<'a>> for Vec<AtomicStatement> {
@@ -656,6 +656,7 @@ impl<'a> TryFrom<&'a PolicyStatement<'a>> for Vec<AtomicStatement> {
 
 #[derive(Debug)]
 #[repr(C)]
+#[allow(dead_code)] // Used for FFI interface
 struct FfiPolicy {
     cmd: u32,
     subcmd: u32,
@@ -668,6 +669,7 @@ struct FfiPolicy {
     sepol7: *const ffi::c_char,
 }
 
+#[allow(dead_code)] // Used in FfiPolicy conversion
 fn to_c_ptr(pol: &PolicyObject) -> *const ffi::c_char {
     match pol {
         PolicyObject::None | PolicyObject::All => std::ptr::null(),

apd/src/sepolicy.rs

@@ -14,6 +14,18 @@
 # Keep ini4j Service Provider Interface
 -keep,allowobfuscation,allowoptimization public class org.ini4j.spi.*
 
+# Keep native methods and JNI classes
+-keep class me.bmax.apatch.Natives {
+    *;
+}
+
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+-keep class me.bmax.apatch.Natives$Profile { *; }
+-keep class me.bmax.apatch.Natives$KPMCtlRes { *; }
+
 # Kotlin
 -assumenosideeffects class kotlin.jvm.internal.Intrinsics {
     public static void check*(...);

app/keystore.jks

@@ -3,12 +3,10 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="29" />
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <!-- 用于访问外部存储上的媒体文件 -->
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
@@ -20,7 +18,7 @@
         android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
-        android:label="APatch"
+        android:label="APatch Ultra"
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"

app/proguard-rules.pro

@@ -254,13 +254,13 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void * /*reserved*/) {
     JNIEnv* env{};
     if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) [[unlikely]] {
         LOGE("Get JNIEnv error!");
-        return JNI_FALSE;
+        return -1;
     }
 
     auto clazz = JNI_FindClass(env, "me/bmax/apatch/Natives");
     if (clazz.get() == nullptr) [[unlikely]] {
         LOGE("Failed to find Natives class");
-        return JNI_FALSE;
+        return -1;
     }
 
     const static JNINativeMethod gMethods[] = {
@@ -286,7 +286,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void * /*reserved*/) {
 
     if (JNI_RegisterNatives(env, clazz, gMethods, sizeof(gMethods) / sizeof(gMethods[0])) < 0) [[unlikely]] {
         LOGE("Failed to register native methods");
-        return JNI_FALSE;
+        return -1;
     }
 
     LOGI("JNI_OnLoad Done!");