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

refactor: move code out of try block

Browse Source
This commit is contained in:
oSumAtrIX 2023-07-26 06:17:48 +02:00
parent e0f8e1b71a
commit 1bca84ef0b
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,14 +86,14 @@ class Patcher(private val options: PatcherOptions) {
when (resourceDecodingMode) { when (resourceDecodingMode) {
ResourceDecodingMode.FULL -> { ResourceDecodingMode.FULL -> {
logger.info("Compiling resources")
val cacheDirectory = ExtFile(options.resourceCacheDirectory) val cacheDirectory = ExtFile(options.resourceCacheDirectory)
val aaptFile = cacheDirectory.resolve("aapt_temp_file").also {
Files.deleteIfExists(it.toPath())
}.also { resourceFile = it }
try { try {
logger.info("Compiling resources")
val aaptFile = cacheDirectory.resolve("aapt_temp_file").also {
Files.deleteIfExists(it.toPath())
}
AaptInvoker( AaptInvoker(
config, config,
context.packageMetadata.apkInfo context.packageMetadata.apkInfo
@ -111,8 +111,6 @@ class Patcher(private val options: PatcherOptions) {
}.toTypedArray() }.toTypedArray()
} }
) )
resourceFile = aaptFile
} finally { } finally {
cacheDirectory.close() cacheDirectory.close()
} }
@ -183,7 +181,6 @@ class Patcher(private val options: PatcherOptions) {
val extInputFile = ExtFile(options.inputFile) val extInputFile = ExtFile(options.inputFile)
try { try {
val resourcesDecoder = ResourcesDecoder(config, extInputFile) val resourcesDecoder = ResourcesDecoder(config, extInputFile)
val resourceTable = resourcesDecoder.resTable
when (mode) { when (mode) {
ResourceDecodingMode.FULL -> { ResourceDecodingMode.FULL -> {
@ -213,7 +210,7 @@ class Patcher(private val options: PatcherOptions) {
// use the XmlPullStreamDecoder in order to get necessary information from the manifest // use the XmlPullStreamDecoder in order to get necessary information from the manifest
// used below. // used below.
XmlPullStreamDecoder(AndroidManifestResourceParser().apply { XmlPullStreamDecoder(AndroidManifestResourceParser().apply {
attrDecoder = ResAttrDecoder().apply { this.resTable = resourceTable } attrDecoder = ResAttrDecoder().apply { this.resTable = resourcesDecoder.resTable }
}, ExtMXSerializer().apply { }, ExtMXSerializer().apply {
setProperty( setProperty(
ExtXmlSerializer.PROPERTY_SERIALIZER_INDENTATION, " " ExtXmlSerializer.PROPERTY_SERIALIZER_INDENTATION, " "
@ -241,7 +238,7 @@ class Patcher(private val options: PatcherOptions) {
context.packageMetadata.let { metadata -> context.packageMetadata.let { metadata ->
metadata.apkInfo = resourcesDecoder.apkInfo metadata.apkInfo = resourcesDecoder.apkInfo
metadata.packageName = resourceTable.currentResPackage.name metadata.packageName = resourcesDecoder.resTable.currentResPackage.name
resourcesDecoder.apkInfo.versionInfo.let { resourcesDecoder.apkInfo.versionInfo.let {
metadata.packageVersion = it.versionName ?: it.versionCode metadata.packageVersion = it.versionName ?: it.versionCode
} }