ReVanced-Mirror/revanced-cli
1
0
Fork 0
mirror of https://github.com/revanced/revanced-cli.git synced 2025-01-22 08:57:32 +01:00
Code Issues Projects Releases Wiki Activity

refactor: Move alignment code to ZipFile

Browse Source
This commit is contained in:
oSumAtrIX 2023-09-20 04:48:02 +02:00
parent a022febd0c
commit ac5742dd6c
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
4 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
revanced-lib/api/revanced-lib.api
View File

@ -96,18 +96,18 @@ public final class app/revanced/lib/signing/SigningOptions {
public fun toString ()Ljava/lang/String; public fun toString ()Ljava/lang/String;
} }
public final class app/revanced/lib/zip/ZipAligner {
public static final field INSTANCE Lapp/revanced/lib/zip/ZipAligner;
public final fun getApkZipEntryAlignment ()Lkotlin/jvm/functions/Function1;
}
public final class app/revanced/lib/zip/ZipFile : java/io/Closeable { public final class app/revanced/lib/zip/ZipFile : java/io/Closeable {
public static final field ApkZipFile Lapp/revanced/lib/zip/ZipFile$ApkZipFile;
public fun <init> (Ljava/io/File;)V public fun <init> (Ljava/io/File;)V
public final fun addEntryCompressData (Lapp/revanced/lib/zip/structures/ZipEntry;[B)V public final fun addEntryCompressData (Lapp/revanced/lib/zip/structures/ZipEntry;[B)V
public fun close ()V public fun close ()V
public final fun copyEntriesFromFileAligned (Lapp/revanced/lib/zip/ZipFile;Lkotlin/jvm/functions/Function1;)V public final fun copyEntriesFromFileAligned (Lapp/revanced/lib/zip/ZipFile;Lkotlin/jvm/functions/Function1;)V
} }
public final class app/revanced/lib/zip/ZipFile$ApkZipFile {
public final fun getApkZipEntryAlignment ()Lkotlin/jvm/functions/Function1;
}
public final class app/revanced/lib/zip/structures/ZipEntry { public final class app/revanced/lib/zip/structures/ZipEntry {
public static final field Companion Lapp/revanced/lib/zip/structures/ZipEntry$Companion; public static final field Companion Lapp/revanced/lib/zip/structures/ZipEntry$Companion;
public fun <init> (Ljava/lang/String;)V public fun <init> (Ljava/lang/String;)V

5
revanced-lib/src/main/kotlin/app/revanced/lib/ApkUtils.kt
View File

@ -2,7 +2,6 @@ package app.revanced.lib
import app.revanced.lib.signing.ApkSigner import app.revanced.lib.signing.ApkSigner
import app.revanced.lib.signing.SigningOptions import app.revanced.lib.signing.SigningOptions
import app.revanced.lib.zip.ZipAligner
import app.revanced.lib.zip.ZipFile import app.revanced.lib.zip.ZipFile
import app.revanced.lib.zip.structures.ZipEntry import app.revanced.lib.zip.structures.ZipEntry
import app.revanced.patcher.PatcherResult import app.revanced.patcher.PatcherResult
@ -35,7 +34,7 @@ object ApkUtils {
patchedEntriesSource.resourceFile?.let { patchedEntriesSource.resourceFile?.let {
file.copyEntriesFromFileAligned( file.copyEntriesFromFileAligned(
ZipFile(it), ZipAligner.apkZipEntryAlignment ZipFile(it), ZipFile.apkZipEntryAlignment
) )
} }
@ -43,7 +42,7 @@ object ApkUtils {
// TODO: Fix copying resources that are not needed anymore. // TODO: Fix copying resources that are not needed anymore.
file.copyEntriesFromFileAligned( file.copyEntriesFromFileAligned(
ZipFile(apkFile), ZipAligner.apkZipEntryAlignment ZipFile(apkFile), ZipFile.apkZipEntryAlignment
) )
} }
} }

14
revanced-lib/src/main/kotlin/app/revanced/lib/zip/ZipAligner.kt
View File

@ -1,14 +0,0 @@
package app.revanced.lib.zip
import app.revanced.lib.zip.structures.ZipEntry
object ZipAligner {
private const val DEFAULT_ALIGNMENT = 4
private const val LIBRARY_ALIGNMENT = 4096
val apkZipEntryAlignment = { entry: ZipEntry ->
if (entry.compression.toUInt() != 0u) null
else if (entry.fileName.endsWith(".so")) LIBRARY_ALIGNMENT
else DEFAULT_ALIGNMENT
}
}

11
revanced-lib/src/main/kotlin/app/revanced/lib/zip/ZipFile.kt
View File

@ -178,4 +178,15 @@ class ZipFile(file: File) : Closeable {
if (centralDirectoryNeedsRewrite) writeCD() if (centralDirectoryNeedsRewrite) writeCD()
filePointer.close() filePointer.close()
} }
companion object ApkZipFile {
private const val DEFAULT_ALIGNMENT = 4
private const val LIBRARY_ALIGNMENT = 4096
val apkZipEntryAlignment = { entry: ZipEntry ->
if (entry.compression.toUInt() != 0u) null
else if (entry.fileName.endsWith(".so")) LIBRARY_ALIGNMENT
else DEFAULT_ALIGNMENT
}
}
} }