ReVanced/revanced-patcher
1
0
Fork 0
mirror of https://github.com/revanced/revanced-patcher.git synced 2025-05-02 05:54:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: simplify code by removing the with block

Browse Source
This commit is contained in:
oSumAtrIX 2022-06-11 19:45:11 +02:00
parent 2dcbd8d079
commit afcba5c212
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/kotlin/app/revanced/patcher/Patcher.kt
View File

@ -33,6 +33,7 @@ import org.jf.dexlib2.iface.ClassDef
import org.jf.dexlib2.iface.DexFile import org.jf.dexlib2.iface.DexFile
import org.jf.dexlib2.writer.io.MemoryDataStore import org.jf.dexlib2.writer.io.MemoryDataStore
import java.io.File import java.io.File
import java.nio.file.Files
val NAMER = BasicDexFileNamer() val NAMER = BasicDexFileNamer()
@ -162,7 +163,11 @@ class Patcher(
ResXmlPatcher.fixingPublicAttrsInProviderAttributes(manifestFile) ResXmlPatcher.fixingPublicAttrsInProviderAttributes(manifestFile)
with(cacheDirectory.resolve("aapt_temp_file")) { val aaptFile = cacheDirectory.resolve("aapt_temp_file")
// delete if it exists
Files.deleteIfExists(aaptFile.toPath())
val resDirectory = cacheDirectory.resolve("res") val resDirectory = cacheDirectory.resolve("res")
val includedFiles = metaInfo.usesFramework.ids.map { id -> val includedFiles = metaInfo.usesFramework.ids.map { id ->
androlibResources.getFrameworkApk( androlibResources.getFrameworkApk(
@ -172,13 +177,13 @@ class Patcher(
}.toTypedArray() }.toTypedArray()
androlibResources.aaptPackage( androlibResources.aaptPackage(
this, manifestFile, resDirectory, null, aaptFile, manifestFile, resDirectory, null,
null, includedFiles null, includedFiles
) )
// write packaged resources to cache directory // write packaged resources to cache directory
ExtFile(this).directory.copyToDir(cacheDirectory.resolve("build/")) ExtFile(aaptFile).directory.copyToDir(cacheDirectory.resolve("build/"))
}
} }
val newDexFile = object : DexFile { val newDexFile = object : DexFile {