Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Andorid 15 beta 4.2 #115

Merged
merged 2 commits into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: 'temurin'
cache: 'gradle'

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Disable signature verification For Android
branch master -> support android 4.4-7.x
Android8.x -> maybe you need find the commit what change version name to 2.1,then compile by you self
branch Q -> support android 9.0-10.0
branch main -> support android 10-14
branch main -> support android 10-15
```

## Features
Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ val releaseKeyAlias: String? by rootProject
val releaseKeyPassword: String? by rootProject

android {
compileSdk = 34
buildToolsVersion = "34.0.0"
compileSdk = 35
buildToolsVersion = "35.0.0"
defaultConfig {
applicationId = "com.coderstory.toolkit"
minSdk = 28
targetSdk = 34
targetSdk = 35
versionCode = 2019
versionName = "4.5"
}
Expand Down
7 changes: 6 additions & 1 deletion app/src/main/java/toolkit/coderstory/CorePatchForT.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ protected void beforeHookedMethod(MethodHookParam param) {
}
});

Class<?> ParsedPackage = getParsedPackage(loadPackageParam.classLoader);
findAndHookMethod("com.android.server.pm.InstallPackageHelper", loadPackageParam.classLoader,
"doesSignatureMatchForPermissions", String.class,
"com.android.server.pm.parsing.pkg.ParsedPackage", int.class, new XC_MethodHook() {
ParsedPackage, int.class, new XC_MethodHook() {
@Override
protected void afterHookedMethod(MethodHookParam param) {
if (prefs.getBoolean("digestCreak", true) && prefs.getBoolean("UsePreSig", false)) {
Expand Down Expand Up @@ -90,6 +91,10 @@ protected void afterHookedMethod(MethodHookParam param) {
}
}

Class<?> getParsedPackage(ClassLoader classLoader) {
return XposedHelpers.findClassIfExists("com.android.server.pm.parsing.pkg.ParsedPackage", classLoader);
}

Class<?> getSigningDetails(ClassLoader classLoader) {
return XposedHelpers.findClassIfExists("android.content.pm.SigningDetails", classLoader);
}
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/toolkit/coderstory/CorePatchForV.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package toolkit.coderstory;

import de.robv.android.xposed.XposedHelpers;

public class CorePatchForV extends CorePatchForU {
@Override
Class<?> getParsedPackage(ClassLoader classLoader) {
return XposedHelpers.findClassIfExists("com.android.internal.pm.parsing.pkg.ParsedPackage", classLoader);
}
}
3 changes: 3 additions & 0 deletions app/src/main/java/toolkit/coderstory/MainHook.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ public void handleLoadPackage(XC_LoadPackage.LoadPackageParam lpparam) throws Th
if (BuildConfig.DEBUG)
XposedBridge.log("D/" + TAG + " handleLoadPackage");
switch (Build.VERSION.SDK_INT) {
case Build.VERSION_CODES.VANILLA_ICE_CREAM: // 35
new CorePatchForV().handleLoadPackage(lpparam);
break;
case Build.VERSION_CODES.UPSIDE_DOWN_CAKE: // 34
new CorePatchForU().handleLoadPackage(lpparam);
break;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>
<string name="app_name">Core Patch</string>
<string name="module_description">Patch pour Android 9–14</string>
<string name="corepatch">Cette version est pour 10–14 uniquement.\nMerci d\’utiliser la dernière version de LSPosed.</string>
<string name="module_description">Patch pour Android 9-15</string>
<string name="corepatch">Cette version est pour 10-15 uniquement.\nMerci d\’utiliser la dernière version de LSPosed.</string>
<string name="downgr">Permettre la rétrogradation</string>
<string name="downgr_summary">Permettre la rétrogradation d\’applications.</string>
<string name="authcreak">Désactiver la vérification digest</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-in/strings.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>
<string name="app_name">Core Patch</string>
<string name="module_description">Android 9–14 core patch</string>
<string name="corepatch">Versi ini adalah untuk Android 9-14 saja.\nHarap gunakan versi LSPosed terbaru.</string>
<string name="module_description">Android 9-15 core patch</string>
<string name="corepatch">Versi ini adalah untuk Android 9-15 saja.\nHarap gunakan versi LSPosed terbaru.</string>
<string name="downgr">Izinkan turun versi</string>
<string name="downgr_summary">Izinkan turun versi aplikasi.</string>
<string name="authcreak">Matikan verifikasi digest</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>
<string name="app_name">Core Patch</string>
<string name="module_description">Android 9–14 core patch</string>
<string name="corepatch">Questa versione è solo per Android 9–14.\nPer favore utilizza la versione più recente di LSPosed.</string>
<string name="module_description">Android 9-15 core patch</string>
<string name="corepatch">Questa versione è solo per Android 9-15.\nPer favore utilizza la versione più recente di LSPosed.</string>
<string name="downgr">Consenti ​​Downgrade</string>
<string name="downgr_summary">Consenti il ​​downgrade delle applicazioni.</string>
<string name="authcreak">Disabilita verifica digest</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Core Patch</string>
<string name="module_description">Android 9–14 コアパッチ</string>
<string name="corepatch">このバージョンは、 Android 9–14 のみで動作します。\n最新版の LSPosed を使用してください。</string>
<string name="module_description">Android 9-15 コアパッチ</string>
<string name="corepatch">このバージョンは、 Android 9-15 のみで動作します。\n最新版の LSPosed を使用してください。</string>
<string name="downgr">ダウングレードを許可する</string>
<string name="downgr_summary">アプリのダウングレードを許可します。</string>
<string name="authcreak">ダイジェストの検証を無効化する</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-ko/strings.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>
<string name="app_name">Core Patch</string>
<string name="module_description">Android 9–14 core patch</string>
<string name="corepatch">이 버전은 Android 9–14 전용입니다.\nLSPosed의 최신 버전을 사용하십시오.</string>
<string name="module_description">Android 9-15 core patch</string>
<string name="corepatch">이 버전은 Android 9-15 전용입니다.\nLSPosed의 최신 버전을 사용하십시오.</string>
<string name="downgr">다운그레이드 허용</string>
<string name="downgr_summary">애플리케이션 다운그레이드를 허용합니다.</string>
<string name="authcreak">다이제스트 확인 비활성화</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>
<string name="app_name">Core Patch</string>
<string name="module_description">Android 9–14 core patch</string>
<string name="corepatch">Esta versão é apenas para Android 9–14.\nPor favor, use a versão mais recente do LSPosed.</string>
<string name="module_description">Android 9-15 core patch</string>
<string name="corepatch">Esta versão é apenas para Android 9-15.\nPor favor, use a versão mais recente do LSPosed.</string>
<string name="downgr">Permitir downgrade</string>
<string name="downgr_summary">Permite downgrade de apps</string>
<string name="authcreak">Desativar verificação de integridade</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<string name="app_name">Core Patch</string>
<string name="authcreak">Отключить проверку дайджеста</string>
<string name="authcreak_summary">Позволяет устанавливать приложения после изменения файла в apk (игнорировать недопустимую ошибку дайджеста).</string>
<string name="corepatch">«Эта версия предназначена только для Android 9–14.
<string name="corepatch">«Эта версия предназначена только для Android 9-15.
Пожалуйста, используйте последнюю версию LSPposed. "</string>
<string name="digestCreak">Отключить сравнение подписей</string>
<string name="digestCreak_summary">Разрешить переустановку приложения с другими подписями.</string>
Expand All @@ -16,7 +16,7 @@
<string name="enhancedMode">Расширенный режим</string>
<string name="enhancedMode_summary">Пройдите некоторую проверку в приложении</string>
<string name="ignore">Игнорировать</string>
<string name="module_description">Android 9–14 core patch</string>
<string name="module_description">Android 9-15 core patch</string>
<string name="not_supported">Похоже, вы используете устаревшую версию LSPposed или LSPposed не активирован, пожалуйста, обновите LSPposed или повторите попытку после активации.</string>
<string name="settings">Настройки</string>
</resources>
4 changes: 2 additions & 2 deletions app/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>
<string name="app_name">核心破解</string>
<string name="module_description">Android 9–14 核心破解</string>
<string name="corepatch">此版本只支持 Android 9–14\n请安装最新版本的 LSPosed 框架,否则功能可能无法正确启用。</string>
<string name="module_description">Android 9-15 核心破解</string>
<string name="corepatch">此版本只支持 Android 9-15\n请安装最新版本的 LSPosed 框架,否则功能可能无法正确启用。</string>
<string name="downgr">允许降级安装应用</string>
<string name="downgr_summary">允许应用在安装新版本的情况下直接覆盖安装旧版本</string>
<string name="authcreak">禁用软件包管理器签名验证</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">核心修補</string>
<string name="module_description">Android 9–14 核心修補</string>
<string name="corepatch">此版本只支援 Android 9–14\n請安裝最新版本的 LSPosed 框架,否則功能可能無法正確啟用。</string>
<string name="module_description">Android 9-15 核心修補</string>
<string name="corepatch">此版本只支援 Android 9-15\n請安裝最新版本的 LSPosed 框架,否則功能可能無法正確啟用。</string>
<string name="downgr">允許降版安裝應用程式</string>
<string name="downgr_summary">允許應用程式在安裝新版本的情況下直接覆蓋安裝舊版本</string>
<string name="authcreak">停用套裝安裝程式簽名驗證</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>
<string name="app_name">Core Patch</string>
<string name="module_description">Android 9–14 core patch</string>
<string name="corepatch">This version is for Android 9–14 only.\nPlease use the latest version of the LSPosed.</string>
<string name="module_description">Android 9-15 core patch</string>
<string name="corepatch">This version is for Android 9-15 only.\nPlease use the latest version of the LSPosed.</string>
<string name="downgr">Allow downgrade</string>
<string name="downgr_summary">Allow downgrade applications.</string>
<string name="authcreak">Disable digest verify</string>
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:8.2.0")
classpath("com.android.tools.build:gradle:8.5.2")
}
}

allprojects {
repositories {
google()
mavenCentral()
maven(url = "https://jcenter.bintray.com")
maven(url = "https://api.xposed.info/")
}
}

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
38 changes: 25 additions & 13 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,13 +82,12 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,22 +134,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
Loading
Loading