ReVanced-Mirror
/
revanced-cli
mirror of https://github.com/revanced/revanced-cli.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: Delete temporal files if it exists

This commit is contained in:
oSumAtrIX 2023-09-20 03:55:52 +02:00
parent 978032cce1
commit a022febd0c
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
revanced-cli/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt
View File

@ -208,10 +208,10 @@ internal object PatchCommand : Runnable {
// region Save
val aligned = resourceCachePath.resolve(apk.name)
ApkUtils.align(apk, aligned, patcherResult)
val tempFile = resourceCachePath.resolve(apk.name)
ApkUtils.copyAligned(apk, tempFile, patcherResult)
if (!mount) ApkUtils.sign(
aligned,
tempFile,
outputFilePath,
SigningOptions(
commonName,

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

@ -1,6 +1,6 @@
public final class app/revanced/lib/ApkUtils {
public static final field INSTANCE Lapp/revanced/lib/ApkUtils;
public final fun align (Ljava/io/File;Ljava/io/File;Lapp/revanced/patcher/PatcherResult;)V
public final fun copyAligned (Ljava/io/File;Ljava/io/File;Lapp/revanced/patcher/PatcherResult;)V
public final fun sign (Ljava/io/File;Ljava/io/File;Lapp/revanced/lib/signing/SigningOptions;)V
}
@ -98,7 +98,7 @@ public final class app/revanced/lib/signing/SigningOptions {
public final class app/revanced/lib/zip/ZipAligner {
public static final field INSTANCE Lapp/revanced/lib/zip/ZipAligner;
public final fun getEntryAlignment (Lapp/revanced/lib/zip/structures/ZipEntry;)Ljava/lang/Integer;
public final fun getApkZipEntryAlignment ()Lkotlin/jvm/functions/Function1;
}
public final class app/revanced/lib/zip/ZipFile : java/io/Closeable {

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

@ -8,6 +8,7 @@ import app.revanced.lib.zip.structures.ZipEntry
import app.revanced.patcher.PatcherResult
import java.io.File
import java.util.logging.Logger
import kotlin.io.path.deleteIfExists
@Suppress("MemberVisibilityCanBePrivate", "unused")
object ApkUtils {
@ -20,9 +21,11 @@ object ApkUtils {
* @param outputFile The apk to write the new entries to.
* @param patchedEntriesSource The result of the patcher to add the patched dex files and resources.
*/
fun align(apkFile: File, outputFile: File, patchedEntriesSource: PatcherResult) {
fun copyAligned(apkFile: File, outputFile: File, patchedEntriesSource: PatcherResult) {
logger.info("Aligning ${apkFile.name}")
outputFile.toPath().deleteIfExists()
ZipFile(outputFile).use { file ->
patchedEntriesSource.dexFiles.forEach {
file.addEntryCompressData(