From afcba5c212f2892077d4640e2cf02cc3d459e4e2 Mon Sep 17 00:00:00 2001
From: oSumAtrIX <johan.melkonyan1@web.de>
Date: Sat, 11 Jun 2022 19:45:11 +0200
Subject: [PATCH] refactor: simplify code by removing the `with` block

---
 .../kotlin/app/revanced/patcher/Patcher.kt    | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/main/kotlin/app/revanced/patcher/Patcher.kt b/src/main/kotlin/app/revanced/patcher/Patcher.kt
index 1150560..aa4c100 100644
--- a/src/main/kotlin/app/revanced/patcher/Patcher.kt
+++ b/src/main/kotlin/app/revanced/patcher/Patcher.kt
@@ -33,6 +33,7 @@ import org.jf.dexlib2.iface.ClassDef
 import org.jf.dexlib2.iface.DexFile
 import org.jf.dexlib2.writer.io.MemoryDataStore
 import java.io.File
+import java.nio.file.Files
 
 val NAMER = BasicDexFileNamer()
 
@@ -162,23 +163,27 @@ class Patcher(
 
             ResXmlPatcher.fixingPublicAttrsInProviderAttributes(manifestFile)
 
-            with(cacheDirectory.resolve("aapt_temp_file")) {
-                val resDirectory = cacheDirectory.resolve("res")
-                val includedFiles = metaInfo.usesFramework.ids.map { id ->
-                    androlibResources.getFrameworkApk(
-                        id,
-                        metaInfo.usesFramework.tag
-                    )
-                }.toTypedArray()
+            val aaptFile = cacheDirectory.resolve("aapt_temp_file")
 
-                androlibResources.aaptPackage(
-                    this, manifestFile, resDirectory, null,
-                    null, includedFiles
+            // delete if it exists
+            Files.deleteIfExists(aaptFile.toPath())
+
+            val resDirectory = cacheDirectory.resolve("res")
+            val includedFiles = metaInfo.usesFramework.ids.map { id ->
+                androlibResources.getFrameworkApk(
+                    id,
+                    metaInfo.usesFramework.tag
                 )
+            }.toTypedArray()
+
+            androlibResources.aaptPackage(
+                aaptFile, manifestFile, resDirectory, null,
+                null, includedFiles
+            )
+
+            // write packaged resources to cache directory
+            ExtFile(aaptFile).directory.copyToDir(cacheDirectory.resolve("build/"))
 
-                // write packaged resources to cache directory
-                ExtFile(this).directory.copyToDir(cacheDirectory.resolve("build/"))
-            }
         }
 
         val newDexFile = object : DexFile {