From c44558cacde6080d67e08d1a7524338082fffe5d Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sun, 27 Aug 2023 22:14:11 +0200 Subject: [PATCH 1/3] build: bump dependencies This fixes an issue with flagging the resource table with sparse incorrectly. --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6672eba..fd092ef 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] android = "4.1.1.4" kotlin-reflect = "1.9.0" -apktool-lib = "2.8.2-5" +apktool-lib = "2.8.2-6" kotlin-test = "1.8.20-RC" kotlinx-coroutines-core = "1.7.1" multidexlib2 = "3.0.3.r2" From b832812767a06ec6ec232291e6d14c8c2f14118c Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sun, 27 Aug 2023 22:14:43 +0200 Subject: [PATCH 2/3] fix: do not flag resource table as sparse when main package is not loaded --- .../app/revanced/patcher/data/ResourceContext.kt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/kotlin/app/revanced/patcher/data/ResourceContext.kt b/src/main/kotlin/app/revanced/patcher/data/ResourceContext.kt index 8bfcb12..f6eb877 100644 --- a/src/main/kotlin/app/revanced/patcher/data/ResourceContext.kt +++ b/src/main/kotlin/app/revanced/patcher/data/ResourceContext.kt @@ -83,6 +83,16 @@ class ResourceContext internal constructor( versionInfo.let { metadata.packageVersion = it.versionName ?: it.versionCode } + + /* + The ResTable if flagged as sparse if the main package is not loaded, which is the case here, + because ResourcesDecoder.decodeResources loads the main package + and not XmlPullStreamDecoder.decodeManifest. + See ARSCDecoder.readTableType for more info. + + Set this to false again to prevent the ResTable from being flagged as sparse falsely. + */ + metadata.apkInfo.sparseResources = false } } } From 6cc863efb330bd0d2614986f660fb474bebe45cd Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 27 Aug 2023 20:17:31 +0000 Subject: [PATCH 3/3] chore(release): 14.2.1-dev.1 [skip ci] ## [14.2.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v14.2.0...v14.2.1-dev.1) (2023-08-27) ### Bug Fixes * do not flag resource table as sparse when main package is not loaded ([b832812](https://github.com/ReVanced/revanced-patcher/commit/b832812767a06ec6ec232291e6d14c8c2f14118c)) --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2cb5d1..f75b1d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [14.2.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v14.2.0...v14.2.1-dev.1) (2023-08-27) + + +### Bug Fixes + +* do not flag resource table as sparse when main package is not loaded ([b832812](https://github.com/ReVanced/revanced-patcher/commit/b832812767a06ec6ec232291e6d14c8c2f14118c)) + # [14.2.0](https://github.com/ReVanced/revanced-patcher/compare/v14.1.0...v14.2.0) (2023-08-27) diff --git a/gradle.properties b/gradle.properties index a3a1289..2b63458 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.parallel = true org.gradle.caching = true kotlin.code.style = official -version = 14.2.0 +version = 14.2.1-dev.1