From 978032cce151eaed781dbd38a3fe838ee91c60ee Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Tue, 19 Sep 2023 20:24:26 +0200 Subject: [PATCH] refactor: change apk zip entry alignment to field --- revanced-lib/src/main/kotlin/app/revanced/lib/ApkUtils.kt | 4 ++-- .../src/main/kotlin/app/revanced/lib/zip/ZipAligner.kt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/revanced-lib/src/main/kotlin/app/revanced/lib/ApkUtils.kt b/revanced-lib/src/main/kotlin/app/revanced/lib/ApkUtils.kt index 8ec2e0f..247a4f9 100644 --- a/revanced-lib/src/main/kotlin/app/revanced/lib/ApkUtils.kt +++ b/revanced-lib/src/main/kotlin/app/revanced/lib/ApkUtils.kt @@ -32,7 +32,7 @@ object ApkUtils { patchedEntriesSource.resourceFile?.let { file.copyEntriesFromFileAligned( - ZipFile(it), ZipAligner::getEntryAlignment + ZipFile(it), ZipAligner.apkZipEntryAlignment ) } @@ -40,7 +40,7 @@ object ApkUtils { // TODO: Fix copying resources that are not needed anymore. file.copyEntriesFromFileAligned( - ZipFile(apkFile), ZipAligner::getEntryAlignment + ZipFile(apkFile), ZipAligner.apkZipEntryAlignment ) } } diff --git a/revanced-lib/src/main/kotlin/app/revanced/lib/zip/ZipAligner.kt b/revanced-lib/src/main/kotlin/app/revanced/lib/zip/ZipAligner.kt index a50886d..44ccd32 100644 --- a/revanced-lib/src/main/kotlin/app/revanced/lib/zip/ZipAligner.kt +++ b/revanced-lib/src/main/kotlin/app/revanced/lib/zip/ZipAligner.kt @@ -6,8 +6,9 @@ object ZipAligner { private const val DEFAULT_ALIGNMENT = 4 private const val LIBRARY_ALIGNMENT = 4096 - fun getEntryAlignment(entry: ZipEntry): Int? = + val apkZipEntryAlignment = { entry: ZipEntry -> if (entry.compression.toUInt() != 0u) null else if (entry.fileName.endsWith(".so")) LIBRARY_ALIGNMENT else DEFAULT_ALIGNMENT + } }