From 6571b66c091cba634f32f92f07d2747cfd28ab5f Mon Sep 17 00:00:00 2001
From: Jeroen Beckers <info@dauntless.be>
Date: Wed, 23 Jun 2021 07:01:32 -0400
Subject: [PATCH 01/38] Various updates

---
 patch-apk.py | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index f666cd7..77dd656 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -12,11 +12,12 @@
 # Main()
 ####################
 def main():
-	#Check that dependencies are available
-	checkDependencies()
 	
 	#Grab argz
 	args = getArgs()
+
+	#Check that dependencies are available
+	checkDependencies(args.extract_only)
 	
 	#Verify the package name and ensure it's installed (also supports partial package names)
 	pkgname = verifyPackageName(args.pkgname)
@@ -27,13 +28,18 @@ def main():
 	#Create a temp directory to work from
 	with tempfile.TemporaryDirectory() as tmppath:
 		#Get the APK to patch. Combine app bundles/split APKs into a single APK.
-		apkfile = getTargetAPK(pkgname, apkpaths, tmppath, args.disable_styles_hack)
+		apkfile = getTargetAPK(pkgname, apkpaths, tmppath, args.disable_styles_hack, args.extract_only)
 		
 		#Save the APK if requested
-		if args.save_apk is not None:
-			print("Saving a copy of the APK to " + args.save_apk)
+		if args.save_apk is not None or args.extract_only:
+			targetName = args.save_apk if args.save_apk is not None else pkgname + ".apk"
+			print("Saving a copy of the APK to " + targetName)
 			print("")
-			shutil.copy(apkfile, args.save_apk)
+			shutil.copy(apkfile, targetName)
+
+			if args.extract_only:
+				os.remove(apkfile)
+				return
 		
 		#Patch the target APK with objection
 		print("Patching " + apkfile.split(os.sep)[-1] + " with objection.")
@@ -78,8 +84,12 @@ def main():
 # -> Android device connected
 # -> Keystore
 ####################
-def checkDependencies():
-	deps = ["adb", "apktool", "jarsigner", "objection", "zipalign"]
+def checkDependencies(extract_only):
+	deps = ["adb", "apktool"]
+
+	if not extract_only:
+		deps += ["objection", "aapt", "jarsigner", "zipalign"]
+
 	missing = []
 	for dep in deps:
 		if shutil.which(dep) is None:
@@ -111,10 +121,11 @@ def getArgs():
 	if not hasattr(getArgs, "parsed_args"):
 		#Parse the command line
 		parser = argparse.ArgumentParser(
-			description="patch-apk - Pull and patch Android apps for use with objection/frida."
+			description="patch-apk - Pull and patch Android apps for use with objection/frida. Supports split APKs."
 		)
 		parser.add_argument("--no-enable-user-certs", help="Prevent patch-apk from enabling user-installed certificate support via network security config in the patched APK.", action="store_true")
-		parser.add_argument("--save-apk", help="Save a copy of the APK (or single APK) prior to patching for use with other tools.")
+		parser.add_argument("--save-apk", help="Save a copy of the APK (or single APK) prior to patching for use with other tools. APK will be saved under the given name.")
+		parser.add_argument("--extract-only", help="Disable including objection and pushing modified APK to device.", action="store_true")
 		parser.add_argument("--disable-styles-hack", help="Disable the styles hack that removes duplicate entries from res/values/styles.xml.", action="store_true")
 		parser.add_argument("--debug-output", help="Enable debug output.", action="store_true")
 		parser.add_argument("pkgname", help="The name, or partial name, of the package to patch (e.g. com.foo.bar).")
@@ -236,7 +247,7 @@ def getAPKPathsForPackage(pkgname):
 # Pull the APK file(s) for the package and return the local file path to work with.
 # If the package is an app bundle/split APK, combine the APKs into a single APK.
 ####################
-def getTargetAPK(pkgname, apkpaths, tmppath, disableStylesHack):
+def getTargetAPK(pkgname, apkpaths, tmppath, disableStylesHack, extract_only):
 	#Pull the APKs from the device
 	print("Pulling APK file(s) from device.")
 	localapks = []
@@ -255,12 +266,12 @@ def getTargetAPK(pkgname, apkpaths, tmppath, disableStylesHack):
 		return localapks[0]
 	else:
 		#Combine split APKs
-		return combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack)
+		return combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_only)
 
 ####################
 # Combine app bundles/split APKs into a single APK for patching.
 ####################
-def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack):
+def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_only):
 	print("App bundle/split APK detected, rebuilding as a single APK.")
 	print("")
 	
@@ -320,6 +331,10 @@ def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack):
 			print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
 			sys.exit(1)
 	
+	# If only extracting, no need to sign / zipalign
+	if extract_only:
+		return os.path.join(baseapkdir, "dist", baseapkfilename)
+
 	
 	#Sign the new APK
 	print("[+] Signing new APK.")
@@ -643,5 +658,8 @@ def enableUserCerts(apkfile):
 # Main
 ####################
 if __name__ == "__main__":
-	main()
+	try:
+		main()
+	except KeyboardInterrupt:
+		sys.exit()
 

From 2a7e55733bb68faa428e2f8abb1864865c56f931 Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 25 Nov 2021 00:06:29 -0500
Subject: [PATCH 02/38] Fix issue #30 with build function

---
 patch-apk.py | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index 77dd656..424b98f 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -183,6 +183,29 @@ def runApkTool(params):
 		args.extend(params)
 		return subprocess.run(args, stdout=getStdout())
 
+####################
+# Build the APK
+####################
+def build(baseapkdir):
+	if os.path.exists(os.path.join(baseapkdir, "res", "navigation")) == True:
+		print("[+] Found res/navigation directory, rebuilding with 'apktool --use-aapt2'.")
+		ret = runApkTool(["--use-aapt2", "b", baseapkdir])
+		if ret.returncode != 0:
+			print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
+			sys.exit(1)
+	elif getApktoolVersion() > pkg_resources.parse_version("2.4.2"):
+		print("[+] Found apktool version > 2.4.2, rebuilding with 'apktool --use-aapt2'.")
+		ret = runApkTool(["--use-aapt2", "b", baseapkdir])
+		if ret.returncode != 0:
+			print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
+			sys.exit(1)
+	else:
+		print("[+] Building APK with apktool.")
+		ret = runApkTool(["b", baseapkdir])
+		if ret.returncode != 0:
+			print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
+			sys.exit(1)
+
 ####################
 # Verify the package name - checks whether the target package is installed
 # on the device or if an exact match is not found presents the options to
@@ -312,24 +335,7 @@ def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_onl
 	
 	#Rebuild the base APK
 	print("Rebuilding as a single APK.")
-	if os.path.exists(os.path.join(baseapkdir, "res", "navigation")) == True:
-		print("[+] Found res/navigation directory, rebuilding with 'apktool --use-aapt2'.")
-		ret = runApkTool(["--use-aapt2", "b", baseapkdir])
-		if ret.returncode != 0:
-			print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
-			sys.exit(1)
-	elif getApktoolVersion() > pkg_resources.parse_version("2.4.2"):
-		print("[+] Found apktool version > 2.4.2, rebuilding with 'apktool --use-aapt2'.")
-		ret = runApkTool(["--use-aapt2", "b", baseapkdir])
-		if ret.returncode != 0:
-			print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
-			sys.exit(1)
-	else:
-		print("[+] Building APK with apktool.")
-		ret = runApkTool(["b", baseapkdir])
-		if ret.returncode != 0:
-			print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
-			sys.exit(1)
+	build(baseapkdir)
 	
 	# If only extracting, no need to sign / zipalign
 	if extract_only:
@@ -630,10 +636,7 @@ def enableUserCerts(apkfile):
 		fh.close()
 		
 		#Rebuild and sign the APK
-		ret = runApkTool(["b", apkdir])
-		if ret.returncode != 0:
-			print("Error: Failed to run 'apktool b " + apkdir + "'.\nRun with --debug-output for more information.")
-			sys.exit(1)
+		build(apkdir) #Fix https://github.com/NickstaDB/patch-apk/issues/30
 		ret = subprocess.run([
 				"jarsigner", "-sigalg", "SHA1withRSA", "-digestalg", "SHA1", "-keystore",
 				os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")),

From 4c7cd49d5d5c86d450a3e3de768cd1a7048deaff Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 25 Nov 2021 00:07:36 -0500
Subject: [PATCH 03/38] Add regex file patching and fix issue #31

---
 patch-apk.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/patch-apk.py b/patch-apk.py
index 424b98f..70934dc 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -7,6 +7,7 @@
 import sys
 import tempfile
 import xml.etree.ElementTree
+import re
 
 ####################
 # Main()
@@ -341,6 +342,8 @@ def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_onl
 	if extract_only:
 		return os.path.join(baseapkdir, "dist", baseapkfilename)
 
+	#Fix https://github.com/NickstaDB/patch-apk/issues/31
+	rawREReplace(os.path.join(baseapkdir, "apktool.yml"), r"(?<=targetSdkVersion: ')\d+", lambda m: '29' if int(m.group()) >= 30 else m.group())
 	
 	#Sign the new APK
 	print("[+] Signing new APK.")
@@ -605,6 +608,20 @@ def disableApkSplitting(baseapkdir):
 	tree.write(os.path.join(baseapkdir, "AndroidManifest.xml"), encoding="utf-8", xml_declaration=True)
 	print("")
 
+####################
+# Replace occurrences of a pattern in a file with a replacement pattern or function (a la re.sub)
+####################
+def rawREReplace(path, pattern, replacement):
+	if os.path.exists(path):
+		contents = ""
+		with open(path, 'r') as file:
+			contents = file.read()
+		with open(path, 'w') as file:
+			file.write(re.sub(pattern, replacement, contents))
+	else:
+		print("Error: Failed to find file at " + path + " for pattern replacement")
+		sys.exit(1)
+
 ####################
 # Patch an APK to enable support for user-installed CA certs (e.g. Burp Suite CA cert).
 ####################

From 99c40d5c08b85e74e366a004ae957e51afd30497 Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 25 Nov 2021 00:08:09 -0500
Subject: [PATCH 04/38] Fix untracked apktool xml strings escape bug

---
 patch-apk.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/patch-apk.py b/patch-apk.py
index 70934dc..9f68dd6 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -333,6 +333,9 @@ def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_onl
 	
 	#Disable APK splitting in the base AndroidManifest.xml file
 	disableApkSplitting(baseapkdir)
+
+	#Fix untracked apktool bug where improperly escaped ampersands (&amp instead of &amp;) appear in strings.xml
+	rawREReplace(os.path.join(baseapkdir, "res", "values", "strings.xml"), r'(&amp)([^;])', r'\1;\2')
 	
 	#Rebuild the base APK
 	print("Rebuilding as a single APK.")

From dd61e398832c5d049fa59f65c24f5d75da2991d2 Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 25 Nov 2021 01:29:44 -0500
Subject: [PATCH 05/38] Add apksigner to deps

---
 patch-apk.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index 9f68dd6..dafe1b6 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -89,7 +89,7 @@ def checkDependencies(extract_only):
 	deps = ["adb", "apktool"]
 
 	if not extract_only:
-		deps += ["objection", "aapt", "jarsigner", "zipalign"]
+		deps += ["objection", "aapt", "jarsigner", "zipalign", "apksigner"]
 
 	missing = []
 	for dep in deps:
@@ -620,7 +620,9 @@ def rawREReplace(path, pattern, replacement):
 		with open(path, 'r') as file:
 			contents = file.read()
 		with open(path, 'w') as file:
-			file.write(re.sub(pattern, replacement, contents))
+			output = re.sub(pattern, replacement, contents)
+			print(output)
+			file.write(output)
 	else:
 		print("Error: Failed to find file at " + path + " for pattern replacement")
 		sys.exit(1)

From fc905a04a91d9f6847d33e46c085cf6f12fb7af0 Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 25 Nov 2021 01:37:43 -0500
Subject: [PATCH 06/38] disclaimer

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 3710c88..e99d879 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+# ONLY TESTED WITH APKTOOL 2.5.0 #
+
 # patch-apk - App Bundle/Split APK Aware Patcher for Objection #
 An APK patcher, for use with [objection](https://github.com/sensepost/objection), that supports Android app bundles/split APKs. It automates the following:
 

From 2e4cb1fe033b5c6e093e3bf23ce35e51a874ad0c Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 25 Nov 2021 02:35:22 -0500
Subject: [PATCH 07/38] Fix aapt dependency

---
 patch-apk.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index dafe1b6..f52e38d 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -86,10 +86,10 @@ def main():
 # -> Keystore
 ####################
 def checkDependencies(extract_only):
-	deps = ["adb", "apktool"]
+	deps = ["adb", "apktool", "aapt"]
 
 	if not extract_only:
-		deps += ["objection", "aapt", "jarsigner", "zipalign", "apksigner"]
+		deps += ["objection",  "jarsigner", "zipalign", "apksigner"]
 
 	missing = []
 	for dep in deps:

From 96a8c8214f4d88af3d6a3d7c8cb40294937aaf21 Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 25 Nov 2021 05:05:51 -0500
Subject: [PATCH 08/38] small cosmetic changes

---
 README.md    | 2 +-
 patch-apk.py | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e99d879..1196fba 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ONLY TESTED WITH APKTOOL 2.5.0 #
+# MODIFIED FOR APKTOOL 2.5.0 #
 
 # patch-apk - App Bundle/Split APK Aware Patcher for Objection #
 An APK patcher, for use with [objection](https://github.com/sensepost/objection), that supports Android app bundles/split APKs. It automates the following:
diff --git a/patch-apk.py b/patch-apk.py
index f52e38d..3a0c875 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -620,9 +620,7 @@ def rawREReplace(path, pattern, replacement):
 		with open(path, 'r') as file:
 			contents = file.read()
 		with open(path, 'w') as file:
-			output = re.sub(pattern, replacement, contents)
-			print(output)
-			file.write(output)
+			file.write(re.sub(pattern, replacement, contents))
 	else:
 		print("Error: Failed to find file at " + path + " for pattern replacement")
 		sys.exit(1)

From 5270b31ee3aa4bf794afd66ae24c8762fed61889 Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 25 Nov 2021 06:29:55 -0500
Subject: [PATCH 09/38] Add subprocess run helper and remove some prints

---
 patch-apk.py | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index 3a0c875..b312994 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -46,12 +46,9 @@ def main():
 		print("Patching " + apkfile.split(os.sep)[-1] + " with objection.")
 		ret = None
 		if getObjectionVersion() >= pkg_resources.parse_version("1.9.3"):
-			ret = subprocess.run(["objection", "patchapk", "--skip-resources", "--ignore-nativelibs", "-s", apkfile], stdout=getStdout())
+			assertSubprocessSuccessfulRun(["objection", "patchapk", "--skip-resources", "--ignore-nativelibs", "-s", apkfile], getStdout())
 		else:
-			ret = subprocess.run(["objection", "patchapk", "--skip-resources", "-s", apkfile], stdout=getStdout())
-		if ret.returncode != 0:
-			print("Error: Failed to run 'objection patchapk --skip-resources -s " + apkfile + "'.\nRun with --debug-output for more information.")
-			sys.exit(1)
+			assertSubprocessSuccessfulRun(["objection", "patchapk", "--skip-resources", "-s", apkfile], getStdout())
 		os.remove(apkfile)
 		shutil.move(apkfile[:-4] + ".objection.apk", apkfile)
 		print("")
@@ -61,23 +58,16 @@ def main():
 			enableUserCerts(apkfile)
 		
 		#Uninstall the original package from the device
-		print("Uninstalling the original package from the device.")
-		ret = subprocess.run(["adb", "uninstall", pkgname], stdout=getStdout())
-		if ret.returncode != 0:
-			print("Error: Failed to run 'adb uninstall " + pkgname + "'.\nRun with --debug-output for more information.")
-			sys.exit(1)
-		print("")
+		assertSubprocessSuccessfulRun(["adb", "uninstall", pkgname], getStdout())
 		
 		#Install the patched APK
-		print("Installing the patched APK to the device.")
-		ret = subprocess.run(["adb", "install", apkfile], stdout=getStdout())
-		if ret.returncode != 0:
-			print("Error: Failed to run 'adb install " + apkfile + "'.\nRun with --debug-output for more information.")
-			sys.exit(1)
-		print("")
+		assertSubprocessSuccessfulRun(["adb", "install", apkfile], getStdout())
 		
 		#Done
-		print("Done, cleaning up temporary files.")
+def assertSubprocessSuccessfulRun(args, stdout=subprocess.PIPE):
+	if subprocess.run(args, stdout).returncode != 0:
+		print(f"Error: Failed to run {' '.join(args)}.\nRun with --debug-output for more information.")
+		sys.exit(1)
 
 ####################
 # Check that required dependencies are present:
@@ -279,11 +269,7 @@ def getTargetAPK(pkgname, apkpaths, tmppath, disableStylesHack, extract_only):
 		baseapkname = remotepath.split('/')[-1]
 		localapks.append(os.path.join(tmppath, pkgname + "-" + baseapkname))
 		print("[+] Pulling: " + pkgname + "-" + baseapkname)
-		ret = subprocess.run(["adb", "pull", remotepath, localapks[-1]], stdout=getStdout())
-		if ret.returncode != 0:
-			print("Error: Failed to run 'adb pull " + remotepath + " " + localapks[-1] + "'.\nRun with --debug-output for more information.")
-			sys.exit(1)
-	print("")
+		assertSubprocessSuccessfulRun(["adb", "pull", remotepath, localapks[-1]], getStdout())
 	
 	#Return the target APK path
 	if len(localapks) == 1:

From 406fc530afd2e9a4a7645461849c62dd5682f5a6 Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 25 Nov 2021 06:32:51 -0500
Subject: [PATCH 10/38] signAndZipAlign, jarsigner -> apksigner, prints

---
 patch-apk.py | 70 +++++++++++++++-------------------------------------
 1 file changed, 20 insertions(+), 50 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index b312994..f023242 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -79,7 +79,7 @@ def checkDependencies(extract_only):
 	deps = ["adb", "apktool", "aapt"]
 
 	if not extract_only:
-		deps += ["objection",  "jarsigner", "zipalign", "apksigner"]
+		deps += ["objection", "zipalign", "apksigner"]
 
 	missing = []
 	for dep in deps:
@@ -197,6 +197,23 @@ def build(baseapkdir):
 			print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
 			sys.exit(1)
 
+####################
+# Sign the APK with apksigner and zip align
+# Fixes https://github.com/NickstaDB/patch-apk/issues/31 by no longer using jarsigner (V1 APK signatures)
+####################
+def signAndZipAlign(baseapkdir, baseapkfilename):
+	#Sign the new APK
+	print("[+] Signing new APK.")
+	assertSubprocessSuccessfulRun(["apksigner", "sign", "--ks",
+		os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")), "--ks-pass",
+		"pass:patch-apk", "--ks-key-alias", "patch-apk-key", os.path.join(baseapkdir, "dist", baseapkfilename)],
+		getStdout())
+
+	#Zip align the new APK
+	print("[+] Zip aligning new APK.")
+	assertSubprocessSuccessfulRun(["zipalign", "-f", "4", os.path.join(baseapkdir, "dist", baseapkfilename),
+		os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk")], getStdout())
+
 ####################
 # Verify the package name - checks whether the target package is installed
 # on the device or if an exact match is not found presents the options to
@@ -331,38 +348,9 @@ def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_onl
 	if extract_only:
 		return os.path.join(baseapkdir, "dist", baseapkfilename)
 
-	#Fix https://github.com/NickstaDB/patch-apk/issues/31
-	rawREReplace(os.path.join(baseapkdir, "apktool.yml"), r"(?<=targetSdkVersion: ')\d+", lambda m: '29' if int(m.group()) >= 30 else m.group())
-	
-	#Sign the new APK
-	print("[+] Signing new APK.")
-	ret = subprocess.run([
-			"jarsigner", "-sigalg", "SHA1withRSA", "-digestalg", "SHA1", "-keystore",
-			os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")),
-			"-storepass", "patch-apk", os.path.join(baseapkdir, "dist", baseapkfilename), "patch-apk-key"],
-		stdout=getStdout()
-	)
-	if ret.returncode != 0:
-		print("Error: Failed to run 'jarsigner -sigalg SHA1withRSA -digestalg SHA1 -keystore " +
-			os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")) +
-			"-storepass patch-apk " + os.path.join(baseapkdir, "dist", baseapkfilename) + " patch-apk-key'.\nRun with --debug-output for more information.")
-		sys.exit(1)
-
+	signAndZipAlign(baseapkdir, baseapkfilename)
 	
-	#Zip align the new APK
-	print("[+] Zip aligning new APK.")
-	ret = subprocess.run([
-			"zipalign", "-f", "4", os.path.join(baseapkdir, "dist", baseapkfilename),
-			os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk")
-		],
-		stdout=getStdout()
-	)
-	if ret.returncode != 0:
-		print("Error: Failed to run 'zipalign -f 4 " + os.path.join(baseapkdir, "dist", baseapkfilename) +
-			" " + os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk") + "'.\nRun with --debug-output for more information.")
-		sys.exit(1)
 	shutil.move(os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk"), os.path.join(baseapkdir, "dist", baseapkfilename))
-	print("")
 	
 	#Return the new APK path
 	return os.path.join(baseapkdir, "dist", baseapkfilename)
@@ -643,25 +631,7 @@ def enableUserCerts(apkfile):
 		
 		#Rebuild and sign the APK
 		build(apkdir) #Fix https://github.com/NickstaDB/patch-apk/issues/30
-		ret = subprocess.run([
-				"jarsigner", "-sigalg", "SHA1withRSA", "-digestalg", "SHA1", "-keystore",
-				os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")),
-				"-storepass", "patch-apk", os.path.join(apkdir, "dist", apkname), "patch-apk-key"],
-			stdout=getStdout()
-		)
-		if ret.returncode != 0:
-			print("Error: Failed to run 'jarsigner -sigalg SHA1withRSA -digestalg SHA1 -keystore " +
-				os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")) +
-				"-storepass patch-apk " + os.path.join(apkdir, "dist", apkname) + "patch-apk-key'.\nRun with --debug-output for more information.")
-			sys.exit(1)
-		
-		#Zip align the new APK
-		os.remove(apkfile)
-		ret = subprocess.run(["zipalign", "4", os.path.join(apkdir, "dist", apkname), apkfile], stdout=getStdout())
-		if ret.returncode != 0:
-			print("Error: Failed to run 'zipalign 4 " + os.path.join(apkdir, "dist", apkname) + " " + apkfile + "'.\nRun with --debug-output for more information.")
-			sys.exit(1)
-	print("")
+		signAndZipAlign(apkdir, apkname)
 
 ####################
 # Main

From 238ef47299a06cef2b8efeb9def2ba82b5645cde Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 25 Nov 2021 06:33:02 -0500
Subject: [PATCH 11/38] Fix last of the prints

---
 patch-apk.py | 41 +++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index f023242..21a8305 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -34,8 +34,7 @@ def main():
 		#Save the APK if requested
 		if args.save_apk is not None or args.extract_only:
 			targetName = args.save_apk if args.save_apk is not None else pkgname + ".apk"
-			print("Saving a copy of the APK to " + targetName)
-			print("")
+			print("\nSaving a copy of the APK to " + targetName)
 			shutil.copy(apkfile, targetName)
 
 			if args.extract_only:
@@ -43,27 +42,29 @@ def main():
 				return
 		
 		#Patch the target APK with objection
-		print("Patching " + apkfile.split(os.sep)[-1] + " with objection.")
-		ret = None
+		print("\nPatching " + apkfile.split(os.sep)[-1] + " with objection.")
 		if getObjectionVersion() >= pkg_resources.parse_version("1.9.3"):
 			assertSubprocessSuccessfulRun(["objection", "patchapk", "--skip-resources", "--ignore-nativelibs", "-s", apkfile], getStdout())
 		else:
 			assertSubprocessSuccessfulRun(["objection", "patchapk", "--skip-resources", "-s", apkfile], getStdout())
 		os.remove(apkfile)
 		shutil.move(apkfile[:-4] + ".objection.apk", apkfile)
-		print("")
 		
 		#Enable support for user-installed CA certs (e.g. Burp Suite CA installed on device by user)
 		if args.no_enable_user_certs == False:
 			enableUserCerts(apkfile)
 		
 		#Uninstall the original package from the device
+		print("\nUninstalling the original package from the device.")
 		assertSubprocessSuccessfulRun(["adb", "uninstall", pkgname], getStdout())
 		
 		#Install the patched APK
+		print("\nInstalling the patched APK to the device.")
 		assertSubprocessSuccessfulRun(["adb", "install", apkfile], getStdout())
 		
 		#Done
+		print("\nDone, cleaning up temporary files.")
+
 def assertSubprocessSuccessfulRun(args, stdout=subprocess.PIPE):
 	if subprocess.run(args, stdout).returncode != 0:
 		print(f"Error: Failed to run {' '.join(args)}.\nRun with --debug-output for more information.")
@@ -252,14 +253,13 @@ def verifyPackageName(pkgname):
 			if choice.isnumeric() == False or int(choice) < 1 or int(choice) > len(packages):
 				print("Invalid choice.\n")
 				choice = -1
-		print("")
 		return packages[int(choice) - 1]
 
 ####################
 # Get the APK path(s) on the device for the given package name.
 ####################
 def getAPKPathsForPackage(pkgname):
-	print("Getting APK path(s) for package: " + pkgname)
+	print("\nGetting APK path(s) for package: " + pkgname)
 	paths = []
 	proc = subprocess.run(["adb", "shell", "pm", "path", pkgname], stdout=subprocess.PIPE)
 	if proc.returncode != 0:
@@ -271,7 +271,6 @@ def getAPKPathsForPackage(pkgname):
 			line = line[8:].strip()
 			print("[+] APK path: " + line)
 			paths.append(line)
-	print("")
 	return paths
 
 ####################
@@ -280,7 +279,7 @@ def getAPKPathsForPackage(pkgname):
 ####################
 def getTargetAPK(pkgname, apkpaths, tmppath, disableStylesHack, extract_only):
 	#Pull the APKs from the device
-	print("Pulling APK file(s) from device.")
+	print("\nPulling APK file(s) from device.")
 	localapks = []
 	for remotepath in apkpaths:
 		baseapkname = remotepath.split('/')[-1]
@@ -299,11 +298,10 @@ def getTargetAPK(pkgname, apkpaths, tmppath, disableStylesHack, extract_only):
 # Combine app bundles/split APKs into a single APK for patching.
 ####################
 def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_only):
-	print("App bundle/split APK detected, rebuilding as a single APK.")
-	print("")
+	print("\nApp bundle/split APK detected, rebuilding as a single APK.")
 	
 	#Extract the individual APKs
-	print("Extracting individual APKs with apktool.")
+	print("\nExtracting individual APKs with apktool.")
 	baseapkdir = os.path.join(tmppath, pkgname + "-base")
 	baseapkfilename = pkgname + "-base.apk"
 	splitapkpaths = []
@@ -322,7 +320,6 @@ def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_onl
 		#Check for ProGuard/AndResGuard - this might b0rk decompile/recompile
 		if detectProGuard(apkdir):
 			print("\n[~] WARNING: Detected ProGuard/AndResGuard, decompile/recompile may not succeed.\n")
-	print("")
 	
 	#Walk the extracted APK directories and copy files and directories to the base APK
 	copySplitApkFiles(baseapkdir, splitapkpaths)
@@ -347,7 +344,7 @@ def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_onl
 	# If only extracting, no need to sign / zipalign
 	if extract_only:
 		return os.path.join(baseapkdir, "dist", baseapkfilename)
-
+	
 	signAndZipAlign(baseapkdir, baseapkfilename)
 	
 	shutil.move(os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk"), os.path.join(baseapkdir, "dist", baseapkfilename))
@@ -373,7 +370,7 @@ def detectProGuard(extractedPath):
 # Copy files and directories from split APKs into the base APK directory.
 ####################
 def copySplitApkFiles(baseapkdir, splitapkpaths):
-	print("Copying files and directories from split APKs into base APK.")
+	print("\nCopying files and directories from split APKs into base APK.")
 	for apkdir in splitapkpaths:
 		for (root, dirs, files) in os.walk(apkdir):
 			#Skip the original files directory
@@ -400,7 +397,6 @@ def copySplitApkFiles(baseapkdir, splitapkpaths):
 						continue
 					dbgPrint("[+] Moving file to base APK: " + p[len(baseapkdir):])
 					shutil.move(os.path.join(root, f), p)
-	print("")
 
 ####################
 # Fix public resource identifiers that are shared across split APKs.
@@ -412,7 +408,7 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
 	#Bail if the base APK does not have a public.xml
 	if os.path.exists(os.path.join(baseapkdir, "res", "values", "public.xml")) == False:
 		return
-	print("Found public.xml in the base APK, fixing resource identifiers across split APKs.")
+	print("\nFound public.xml in the base APK, fixing resource identifiers across split APKs.")
 	
 	#Mappings of resource IDs and names
 	idToDummyName = {}
@@ -500,7 +496,6 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
 				except xml.etree.ElementTree.ParseError:
 					print("[-] XML parse error in " + os.path.join(root, f) + ", skipping.")
 	print("[+] Updated " + str(updated) + " references to dummy resource names in the base APK.")
-	print("")
 
 ####################
 # Hack to remove duplicate style resource entries before rebuilding.
@@ -518,7 +513,7 @@ def hackRemoveDuplicateStyleEntries(baseapkdir):
 	#Bail if there is no styles.xml
 	if os.path.exists(os.path.join(baseapkdir, "res", "values", "styles.xml")) == False:
 		return
-	print("Found styles.xml in the base APK, checking for duplicate <style> -> <item> elements and removing.")
+	print("\nFound styles.xml in the base APK, checking for duplicate <style> -> <item> elements and removing.")
 	print("[~] Warning: this is a complete hack and may impact the visuals of the app, disable with --disable-styles-hack.")
 	
 	#Duplicates
@@ -542,7 +537,6 @@ def hackRemoveDuplicateStyleEntries(baseapkdir):
 	if len(dupes) > 0:
 		tree.write(os.path.join(baseapkdir, "res", "values", "styles.xml"), encoding="utf-8", xml_declaration=True)
 		print("[+] Removed " + str(len(dupes)) + " duplicate entries from styles.xml.")
-	print("")
 
 ####################
 # Update AndroidManifest.xml to disable APK splitting.
@@ -551,7 +545,7 @@ def hackRemoveDuplicateStyleEntries(baseapkdir):
 # -> Removes meta-data elements with the name "com.android.vending.splits" or "com.android.vending.splits.required"
 ####################
 def disableApkSplitting(baseapkdir):
-	print("Disabling APK splitting in AndroidManifest.xml of base APK.")
+	print("\nDisabling APK splitting in AndroidManifest.xml of base APK.")
 	
 	#Load AndroidManifest.xml
 	tree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "AndroidManifest.xml"))
@@ -583,7 +577,6 @@ def disableApkSplitting(baseapkdir):
 	
 	#Save the updated AndroidManifest.xml
 	tree.write(os.path.join(baseapkdir, "AndroidManifest.xml"), encoding="utf-8", xml_declaration=True)
-	print("")
 
 ####################
 # Replace occurrences of a pattern in a file with a replacement pattern or function (a la re.sub)
@@ -596,7 +589,7 @@ def rawREReplace(path, pattern, replacement):
 		with open(path, 'w') as file:
 			file.write(re.sub(pattern, replacement, contents))
 	else:
-		print("Error: Failed to find file at " + path + " for pattern replacement")
+		print("\nError: Failed to find file at " + path + " for pattern replacement")
 		sys.exit(1)
 
 ####################
@@ -604,7 +597,7 @@ def rawREReplace(path, pattern, replacement):
 ####################
 def enableUserCerts(apkfile):
 	#Create a separate temp directory to work from
-	print("Patching APK to enable support for user-installed CA certificates.")
+	print("\nPatching APK to enable support for user-installed CA certificates.")
 	with tempfile.TemporaryDirectory() as tmppath:
 		#Extract the APK
 		apkdir = os.path.join(tmppath, apkfile.split(os.sep)[-1][:-4])

From 8b97d54a590c2ec4d18239e2bebd9e7dfefdd8c7 Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 25 Nov 2021 06:39:12 -0500
Subject: [PATCH 12/38] Move zip align to front and rename result

---
 patch-apk.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index 21a8305..29bc6e0 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -203,6 +203,12 @@ def build(baseapkdir):
 # Fixes https://github.com/NickstaDB/patch-apk/issues/31 by no longer using jarsigner (V1 APK signatures)
 ####################
 def signAndZipAlign(baseapkdir, baseapkfilename):
+	#Zip align the new APK
+	print("[+] Zip aligning new APK.")
+	assertSubprocessSuccessfulRun(["zipalign", "-f", "4", os.path.join(baseapkdir, "dist", baseapkfilename),
+		os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk")], getStdout())
+	shutil.move(os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk"), os.path.join(baseapkdir, "dist", baseapkfilename))
+
 	#Sign the new APK
 	print("[+] Signing new APK.")
 	assertSubprocessSuccessfulRun(["apksigner", "sign", "--ks",
@@ -210,11 +216,6 @@ def signAndZipAlign(baseapkdir, baseapkfilename):
 		"pass:patch-apk", "--ks-key-alias", "patch-apk-key", os.path.join(baseapkdir, "dist", baseapkfilename)],
 		getStdout())
 
-	#Zip align the new APK
-	print("[+] Zip aligning new APK.")
-	assertSubprocessSuccessfulRun(["zipalign", "-f", "4", os.path.join(baseapkdir, "dist", baseapkfilename),
-		os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk")], getStdout())
-
 ####################
 # Verify the package name - checks whether the target package is installed
 # on the device or if an exact match is not found presents the options to

From 9179af6633ceb3448173cf34b6d652fd8b899f48 Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 25 Nov 2021 06:39:48 -0500
Subject: [PATCH 13/38] Remove extra unnecessary move

---
 patch-apk.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index 29bc6e0..d19ba5f 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -348,8 +348,6 @@ def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_onl
 	
 	signAndZipAlign(baseapkdir, baseapkfilename)
 	
-	shutil.move(os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk"), os.path.join(baseapkdir, "dist", baseapkfilename))
-	
 	#Return the new APK path
 	return os.path.join(baseapkdir, "dist", baseapkfilename)
 

From 0e1636ebc799e6014286718666b0f9d11c08336a Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Mon, 29 Nov 2021 14:31:51 -0500
Subject: [PATCH 14/38] Add DS_Store to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index cfac947..f7ae478 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 patch-apk-dbg.py
+.DS_Store

From 89d6c4d49a356d5ba908abe74280ddb8e2f3c6b8 Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Fri, 3 Dec 2021 00:15:06 -0500
Subject: [PATCH 15/38] Use xmlPath var in fixPublicResourceIDs

---
 patch-apk.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index d19ba5f..047927c 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -458,8 +458,9 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
 			if f.lower().endswith(".xml"):
 				try:
 					#Load the XML
-					dbgPrint("[~] Parsing " + os.path.join(root, f))
-					tree = xml.etree.ElementTree.parse(os.path.join(root, f))
+					xmlPath = os.path.join(root, f)
+					dbgPrint("[~] Parsing " + xmlPath)
+					tree = xml.etree.ElementTree.parse(xmlPath)
 					
 					#Register the namespaces and get the prefix for the "android" namespace
 					namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(baseapkdir, "AndroidManifest.xml"), events=["start-ns"])])

From 6dc2040802a10d5aaeaab42dcd56bf9867509e08 Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Fri, 3 Dec 2021 00:15:37 -0500
Subject: [PATCH 16/38] Fix null drawables

---
 patch-apk.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/patch-apk.py b/patch-apk.py
index 047927c..2f7e06a 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -482,6 +482,10 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
 								el.attrib[attr] = dummyNameToRealName[val]
 								updated += 1
 								changed = True
+							
+							#Fix for untracked bug where drawables are decoded without drawable values (@null)
+							if f == "drawables.xml" and attr == "name" and el.text is None:
+								el.text = "#000000"
 						
 						#Check for references to APKTOOL_DUMMY_XXX resources in the element text
 						val = el.text

From 6832bff17375d6d1504cfec49616b091766b4234 Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Fri, 3 Dec 2021 00:25:59 -0500
Subject: [PATCH 17/38] Forgot alpha

---
 patch-apk.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patch-apk.py b/patch-apk.py
index 2f7e06a..a613357 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -485,7 +485,7 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
 							
 							#Fix for untracked bug where drawables are decoded without drawable values (@null)
 							if f == "drawables.xml" and attr == "name" and el.text is None:
-								el.text = "#000000"
+								el.text = "#000000ff"
 						
 						#Check for references to APKTOOL_DUMMY_XXX resources in the element text
 						val = el.text

From 81d4ad3ec626479c38261ece3004573338cbc7ff Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Wed, 29 Dec 2021 17:19:25 -0500
Subject: [PATCH 18/38] Tabs to spaces

---
 patch-apk.py | 980 +++++++++++++++++++++++++--------------------------
 1 file changed, 490 insertions(+), 490 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index a613357..7c8d62b 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -13,62 +13,62 @@
 # Main()
 ####################
 def main():
-	
-	#Grab argz
-	args = getArgs()
+  
+  #Grab argz
+  args = getArgs()
 
-	#Check that dependencies are available
-	checkDependencies(args.extract_only)
-	
-	#Verify the package name and ensure it's installed (also supports partial package names)
-	pkgname = verifyPackageName(args.pkgname)
-	
-	#Get the APK path(s) from the device
-	apkpaths = getAPKPathsForPackage(pkgname)
-	
-	#Create a temp directory to work from
-	with tempfile.TemporaryDirectory() as tmppath:
-		#Get the APK to patch. Combine app bundles/split APKs into a single APK.
-		apkfile = getTargetAPK(pkgname, apkpaths, tmppath, args.disable_styles_hack, args.extract_only)
-		
-		#Save the APK if requested
-		if args.save_apk is not None or args.extract_only:
-			targetName = args.save_apk if args.save_apk is not None else pkgname + ".apk"
-			print("\nSaving a copy of the APK to " + targetName)
-			shutil.copy(apkfile, targetName)
+  #Check that dependencies are available
+  checkDependencies(args.extract_only)
+  
+  #Verify the package name and ensure it's installed (also supports partial package names)
+  pkgname = verifyPackageName(args.pkgname)
+  
+  #Get the APK path(s) from the device
+  apkpaths = getAPKPathsForPackage(pkgname)
+  
+  #Create a temp directory to work from
+  with tempfile.TemporaryDirectory() as tmppath:
+    #Get the APK to patch. Combine app bundles/split APKs into a single APK.
+    apkfile = getTargetAPK(pkgname, apkpaths, tmppath, args.disable_styles_hack, args.extract_only)
+    
+    #Save the APK if requested
+    if args.save_apk is not None or args.extract_only:
+      targetName = args.save_apk if args.save_apk is not None else pkgname + ".apk"
+      print("\nSaving a copy of the APK to " + targetName)
+      shutil.copy(apkfile, targetName)
 
-			if args.extract_only:
-				os.remove(apkfile)
-				return
-		
-		#Patch the target APK with objection
-		print("\nPatching " + apkfile.split(os.sep)[-1] + " with objection.")
-		if getObjectionVersion() >= pkg_resources.parse_version("1.9.3"):
-			assertSubprocessSuccessfulRun(["objection", "patchapk", "--skip-resources", "--ignore-nativelibs", "-s", apkfile], getStdout())
-		else:
-			assertSubprocessSuccessfulRun(["objection", "patchapk", "--skip-resources", "-s", apkfile], getStdout())
-		os.remove(apkfile)
-		shutil.move(apkfile[:-4] + ".objection.apk", apkfile)
-		
-		#Enable support for user-installed CA certs (e.g. Burp Suite CA installed on device by user)
-		if args.no_enable_user_certs == False:
-			enableUserCerts(apkfile)
-		
-		#Uninstall the original package from the device
-		print("\nUninstalling the original package from the device.")
-		assertSubprocessSuccessfulRun(["adb", "uninstall", pkgname], getStdout())
-		
-		#Install the patched APK
-		print("\nInstalling the patched APK to the device.")
-		assertSubprocessSuccessfulRun(["adb", "install", apkfile], getStdout())
-		
-		#Done
-		print("\nDone, cleaning up temporary files.")
+      if args.extract_only:
+        os.remove(apkfile)
+        return
+    
+    #Patch the target APK with objection
+    print("\nPatching " + apkfile.split(os.sep)[-1] + " with objection.")
+    if getObjectionVersion() >= pkg_resources.parse_version("1.9.3"):
+      assertSubprocessSuccessfulRun(["objection", "patchapk", "--skip-resources", "--ignore-nativelibs", "-s", apkfile], getStdout())
+    else:
+      assertSubprocessSuccessfulRun(["objection", "patchapk", "--skip-resources", "-s", apkfile], getStdout())
+    os.remove(apkfile)
+    shutil.move(apkfile[:-4] + ".objection.apk", apkfile)
+    
+    #Enable support for user-installed CA certs (e.g. Burp Suite CA installed on device by user)
+    if args.no_enable_user_certs == False:
+      enableUserCerts(apkfile)
+    
+    #Uninstall the original package from the device
+    print("\nUninstalling the original package from the device.")
+    assertSubprocessSuccessfulRun(["adb", "uninstall", pkgname], getStdout())
+    
+    #Install the patched APK
+    print("\nInstalling the patched APK to the device.")
+    assertSubprocessSuccessfulRun(["adb", "install", apkfile], getStdout())
+    
+    #Done
+    print("\nDone, cleaning up temporary files.")
 
 def assertSubprocessSuccessfulRun(args, stdout=subprocess.PIPE):
-	if subprocess.run(args, stdout).returncode != 0:
-		print(f"Error: Failed to run {' '.join(args)}.\nRun with --debug-output for more information.")
-		sys.exit(1)
+  if subprocess.run(args, stdout).returncode != 0:
+    print(f"Error: Failed to run {' '.join(args)}.\nRun with --debug-output for more information.")
+    sys.exit(1)
 
 ####################
 # Check that required dependencies are present:
@@ -77,144 +77,144 @@ def assertSubprocessSuccessfulRun(args, stdout=subprocess.PIPE):
 # -> Keystore
 ####################
 def checkDependencies(extract_only):
-	deps = ["adb", "apktool", "aapt"]
+  deps = ["adb", "apktool", "aapt"]
 
-	if not extract_only:
-		deps += ["objection", "zipalign", "apksigner"]
+  if not extract_only:
+    deps += ["objection", "zipalign", "apksigner"]
 
-	missing = []
-	for dep in deps:
-		if shutil.which(dep) is None:
-			missing.append(dep)
-	if len(missing) > 0:
-		print("Error, missing dependencies, ensure the following commands are available on the PATH: " + (", ".join(missing)))
-		sys.exit(1)
-	
-	#Verify that an Android device is connected
-	proc = subprocess.run(["adb", "devices"], stdout=subprocess.PIPE)
-	if proc.returncode != 0:
-		print("Error: Failed to run 'adb devices'.")
-		sys.exit(1)
-	deviceOut = proc.stdout.decode("utf-8")
-	if len(deviceOut.strip().split(os.linesep)) == 1:
-		print("Error, no Android device connected (\"adb devices\"), connect a device first.")
-		sys.exit(1)
-	
-	#Check that the included keystore exists
-	if os.path.exists(os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore"))) == False:
-		print("Error, the keystore was not found at " + os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")) + ", please clone the repository or get the keystore file and place it at this location.")
-		sys.exit(1)
+  missing = []
+  for dep in deps:
+    if shutil.which(dep) is None:
+      missing.append(dep)
+  if len(missing) > 0:
+    print("Error, missing dependencies, ensure the following commands are available on the PATH: " + (", ".join(missing)))
+    sys.exit(1)
+  
+  #Verify that an Android device is connected
+  proc = subprocess.run(["adb", "devices"], stdout=subprocess.PIPE)
+  if proc.returncode != 0:
+    print("Error: Failed to run 'adb devices'.")
+    sys.exit(1)
+  deviceOut = proc.stdout.decode("utf-8")
+  if len(deviceOut.strip().split(os.linesep)) == 1:
+    print("Error, no Android device connected (\"adb devices\"), connect a device first.")
+    sys.exit(1)
+  
+  #Check that the included keystore exists
+  if os.path.exists(os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore"))) == False:
+    print("Error, the keystore was not found at " + os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")) + ", please clone the repository or get the keystore file and place it at this location.")
+    sys.exit(1)
 
 ####################
 # Grab command line parameters
 ####################
 def getArgs():
-	#Only parse args once
-	if not hasattr(getArgs, "parsed_args"):
-		#Parse the command line
-		parser = argparse.ArgumentParser(
-			description="patch-apk - Pull and patch Android apps for use with objection/frida. Supports split APKs."
-		)
-		parser.add_argument("--no-enable-user-certs", help="Prevent patch-apk from enabling user-installed certificate support via network security config in the patched APK.", action="store_true")
-		parser.add_argument("--save-apk", help="Save a copy of the APK (or single APK) prior to patching for use with other tools. APK will be saved under the given name.")
-		parser.add_argument("--extract-only", help="Disable including objection and pushing modified APK to device.", action="store_true")
-		parser.add_argument("--disable-styles-hack", help="Disable the styles hack that removes duplicate entries from res/values/styles.xml.", action="store_true")
-		parser.add_argument("--debug-output", help="Enable debug output.", action="store_true")
-		parser.add_argument("pkgname", help="The name, or partial name, of the package to patch (e.g. com.foo.bar).")
-		
-		#Store the parsed args
-		getArgs.parsed_args = parser.parse_args()
-	
-	#Return the parsed command line args
-	return getArgs.parsed_args
+  #Only parse args once
+  if not hasattr(getArgs, "parsed_args"):
+    #Parse the command line
+    parser = argparse.ArgumentParser(
+      description="patch-apk - Pull and patch Android apps for use with objection/frida. Supports split APKs."
+    )
+    parser.add_argument("--no-enable-user-certs", help="Prevent patch-apk from enabling user-installed certificate support via network security config in the patched APK.", action="store_true")
+    parser.add_argument("--save-apk", help="Save a copy of the APK (or single APK) prior to patching for use with other tools. APK will be saved under the given name.")
+    parser.add_argument("--extract-only", help="Disable including objection and pushing modified APK to device.", action="store_true")
+    parser.add_argument("--disable-styles-hack", help="Disable the styles hack that removes duplicate entries from res/values/styles.xml.", action="store_true")
+    parser.add_argument("--debug-output", help="Enable debug output.", action="store_true")
+    parser.add_argument("pkgname", help="The name, or partial name, of the package to patch (e.g. com.foo.bar).")
+    
+    #Store the parsed args
+    getArgs.parsed_args = parser.parse_args()
+  
+  #Return the parsed command line args
+  return getArgs.parsed_args
 
 ####################
 # Debug print
 ####################
 def dbgPrint(msg):
-	if getArgs().debug_output == True:
-		print(msg)
+  if getArgs().debug_output == True:
+    print(msg)
 
 ####################
 # Get the stdout target for subprocess calls. Set to DEVNULL unless debug output is enabled.
 ####################
 def getStdout():
-	if getArgs().debug_output == True:
-		return None
-	else:
-		return subprocess.DEVNULL
+  if getArgs().debug_output == True:
+    return None
+  else:
+    return subprocess.DEVNULL
 
 ####################
 # Get objection version
 ####################
 def getObjectionVersion():
-	proc = subprocess.run(["objection", "version"], stdout=subprocess.PIPE)
-	return pkg_resources.parse_version(proc.stdout.decode("utf-8").strip().split(": ")[-1].strip())
+  proc = subprocess.run(["objection", "version"], stdout=subprocess.PIPE)
+  return pkg_resources.parse_version(proc.stdout.decode("utf-8").strip().split(": ")[-1].strip())
 
 ####################
 # Get apktool version
 ####################
 def getApktoolVersion():
-	proc = subprocess.run(["apktool", "-version"], stdout=subprocess.PIPE)
-	return pkg_resources.parse_version(proc.stdout.decode("utf-8").strip().split("-")[0].strip())
+  proc = subprocess.run(["apktool", "-version"], stdout=subprocess.PIPE)
+  return pkg_resources.parse_version(proc.stdout.decode("utf-8").strip().split("-")[0].strip())
 
 ####################
 # Wrapper to run apktool platform-independently, complete with a dirty hack to fix apktool's dirty hack.
 ####################
 def runApkTool(params):
-	if os.name == "nt":
-		args = ["apktool.bat"]
-		args.extend(params)
-		
-		#apktool.bat has a dirty hack that execute "pause", so we need a dirty hack to kill the pause command...
-		proc = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=getStdout())
-		proc.communicate(b"\r\n")
-		return proc
-	else:
-		args = ["apktool"]
-		args.extend(params)
-		return subprocess.run(args, stdout=getStdout())
+  if os.name == "nt":
+    args = ["apktool.bat"]
+    args.extend(params)
+    
+    #apktool.bat has a dirty hack that execute "pause", so we need a dirty hack to kill the pause command...
+    proc = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=getStdout())
+    proc.communicate(b"\r\n")
+    return proc
+  else:
+    args = ["apktool"]
+    args.extend(params)
+    return subprocess.run(args, stdout=getStdout())
 
 ####################
 # Build the APK
 ####################
 def build(baseapkdir):
-	if os.path.exists(os.path.join(baseapkdir, "res", "navigation")) == True:
-		print("[+] Found res/navigation directory, rebuilding with 'apktool --use-aapt2'.")
-		ret = runApkTool(["--use-aapt2", "b", baseapkdir])
-		if ret.returncode != 0:
-			print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
-			sys.exit(1)
-	elif getApktoolVersion() > pkg_resources.parse_version("2.4.2"):
-		print("[+] Found apktool version > 2.4.2, rebuilding with 'apktool --use-aapt2'.")
-		ret = runApkTool(["--use-aapt2", "b", baseapkdir])
-		if ret.returncode != 0:
-			print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
-			sys.exit(1)
-	else:
-		print("[+] Building APK with apktool.")
-		ret = runApkTool(["b", baseapkdir])
-		if ret.returncode != 0:
-			print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
-			sys.exit(1)
+  if os.path.exists(os.path.join(baseapkdir, "res", "navigation")) == True:
+    print("[+] Found res/navigation directory, rebuilding with 'apktool --use-aapt2'.")
+    ret = runApkTool(["--use-aapt2", "b", baseapkdir])
+    if ret.returncode != 0:
+      print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
+      sys.exit(1)
+  elif getApktoolVersion() > pkg_resources.parse_version("2.4.2"):
+    print("[+] Found apktool version > 2.4.2, rebuilding with 'apktool --use-aapt2'.")
+    ret = runApkTool(["--use-aapt2", "b", baseapkdir])
+    if ret.returncode != 0:
+      print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
+      sys.exit(1)
+  else:
+    print("[+] Building APK with apktool.")
+    ret = runApkTool(["b", baseapkdir])
+    if ret.returncode != 0:
+      print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
+      sys.exit(1)
 
 ####################
 # Sign the APK with apksigner and zip align
 # Fixes https://github.com/NickstaDB/patch-apk/issues/31 by no longer using jarsigner (V1 APK signatures)
 ####################
 def signAndZipAlign(baseapkdir, baseapkfilename):
-	#Zip align the new APK
-	print("[+] Zip aligning new APK.")
-	assertSubprocessSuccessfulRun(["zipalign", "-f", "4", os.path.join(baseapkdir, "dist", baseapkfilename),
-		os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk")], getStdout())
-	shutil.move(os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk"), os.path.join(baseapkdir, "dist", baseapkfilename))
+  #Zip align the new APK
+  print("[+] Zip aligning new APK.")
+  assertSubprocessSuccessfulRun(["zipalign", "-f", "4", os.path.join(baseapkdir, "dist", baseapkfilename),
+    os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk")], getStdout())
+  shutil.move(os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk"), os.path.join(baseapkdir, "dist", baseapkfilename))
 
-	#Sign the new APK
-	print("[+] Signing new APK.")
-	assertSubprocessSuccessfulRun(["apksigner", "sign", "--ks",
-		os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")), "--ks-pass",
-		"pass:patch-apk", "--ks-key-alias", "patch-apk-key", os.path.join(baseapkdir, "dist", baseapkfilename)],
-		getStdout())
+  #Sign the new APK
+  print("[+] Signing new APK.")
+  assertSubprocessSuccessfulRun(["apksigner", "sign", "--ks",
+    os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")), "--ks-pass",
+    "pass:patch-apk", "--ks-key-alias", "patch-apk-key", os.path.join(baseapkdir, "dist", baseapkfilename)],
+    getStdout())
 
 ####################
 # Verify the package name - checks whether the target package is installed
@@ -222,180 +222,180 @@ def signAndZipAlign(baseapkdir, baseapkfilename):
 # the user for selection.
 ####################
 def verifyPackageName(pkgname):
-	#Get a list of installed packages matching the given name
-	packages = []
-	proc = subprocess.run(["adb", "shell", "pm", "list", "packages"], stdout=subprocess.PIPE)
-	if proc.returncode != 0:
-		print("Error: Failed to run 'adb shell pm list packages'.")
-		sys.exit(1)
-	out = proc.stdout.decode("utf-8")
-	for line in out.split(os.linesep):
-		if line.startswith("package:"):
-			line = line[8:].strip()
-			if pkgname.lower() in line.lower():
-				packages.append(line)
-	
-	#Bail out if no matching packages were found
-	if len(packages) == 0:
-		print("Error, no packages found on the device matching the search term '" + pkgname + "'.")
-		print("Run 'adb shell pm list packages' to verify installed package names.")
-		sys.exit(1)
-	
-	#Return the target package name, offering a choice to the user if necessary
-	if len(packages) == 1:
-		return packages[0]
-	else:
-		print("Multiple matching packages installed, select the package to patch.")
-		choice = -1
-		while choice == -1:
-			for i in range(len(packages)):
-				print("[" + str(i + 1) + "] " + packages[i])
-			choice = input("Choice: ")
-			if choice.isnumeric() == False or int(choice) < 1 or int(choice) > len(packages):
-				print("Invalid choice.\n")
-				choice = -1
-		return packages[int(choice) - 1]
+  #Get a list of installed packages matching the given name
+  packages = []
+  proc = subprocess.run(["adb", "shell", "pm", "list", "packages"], stdout=subprocess.PIPE)
+  if proc.returncode != 0:
+    print("Error: Failed to run 'adb shell pm list packages'.")
+    sys.exit(1)
+  out = proc.stdout.decode("utf-8")
+  for line in out.split(os.linesep):
+    if line.startswith("package:"):
+      line = line[8:].strip()
+      if pkgname.lower() in line.lower():
+        packages.append(line)
+  
+  #Bail out if no matching packages were found
+  if len(packages) == 0:
+    print("Error, no packages found on the device matching the search term '" + pkgname + "'.")
+    print("Run 'adb shell pm list packages' to verify installed package names.")
+    sys.exit(1)
+  
+  #Return the target package name, offering a choice to the user if necessary
+  if len(packages) == 1:
+    return packages[0]
+  else:
+    print("Multiple matching packages installed, select the package to patch.")
+    choice = -1
+    while choice == -1:
+      for i in range(len(packages)):
+        print("[" + str(i + 1) + "] " + packages[i])
+      choice = input("Choice: ")
+      if choice.isnumeric() == False or int(choice) < 1 or int(choice) > len(packages):
+        print("Invalid choice.\n")
+        choice = -1
+    return packages[int(choice) - 1]
 
 ####################
 # Get the APK path(s) on the device for the given package name.
 ####################
 def getAPKPathsForPackage(pkgname):
-	print("\nGetting APK path(s) for package: " + pkgname)
-	paths = []
-	proc = subprocess.run(["adb", "shell", "pm", "path", pkgname], stdout=subprocess.PIPE)
-	if proc.returncode != 0:
-		print("Error: Failed to run 'adb shell pm path " + pkgname + "'.")
-		sys.exit(1)
-	out = proc.stdout.decode("utf-8")
-	for line in out.split(os.linesep):
-		if line.startswith("package:"):
-			line = line[8:].strip()
-			print("[+] APK path: " + line)
-			paths.append(line)
-	return paths
+  print("\nGetting APK path(s) for package: " + pkgname)
+  paths = []
+  proc = subprocess.run(["adb", "shell", "pm", "path", pkgname], stdout=subprocess.PIPE)
+  if proc.returncode != 0:
+    print("Error: Failed to run 'adb shell pm path " + pkgname + "'.")
+    sys.exit(1)
+  out = proc.stdout.decode("utf-8")
+  for line in out.split(os.linesep):
+    if line.startswith("package:"):
+      line = line[8:].strip()
+      print("[+] APK path: " + line)
+      paths.append(line)
+  return paths
 
 ####################
 # Pull the APK file(s) for the package and return the local file path to work with.
 # If the package is an app bundle/split APK, combine the APKs into a single APK.
 ####################
 def getTargetAPK(pkgname, apkpaths, tmppath, disableStylesHack, extract_only):
-	#Pull the APKs from the device
-	print("\nPulling APK file(s) from device.")
-	localapks = []
-	for remotepath in apkpaths:
-		baseapkname = remotepath.split('/')[-1]
-		localapks.append(os.path.join(tmppath, pkgname + "-" + baseapkname))
-		print("[+] Pulling: " + pkgname + "-" + baseapkname)
-		assertSubprocessSuccessfulRun(["adb", "pull", remotepath, localapks[-1]], getStdout())
-	
-	#Return the target APK path
-	if len(localapks) == 1:
-		return localapks[0]
-	else:
-		#Combine split APKs
-		return combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_only)
+  #Pull the APKs from the device
+  print("\nPulling APK file(s) from device.")
+  localapks = []
+  for remotepath in apkpaths:
+    baseapkname = remotepath.split('/')[-1]
+    localapks.append(os.path.join(tmppath, pkgname + "-" + baseapkname))
+    print("[+] Pulling: " + pkgname + "-" + baseapkname)
+    assertSubprocessSuccessfulRun(["adb", "pull", remotepath, localapks[-1]], getStdout())
+  
+  #Return the target APK path
+  if len(localapks) == 1:
+    return localapks[0]
+  else:
+    #Combine split APKs
+    return combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_only)
 
 ####################
 # Combine app bundles/split APKs into a single APK for patching.
 ####################
 def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_only):
-	print("\nApp bundle/split APK detected, rebuilding as a single APK.")
-	
-	#Extract the individual APKs
-	print("\nExtracting individual APKs with apktool.")
-	baseapkdir = os.path.join(tmppath, pkgname + "-base")
-	baseapkfilename = pkgname + "-base.apk"
-	splitapkpaths = []
-	for apkpath in localapks:
-		print("[+] Extracting: " + apkpath)
-		apkdir = apkpath[:-4]
-		ret = runApkTool(["d", apkpath, "-o", apkdir])
-		if ret.returncode != 0:
-			print("Error: Failed to run 'apktool d " + apkpath + " -o " + apkdir + "'.\nRun with --debug-output for more information.")
-			sys.exit(1)
-		
-		#Record the destination paths of all but the base APK
-		if apkpath.endswith("base.apk") == False:
-			splitapkpaths.append(apkdir)
-		
-		#Check for ProGuard/AndResGuard - this might b0rk decompile/recompile
-		if detectProGuard(apkdir):
-			print("\n[~] WARNING: Detected ProGuard/AndResGuard, decompile/recompile may not succeed.\n")
-	
-	#Walk the extracted APK directories and copy files and directories to the base APK
-	copySplitApkFiles(baseapkdir, splitapkpaths)
-	
-	#Fix public resource identifiers
-	fixPublicResourceIDs(baseapkdir, splitapkpaths)
-	
-	#Hack: Delete duplicate style resource entries.
-	if disableStylesHack == False:
-		hackRemoveDuplicateStyleEntries(baseapkdir)
-	
-	#Disable APK splitting in the base AndroidManifest.xml file
-	disableApkSplitting(baseapkdir)
+  print("\nApp bundle/split APK detected, rebuilding as a single APK.")
+  
+  #Extract the individual APKs
+  print("\nExtracting individual APKs with apktool.")
+  baseapkdir = os.path.join(tmppath, pkgname + "-base")
+  baseapkfilename = pkgname + "-base.apk"
+  splitapkpaths = []
+  for apkpath in localapks:
+    print("[+] Extracting: " + apkpath)
+    apkdir = apkpath[:-4]
+    ret = runApkTool(["d", apkpath, "-o", apkdir])
+    if ret.returncode != 0:
+      print("Error: Failed to run 'apktool d " + apkpath + " -o " + apkdir + "'.\nRun with --debug-output for more information.")
+      sys.exit(1)
+    
+    #Record the destination paths of all but the base APK
+    if apkpath.endswith("base.apk") == False:
+      splitapkpaths.append(apkdir)
+    
+    #Check for ProGuard/AndResGuard - this might b0rk decompile/recompile
+    if detectProGuard(apkdir):
+      print("\n[~] WARNING: Detected ProGuard/AndResGuard, decompile/recompile may not succeed.\n")
+  
+  #Walk the extracted APK directories and copy files and directories to the base APK
+  copySplitApkFiles(baseapkdir, splitapkpaths)
+  
+  #Fix public resource identifiers
+  fixPublicResourceIDs(baseapkdir, splitapkpaths)
+  
+  #Hack: Delete duplicate style resource entries.
+  if disableStylesHack == False:
+    hackRemoveDuplicateStyleEntries(baseapkdir)
+  
+  #Disable APK splitting in the base AndroidManifest.xml file
+  disableApkSplitting(baseapkdir)
 
-	#Fix untracked apktool bug where improperly escaped ampersands (&amp instead of &amp;) appear in strings.xml
-	rawREReplace(os.path.join(baseapkdir, "res", "values", "strings.xml"), r'(&amp)([^;])', r'\1;\2')
-	
-	#Rebuild the base APK
-	print("Rebuilding as a single APK.")
-	build(baseapkdir)
-	
-	# If only extracting, no need to sign / zipalign
-	if extract_only:
-		return os.path.join(baseapkdir, "dist", baseapkfilename)
-	
-	signAndZipAlign(baseapkdir, baseapkfilename)
-	
-	#Return the new APK path
-	return os.path.join(baseapkdir, "dist", baseapkfilename)
+  #Fix untracked apktool bug where improperly escaped ampersands (&amp instead of &amp;) appear in strings.xml
+  rawREReplace(os.path.join(baseapkdir, "res", "values", "strings.xml"), r'(&amp)([^;])', r'\1;\2')
+  
+  #Rebuild the base APK
+  print("Rebuilding as a single APK.")
+  build(baseapkdir)
+  
+  # If only extracting, no need to sign / zipalign
+  if extract_only:
+    return os.path.join(baseapkdir, "dist", baseapkfilename)
+  
+  signAndZipAlign(baseapkdir, baseapkfilename)
+  
+  #Return the new APK path
+  return os.path.join(baseapkdir, "dist", baseapkfilename)
 
 ####################
 # Attempt to detect ProGuard/AndResGuard.
 ####################
 def detectProGuard(extractedPath):
-	if os.path.exists(os.path.join(extractedPath, "original", "META-INF", "proguard")) == True:
-		return True
-	if os.path.exists(os.path.join(extractedPath, "original", "META-INF", "MANIFEST.MF")) == True:
-		fh = open(os.path.join(extractedPath, "original", "META-INF", "MANIFEST.MF"))
-		d = fh.read()
-		fh.close()
-		if "proguard" in d.lower():
-			return True
-	return False
+  if os.path.exists(os.path.join(extractedPath, "original", "META-INF", "proguard")) == True:
+    return True
+  if os.path.exists(os.path.join(extractedPath, "original", "META-INF", "MANIFEST.MF")) == True:
+    fh = open(os.path.join(extractedPath, "original", "META-INF", "MANIFEST.MF"))
+    d = fh.read()
+    fh.close()
+    if "proguard" in d.lower():
+      return True
+  return False
 
 ####################
 # Copy files and directories from split APKs into the base APK directory.
 ####################
 def copySplitApkFiles(baseapkdir, splitapkpaths):
-	print("\nCopying files and directories from split APKs into base APK.")
-	for apkdir in splitapkpaths:
-		for (root, dirs, files) in os.walk(apkdir):
-			#Skip the original files directory
-			if root.startswith(os.path.join(apkdir, "original")) == False:
-				#Create any missing directories
-				for d in dirs:
-					#Translate directory path to base APK path and create the directory if it doesn't exist
-					p = baseapkdir + os.path.join(root, d)[len(apkdir):]
-					if os.path.exists(p) == False:
-						dbgPrint("[+] Creating directory in base APK: " + p[len(baseapkdir):])
-						os.mkdir(p)
-				
-				#Copy files into the base APK
-				for f in files:
-					#Skip the AndroidManifest.xml and apktool.yml in the APK root directory
-					if apkdir == root and (f == "AndroidManifest.xml" or f == "apktool.yml"):
-						continue
-					
-					#Translate path to base APK
-					p = baseapkdir + os.path.join(root, f)[len(apkdir):]
-					
-					#Copy files into the base APK, except for XML files in the res directory
-					if f.lower().endswith(".xml") and p.startswith(os.path.join(baseapkdir, "res")):
-						continue
-					dbgPrint("[+] Moving file to base APK: " + p[len(baseapkdir):])
-					shutil.move(os.path.join(root, f), p)
+  print("\nCopying files and directories from split APKs into base APK.")
+  for apkdir in splitapkpaths:
+    for (root, dirs, files) in os.walk(apkdir):
+      #Skip the original files directory
+      if root.startswith(os.path.join(apkdir, "original")) == False:
+        #Create any missing directories
+        for d in dirs:
+          #Translate directory path to base APK path and create the directory if it doesn't exist
+          p = baseapkdir + os.path.join(root, d)[len(apkdir):]
+          if os.path.exists(p) == False:
+            dbgPrint("[+] Creating directory in base APK: " + p[len(baseapkdir):])
+            os.mkdir(p)
+        
+        #Copy files into the base APK
+        for f in files:
+          #Skip the AndroidManifest.xml and apktool.yml in the APK root directory
+          if apkdir == root and (f == "AndroidManifest.xml" or f == "apktool.yml"):
+            continue
+          
+          #Translate path to base APK
+          p = baseapkdir + os.path.join(root, f)[len(apkdir):]
+          
+          #Copy files into the base APK, except for XML files in the res directory
+          if f.lower().endswith(".xml") and p.startswith(os.path.join(baseapkdir, "res")):
+            continue
+          dbgPrint("[+] Moving file to base APK: " + p[len(baseapkdir):])
+          shutil.move(os.path.join(root, f), p)
 
 ####################
 # Fix public resource identifiers that are shared across split APKs.
@@ -404,102 +404,102 @@ def copySplitApkFiles(baseapkdir, splitapkpaths):
 # resource names.
 ####################
 def fixPublicResourceIDs(baseapkdir, splitapkpaths):
-	#Bail if the base APK does not have a public.xml
-	if os.path.exists(os.path.join(baseapkdir, "res", "values", "public.xml")) == False:
-		return
-	print("\nFound public.xml in the base APK, fixing resource identifiers across split APKs.")
-	
-	#Mappings of resource IDs and names
-	idToDummyName = {}
-	dummyNameToRealName = {}
-	
-	#Step 1) Find all resource IDs that apktool has assigned a name of APKTOOL_DUMMY_XXX to.
-	#        Load these into the lookup tables ready to resolve the real resource names from
-	#        the split APKs in step 2 below.
-	baseXmlTree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "res", "values", "public.xml"))
-	for el in baseXmlTree.getroot():
-		if "name" in el.attrib and "id" in el.attrib:
-			if el.attrib["name"].startswith("APKTOOL_DUMMY_") and el.attrib["name"] not in idToDummyName:
-				idToDummyName[el.attrib["id"]] = el.attrib["name"]
-				dummyNameToRealName[el.attrib["name"]] = None
-	print("[+] Resolving " + str(len(idToDummyName)) + " resource identifiers.")
-	
-	#Step 2) Parse the public.xml file from each split APK in search of resource IDs matching
-	#        those loaded during step 1. Each match gives the true resource name allowing us to
-	#        replace all APKTOOL_DUMMY_XXX resource names with the true resource names back in
-	#        the base APK.
-	found = 0
-	for splitdir in splitapkpaths:
-		if os.path.exists(os.path.join(splitdir, "res", "values", "public.xml")):
-			tree = xml.etree.ElementTree.parse(os.path.join(splitdir, "res", "values", "public.xml"))
-			for el in tree.getroot():
-				if "name" in el.attrib and "id" in el.attrib:
-					if el.attrib["id"] in idToDummyName:
-						dummyNameToRealName[idToDummyName[el.attrib["id"]]] = el.attrib["name"]
-						found += 1
-	print("[+] Located " + str(found) + " true resource names.")
-	
-	#Step 3) Update the base APK to replace all APKTOOL_DUMMY_XXX resource names with the true
-	#        resource name.
-	updated = 0
-	for el in baseXmlTree.getroot():
-		if "name" in el.attrib and "id" in el.attrib:
-			if el.attrib["name"] in dummyNameToRealName and dummyNameToRealName[el.attrib["name"]] is not None:
-				el.attrib["name"] = dummyNameToRealName[el.attrib["name"]]
-				updated += 1
-	baseXmlTree.write(os.path.join(baseapkdir, "res", "values", "public.xml"), encoding="utf-8", xml_declaration=True)
-	print("[+] Updated " + str(updated) + " dummy resource names with true names in the base APK.")
-	
-	#Step 4) Find all references to APKTOOL_DUMMY_XXX resources within other XML resource files
-	#        in the base APK and update them to refer to the true resource name.
-	updated = 0
-	for (root, dirs, files) in os.walk(os.path.join(baseapkdir, "res")):
-		for f in files:
-			if f.lower().endswith(".xml"):
-				try:
-					#Load the XML
-					xmlPath = os.path.join(root, f)
-					dbgPrint("[~] Parsing " + xmlPath)
-					tree = xml.etree.ElementTree.parse(xmlPath)
-					
-					#Register the namespaces and get the prefix for the "android" namespace
-					namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(baseapkdir, "AndroidManifest.xml"), events=["start-ns"])])
-					for ns in namespaces:
-						xml.etree.ElementTree.register_namespace(ns, namespaces[ns])
-					ns = "{" + namespaces["android"] + "}"
-					
-					#Update references to APKTOOL_DUMMY_XXX resources
-					changed = False
-					for el in tree.iter():
-						#Check for references to APKTOOL_DUMMY_XXX resources in attributes of this element
-						for attr in el.attrib:
-							val = el.attrib[attr]
-							if val.startswith("@") and "/" in val and val.split("/")[1].startswith("APKTOOL_DUMMY_") and dummyNameToRealName[val.split("/")[1]] is not None:
-								el.attrib[attr] = val.split("/")[0] + "/" + dummyNameToRealName[val.split("/")[1]]
-								updated += 1
-								changed = True
-							elif val.startswith("APKTOOL_DUMMY_") and dummyNameToRealName[val] is not None:
-								el.attrib[attr] = dummyNameToRealName[val]
-								updated += 1
-								changed = True
-							
-							#Fix for untracked bug where drawables are decoded without drawable values (@null)
-							if f == "drawables.xml" and attr == "name" and el.text is None:
-								el.text = "#000000ff"
-						
-						#Check for references to APKTOOL_DUMMY_XXX resources in the element text
-						val = el.text
-						if val is not None and val.startswith("@") and "/" in val and val.split("/")[1].startswith("APKTOOL_DUMMY_") and dummyNameToRealName[val.split("/")[1]] is not None:
-							el.text = val.split("/")[0] + "/" + dummyNameToRealName[val.split("/")[1]]
-							updated += 1
-							changed = True
-					
-					#Save the file if it was updated
-					if changed == True:
-						tree.write(os.path.join(root, f), encoding="utf-8", xml_declaration=True)
-				except xml.etree.ElementTree.ParseError:
-					print("[-] XML parse error in " + os.path.join(root, f) + ", skipping.")
-	print("[+] Updated " + str(updated) + " references to dummy resource names in the base APK.")
+  #Bail if the base APK does not have a public.xml
+  if os.path.exists(os.path.join(baseapkdir, "res", "values", "public.xml")) == False:
+    return
+  print("\nFound public.xml in the base APK, fixing resource identifiers across split APKs.")
+  
+  #Mappings of resource IDs and names
+  idToDummyName = {}
+  dummyNameToRealName = {}
+  
+  #Step 1) Find all resource IDs that apktool has assigned a name of APKTOOL_DUMMY_XXX to.
+  #        Load these into the lookup tables ready to resolve the real resource names from
+  #        the split APKs in step 2 below.
+  baseXmlTree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "res", "values", "public.xml"))
+  for el in baseXmlTree.getroot():
+    if "name" in el.attrib and "id" in el.attrib:
+      if el.attrib["name"].startswith("APKTOOL_DUMMY_") and el.attrib["name"] not in idToDummyName:
+        idToDummyName[el.attrib["id"]] = el.attrib["name"]
+        dummyNameToRealName[el.attrib["name"]] = None
+  print("[+] Resolving " + str(len(idToDummyName)) + " resource identifiers.")
+  
+  #Step 2) Parse the public.xml file from each split APK in search of resource IDs matching
+  #        those loaded during step 1. Each match gives the true resource name allowing us to
+  #        replace all APKTOOL_DUMMY_XXX resource names with the true resource names back in
+  #        the base APK.
+  found = 0
+  for splitdir in splitapkpaths:
+    if os.path.exists(os.path.join(splitdir, "res", "values", "public.xml")):
+      tree = xml.etree.ElementTree.parse(os.path.join(splitdir, "res", "values", "public.xml"))
+      for el in tree.getroot():
+        if "name" in el.attrib and "id" in el.attrib:
+          if el.attrib["id"] in idToDummyName:
+            dummyNameToRealName[idToDummyName[el.attrib["id"]]] = el.attrib["name"]
+            found += 1
+  print("[+] Located " + str(found) + " true resource names.")
+  
+  #Step 3) Update the base APK to replace all APKTOOL_DUMMY_XXX resource names with the true
+  #        resource name.
+  updated = 0
+  for el in baseXmlTree.getroot():
+    if "name" in el.attrib and "id" in el.attrib:
+      if el.attrib["name"] in dummyNameToRealName and dummyNameToRealName[el.attrib["name"]] is not None:
+        el.attrib["name"] = dummyNameToRealName[el.attrib["name"]]
+        updated += 1
+  baseXmlTree.write(os.path.join(baseapkdir, "res", "values", "public.xml"), encoding="utf-8", xml_declaration=True)
+  print("[+] Updated " + str(updated) + " dummy resource names with true names in the base APK.")
+  
+  #Step 4) Find all references to APKTOOL_DUMMY_XXX resources within other XML resource files
+  #        in the base APK and update them to refer to the true resource name.
+  updated = 0
+  for (root, dirs, files) in os.walk(os.path.join(baseapkdir, "res")):
+    for f in files:
+      if f.lower().endswith(".xml"):
+        try:
+          #Load the XML
+          xmlPath = os.path.join(root, f)
+          dbgPrint("[~] Parsing " + xmlPath)
+          tree = xml.etree.ElementTree.parse(xmlPath)
+          
+          #Register the namespaces and get the prefix for the "android" namespace
+          namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(baseapkdir, "AndroidManifest.xml"), events=["start-ns"])])
+          for ns in namespaces:
+            xml.etree.ElementTree.register_namespace(ns, namespaces[ns])
+          ns = "{" + namespaces["android"] + "}"
+          
+          #Update references to APKTOOL_DUMMY_XXX resources
+          changed = False
+          for el in tree.iter():
+            #Check for references to APKTOOL_DUMMY_XXX resources in attributes of this element
+            for attr in el.attrib:
+              val = el.attrib[attr]
+              if val.startswith("@") and "/" in val and val.split("/")[1].startswith("APKTOOL_DUMMY_") and dummyNameToRealName[val.split("/")[1]] is not None:
+                el.attrib[attr] = val.split("/")[0] + "/" + dummyNameToRealName[val.split("/")[1]]
+                updated += 1
+                changed = True
+              elif val.startswith("APKTOOL_DUMMY_") and dummyNameToRealName[val] is not None:
+                el.attrib[attr] = dummyNameToRealName[val]
+                updated += 1
+                changed = True
+              
+              #Fix for untracked bug where drawables are decoded without drawable values (@null)
+              if f == "drawables.xml" and attr == "name" and el.text is None:
+                el.text = "#000000ff"
+            
+            #Check for references to APKTOOL_DUMMY_XXX resources in the element text
+            val = el.text
+            if val is not None and val.startswith("@") and "/" in val and val.split("/")[1].startswith("APKTOOL_DUMMY_") and dummyNameToRealName[val.split("/")[1]] is not None:
+              el.text = val.split("/")[0] + "/" + dummyNameToRealName[val.split("/")[1]]
+              updated += 1
+              changed = True
+          
+          #Save the file if it was updated
+          if changed == True:
+            tree.write(os.path.join(root, f), encoding="utf-8", xml_declaration=True)
+        except xml.etree.ElementTree.ParseError:
+          print("[-] XML parse error in " + os.path.join(root, f) + ", skipping.")
+  print("[+] Updated " + str(updated) + " references to dummy resource names in the base APK.")
 
 ####################
 # Hack to remove duplicate style resource entries before rebuilding.
@@ -514,33 +514,33 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
 # This hack parses res/values/styles.xml, finds all offending elements, removes them, then saves the result.
 ####################
 def hackRemoveDuplicateStyleEntries(baseapkdir):
-	#Bail if there is no styles.xml
-	if os.path.exists(os.path.join(baseapkdir, "res", "values", "styles.xml")) == False:
-		return
-	print("\nFound styles.xml in the base APK, checking for duplicate <style> -> <item> elements and removing.")
-	print("[~] Warning: this is a complete hack and may impact the visuals of the app, disable with --disable-styles-hack.")
-	
-	#Duplicates
-	dupes = []
-	
-	#Parse styles.xml and find all <item> elements with duplicate names
-	tree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "res", "values", "styles.xml"))
-	for styleEl in tree.getroot().findall("style"):
-		itemNames = []
-		for itemEl in styleEl:
-			if "name" in itemEl.attrib and itemEl.attrib["name"] in itemNames:
-				dupes.append([styleEl, itemEl])
-			else:
-				itemNames.append(itemEl.attrib["name"])
-	
-	#Delete all duplicates from the tree
-	for dupe in dupes:
-		dupe[0].remove(dupe[1])
-	
-	#Save the result if any duplicates were found and removed
-	if len(dupes) > 0:
-		tree.write(os.path.join(baseapkdir, "res", "values", "styles.xml"), encoding="utf-8", xml_declaration=True)
-		print("[+] Removed " + str(len(dupes)) + " duplicate entries from styles.xml.")
+  #Bail if there is no styles.xml
+  if os.path.exists(os.path.join(baseapkdir, "res", "values", "styles.xml")) == False:
+    return
+  print("\nFound styles.xml in the base APK, checking for duplicate <style> -> <item> elements and removing.")
+  print("[~] Warning: this is a complete hack and may impact the visuals of the app, disable with --disable-styles-hack.")
+  
+  #Duplicates
+  dupes = []
+  
+  #Parse styles.xml and find all <item> elements with duplicate names
+  tree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "res", "values", "styles.xml"))
+  for styleEl in tree.getroot().findall("style"):
+    itemNames = []
+    for itemEl in styleEl:
+      if "name" in itemEl.attrib and itemEl.attrib["name"] in itemNames:
+        dupes.append([styleEl, itemEl])
+      else:
+        itemNames.append(itemEl.attrib["name"])
+  
+  #Delete all duplicates from the tree
+  for dupe in dupes:
+    dupe[0].remove(dupe[1])
+  
+  #Save the result if any duplicates were found and removed
+  if len(dupes) > 0:
+    tree.write(os.path.join(baseapkdir, "res", "values", "styles.xml"), encoding="utf-8", xml_declaration=True)
+    print("[+] Removed " + str(len(dupes)) + " duplicate entries from styles.xml.")
 
 ####################
 # Update AndroidManifest.xml to disable APK splitting.
@@ -549,93 +549,93 @@ def hackRemoveDuplicateStyleEntries(baseapkdir):
 # -> Removes meta-data elements with the name "com.android.vending.splits" or "com.android.vending.splits.required"
 ####################
 def disableApkSplitting(baseapkdir):
-	print("\nDisabling APK splitting in AndroidManifest.xml of base APK.")
-	
-	#Load AndroidManifest.xml
-	tree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "AndroidManifest.xml"))
-	
-	#Register the namespaces and get the prefix for the "android" namespace
-	namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(baseapkdir, "AndroidManifest.xml"), events=["start-ns"])])
-	for ns in namespaces:
-		xml.etree.ElementTree.register_namespace(ns, namespaces[ns])
-	ns = "{" + namespaces["android"] + "}"
-	
-	#Disable APK splitting
-	appEl = None
-	elsToRemove = []
-	for el in tree.iter():
-		if el.tag == "application":
-			appEl = el
-			if ns + "isSplitRequired" in el.attrib:
-				del el.attrib[ns + "isSplitRequired"]
-			if ns + "extractNativeLibs" in el.attrib:
-				el.attrib[ns + "extractNativeLibs"] = "true"
-		elif appEl is not None and el.tag == "meta-data":
-			if ns + "name" in el.attrib:
-				if el.attrib[ns + "name"] == "com.android.vending.splits.required":
-					elsToRemove.append(el)
-				elif el.attrib[ns + "name"] == "com.android.vending.splits":
-					elsToRemove.append(el)
-	for el in elsToRemove:
-		appEl.remove(el)
-	
-	#Save the updated AndroidManifest.xml
-	tree.write(os.path.join(baseapkdir, "AndroidManifest.xml"), encoding="utf-8", xml_declaration=True)
+  print("\nDisabling APK splitting in AndroidManifest.xml of base APK.")
+  
+  #Load AndroidManifest.xml
+  tree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "AndroidManifest.xml"))
+  
+  #Register the namespaces and get the prefix for the "android" namespace
+  namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(baseapkdir, "AndroidManifest.xml"), events=["start-ns"])])
+  for ns in namespaces:
+    xml.etree.ElementTree.register_namespace(ns, namespaces[ns])
+  ns = "{" + namespaces["android"] + "}"
+  
+  #Disable APK splitting
+  appEl = None
+  elsToRemove = []
+  for el in tree.iter():
+    if el.tag == "application":
+      appEl = el
+      if ns + "isSplitRequired" in el.attrib:
+        del el.attrib[ns + "isSplitRequired"]
+      if ns + "extractNativeLibs" in el.attrib:
+        el.attrib[ns + "extractNativeLibs"] = "true"
+    elif appEl is not None and el.tag == "meta-data":
+      if ns + "name" in el.attrib:
+        if el.attrib[ns + "name"] == "com.android.vending.splits.required":
+          elsToRemove.append(el)
+        elif el.attrib[ns + "name"] == "com.android.vending.splits":
+          elsToRemove.append(el)
+  for el in elsToRemove:
+    appEl.remove(el)
+  
+  #Save the updated AndroidManifest.xml
+  tree.write(os.path.join(baseapkdir, "AndroidManifest.xml"), encoding="utf-8", xml_declaration=True)
 
 ####################
 # Replace occurrences of a pattern in a file with a replacement pattern or function (a la re.sub)
 ####################
 def rawREReplace(path, pattern, replacement):
-	if os.path.exists(path):
-		contents = ""
-		with open(path, 'r') as file:
-			contents = file.read()
-		with open(path, 'w') as file:
-			file.write(re.sub(pattern, replacement, contents))
-	else:
-		print("\nError: Failed to find file at " + path + " for pattern replacement")
-		sys.exit(1)
+  if os.path.exists(path):
+    contents = ""
+    with open(path, 'r') as file:
+      contents = file.read()
+    with open(path, 'w') as file:
+      file.write(re.sub(pattern, replacement, contents))
+  else:
+    print("\nError: Failed to find file at " + path + " for pattern replacement")
+    sys.exit(1)
 
 ####################
 # Patch an APK to enable support for user-installed CA certs (e.g. Burp Suite CA cert).
 ####################
 def enableUserCerts(apkfile):
-	#Create a separate temp directory to work from
-	print("\nPatching APK to enable support for user-installed CA certificates.")
-	with tempfile.TemporaryDirectory() as tmppath:
-		#Extract the APK
-		apkdir = os.path.join(tmppath, apkfile.split(os.sep)[-1][:-4])
-		apkname = apkdir.split(os.sep)[-1] + ".apk"
-		ret = runApkTool(["d", apkfile, "-o", apkdir])
-		if ret.returncode != 0:
-			print("Error: Failed to run 'apktool d " + apkfile + " -o " + apkdir + "'.\nRun with --debug-output for more information.")
-			sys.exit(1)
-		
-		#Load AndroidManifest.xml and check for or create the networkSecurityConfig attribute
-		tree = xml.etree.ElementTree.parse(os.path.join(apkdir, "AndroidManifest.xml"))
-		namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(apkdir, "AndroidManifest.xml"), events=["start-ns"])])
-		for ns in namespaces:
-			xml.etree.ElementTree.register_namespace(ns, namespaces[ns])
-		ns = "{" + namespaces["android"] + "}"
-		for el in tree.findall("application"):
-			el.attrib[ns + "networkSecurityConfig"] = "@xml/network_security_config"
-		tree.write(os.path.join(apkdir, "AndroidManifest.xml"), encoding="utf-8", xml_declaration=True)
-		
-		#Create a network security config file
-		fh = open(os.path.join(apkdir, "res", "xml", "network_security_config.xml"), "wb")
-		fh.write("<?xml version=\"1.0\" encoding=\"utf-8\" ?><network-security-config><base-config><trust-anchors><certificates src=\"system\" /><certificates src=\"user\" /></trust-anchors></base-config></network-security-config>".encode("utf-8"))
-		fh.close()
-		
-		#Rebuild and sign the APK
-		build(apkdir) #Fix https://github.com/NickstaDB/patch-apk/issues/30
-		signAndZipAlign(apkdir, apkname)
+  #Create a separate temp directory to work from
+  print("\nPatching APK to enable support for user-installed CA certificates.")
+  with tempfile.TemporaryDirectory() as tmppath:
+    #Extract the APK
+    apkdir = os.path.join(tmppath, apkfile.split(os.sep)[-1][:-4])
+    apkname = apkdir.split(os.sep)[-1] + ".apk"
+    ret = runApkTool(["d", apkfile, "-o", apkdir])
+    if ret.returncode != 0:
+      print("Error: Failed to run 'apktool d " + apkfile + " -o " + apkdir + "'.\nRun with --debug-output for more information.")
+      sys.exit(1)
+    
+    #Load AndroidManifest.xml and check for or create the networkSecurityConfig attribute
+    tree = xml.etree.ElementTree.parse(os.path.join(apkdir, "AndroidManifest.xml"))
+    namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(apkdir, "AndroidManifest.xml"), events=["start-ns"])])
+    for ns in namespaces:
+      xml.etree.ElementTree.register_namespace(ns, namespaces[ns])
+    ns = "{" + namespaces["android"] + "}"
+    for el in tree.findall("application"):
+      el.attrib[ns + "networkSecurityConfig"] = "@xml/network_security_config"
+    tree.write(os.path.join(apkdir, "AndroidManifest.xml"), encoding="utf-8", xml_declaration=True)
+    
+    #Create a network security config file
+    fh = open(os.path.join(apkdir, "res", "xml", "network_security_config.xml"), "wb")
+    fh.write("<?xml version=\"1.0\" encoding=\"utf-8\" ?><network-security-config><base-config><trust-anchors><certificates src=\"system\" /><certificates src=\"user\" /></trust-anchors></base-config></network-security-config>".encode("utf-8"))
+    fh.close()
+    
+    #Rebuild and sign the APK
+    build(apkdir) #Fix https://github.com/NickstaDB/patch-apk/issues/30
+    signAndZipAlign(apkdir, apkname)
 
 ####################
 # Main
 ####################
 if __name__ == "__main__":
-	try:
-		main()
-	except KeyboardInterrupt:
-		sys.exit()
+  try:
+    main()
+  except KeyboardInterrupt:
+    sys.exit()
 

From 176a6d9d757c0e81dfd7d2bbe9ae07f13139fdde Mon Sep 17 00:00:00 2001
From: Jack Seigel <91229101+jseigelis@users.noreply.github.com>
Date: Tue, 8 Feb 2022 16:48:17 -0800
Subject: [PATCH 19/38] Update comment to include tracked issue

---
 patch-apk.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patch-apk.py b/patch-apk.py
index 7c8d62b..47743ad 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -335,7 +335,7 @@ def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_onl
   #Disable APK splitting in the base AndroidManifest.xml file
   disableApkSplitting(baseapkdir)
 
-  #Fix untracked apktool bug where improperly escaped ampersands (&amp instead of &amp;) appear in strings.xml
+  #Fix apktool bug where ampersands are improperly escaped: https://github.com/iBotPeaches/Apktool/issues/2703
   rawREReplace(os.path.join(baseapkdir, "res", "values", "strings.xml"), r'(&amp)([^;])', r'\1;\2')
   
   #Rebuild the base APK

From 04bbd7ed8752e27c44f31572ab1e48564956aa8c Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 11 Aug 2022 15:41:37 -0700
Subject: [PATCH 20/38] Fix private resources blocking builds

---
 patch-apk.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/patch-apk.py b/patch-apk.py
index 47743ad..39199bf 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -175,10 +175,27 @@ def runApkTool(params):
     args.extend(params)
     return subprocess.run(args, stdout=getStdout())
 
+####################
+# Fix private resources preventing builds (apktool wontfix: https://github.com/iBotPeaches/Apktool/issues/2761)
+####################
+def fixPrivateResources(baseapkdir):
+  print("\Forcing all private resources to be public")
+  updated = 0
+  for (root, dirs, files) in os.walk(os.path.join(baseapkdir, "res")):
+    for f in files:
+      if f.lower().endswith(".xml"):
+        rawREReplace(os.path.join(root, f), '@android', '@*android')
+        updated += 1
+  if updated > 0:
+    print("[+] Updated " + str(updated) + " private resources before building APK.")
+
 ####################
 # Build the APK
 ####################
 def build(baseapkdir):
+  #Fix private resources preventing builds (apktool wontfix: https://github.com/iBotPeaches/Apktool/issues/2761)
+  fixPrivateResources(baseapkdir)
+
   if os.path.exists(os.path.join(baseapkdir, "res", "navigation")) == True:
     print("[+] Found res/navigation directory, rebuilding with 'apktool --use-aapt2'.")
     ret = runApkTool(["--use-aapt2", "b", baseapkdir])

From 0ce0970623166dd019a76206de6d8e59a8bc085a Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 11 Aug 2022 15:42:24 -0700
Subject: [PATCH 21/38] Extra logging

---
 patch-apk.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/patch-apk.py b/patch-apk.py
index 39199bf..aed611a 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -353,6 +353,7 @@ def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_onl
   disableApkSplitting(baseapkdir)
 
   #Fix apktool bug where ampersands are improperly escaped: https://github.com/iBotPeaches/Apktool/issues/2703
+  print("\nFixing any improperly escaped ampersands.")
   rawREReplace(os.path.join(baseapkdir, "res", "values", "strings.xml"), r'(&amp)([^;])', r'\1;\2')
   
   #Rebuild the base APK
@@ -500,6 +501,9 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
                 updated += 1
                 changed = True
               
+              if changed:
+                dbgPrint("[~] Patching dummy apktool attribute \"" + attr + "\" value \"" + val + "\"" + (" -> \"" + el.attrib[attr] + "\"" if val != el.attrib[attr] else "") + " (" + str(updated) + ")")
+              
               #Fix for untracked bug where drawables are decoded without drawable values (@null)
               if f == "drawables.xml" and attr == "name" and el.text is None:
                 el.text = "#000000ff"
@@ -510,9 +514,11 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
               el.text = val.split("/")[0] + "/" + dummyNameToRealName[val.split("/")[1]]
               updated += 1
               changed = True
+              dbgPrint("[~] Patching dummy apktool element \"" + el.get('name', el.tag) + "\" value \"" + val + (" -> \"" + el.text + "\"" if val != el.text else "") + str(updated) + ")")
           
           #Save the file if it was updated
           if changed == True:
+            dbgPrint("[+] Writing patched " + f)
             tree.write(os.path.join(root, f), encoding="utf-8", xml_declaration=True)
         except xml.etree.ElementTree.ParseError:
           print("[-] XML parse error in " + os.path.join(root, f) + ", skipping.")

From 8ebb923476a20c37d7b50070e355963f74e61194 Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 11 Aug 2022 15:42:50 -0700
Subject: [PATCH 22/38] Use `NULL_DECODED_DRAWABLE_COLOR` const

---
 patch-apk.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/patch-apk.py b/patch-apk.py
index aed611a..0f65bbb 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -9,6 +9,8 @@
 import xml.etree.ElementTree
 import re
 
+NULL_DECODED_DRAWABLE_COLOR = "#000000ff"
+
 ####################
 # Main()
 ####################
@@ -506,7 +508,8 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
               
               #Fix for untracked bug where drawables are decoded without drawable values (@null)
               if f == "drawables.xml" and attr == "name" and el.text is None:
-                el.text = "#000000ff"
+                dbgPrint("[~] Patching null decoded drawable \"" + el.attrib[attr] + "\" (" + str(updated) + ")")
+                el.text = NULL_DECODED_DRAWABLE_COLOR
             
             #Check for references to APKTOOL_DUMMY_XXX resources in the element text
             val = el.text

From 7d300479445873af63cbac1e100c974036bed43a Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 11 Aug 2022 15:43:07 -0700
Subject: [PATCH 23/38] Smarter `rawREReplace`

---
 patch-apk.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index 0f65bbb..182d069 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -616,8 +616,11 @@ def rawREReplace(path, pattern, replacement):
     contents = ""
     with open(path, 'r') as file:
       contents = file.read()
-    with open(path, 'w') as file:
-      file.write(re.sub(pattern, replacement, contents))
+    newContents = re.sub(pattern, replacement, contents)
+    if (contents != newContents):
+      dbgPrint("\n[~] Patching " + path)
+      with open(path, 'w') as file:
+        file.write(newContents)
   else:
     print("\nError: Failed to find file at " + path + " for pattern replacement")
     sys.exit(1)

From bdc9afcda6b772ebcde606291fe3bc947bdf72f0 Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Thu, 11 Aug 2022 16:07:27 -0700
Subject: [PATCH 24/38] Supported version check disclaimer for this fork

---
 patch-apk.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/patch-apk.py b/patch-apk.py
index 182d069..ad03b7b 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -9,16 +9,21 @@
 import xml.etree.ElementTree
 import re
 
+SUPPORTED_VERSION = "2.5.0"
 NULL_DECODED_DRAWABLE_COLOR = "#000000ff"
 
 ####################
 # Main()
 ####################
 def main():
-  
   #Grab argz
   args = getArgs()
 
+  #Warn for unexpected version
+  apktoolVersion = getApktoolVersion()
+  if apktoolVersion != pkg_resources.parse_version(SUPPORTED_VERSION):
+    print("WARNING: currently installed apktool version " + apktoolVersion + " is not the same as what this version of this script is developed for (" + SUPPORTED_VERSION + "), you may suffer from build failures, bugs, and obsolete patches")
+
   #Check that dependencies are available
   checkDependencies(args.extract_only)
   

From 03e857be64afd121c1d74e0a6fc9fdb5270545af Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Tue, 1 Nov 2022 12:00:04 -0700
Subject: [PATCH 25/38] this was bothering me today

---
 patch-apk.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patch-apk.py b/patch-apk.py
index ad03b7b..6f063fc 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -186,7 +186,7 @@ def runApkTool(params):
 # Fix private resources preventing builds (apktool wontfix: https://github.com/iBotPeaches/Apktool/issues/2761)
 ####################
 def fixPrivateResources(baseapkdir):
-  print("\Forcing all private resources to be public")
+  print("Forcing all private resources to be public")
   updated = 0
   for (root, dirs, files) in os.walk(os.path.join(baseapkdir, "res")):
     for f in files:

From e8553b82fd10823888ac333e6f553b3407689c68 Mon Sep 17 00:00:00 2001
From: Jack Seigel <jseigel@invsys.co>
Date: Sun, 11 Dec 2022 18:02:31 -0800
Subject: [PATCH 26/38] style

---
 patch-apk.py | 190 +++++++++++++++++++++++++--------------------------
 1 file changed, 95 insertions(+), 95 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index 6f063fc..9e35f8a 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -16,29 +16,29 @@
 # Main()
 ####################
 def main():
-  #Grab argz
+  # Grab argz
   args = getArgs()
 
-  #Warn for unexpected version
+  # Warn for unexpected version
   apktoolVersion = getApktoolVersion()
   if apktoolVersion != pkg_resources.parse_version(SUPPORTED_VERSION):
     print("WARNING: currently installed apktool version " + apktoolVersion + " is not the same as what this version of this script is developed for (" + SUPPORTED_VERSION + "), you may suffer from build failures, bugs, and obsolete patches")
 
-  #Check that dependencies are available
+  # Check that dependencies are available
   checkDependencies(args.extract_only)
   
-  #Verify the package name and ensure it's installed (also supports partial package names)
+  # Verify the package name and ensure it's installed (also supports partial package names)
   pkgname = verifyPackageName(args.pkgname)
   
-  #Get the APK path(s) from the device
+  # Get the APK path(s) from the device
   apkpaths = getAPKPathsForPackage(pkgname)
   
-  #Create a temp directory to work from
+  # Create a temp directory to work from
   with tempfile.TemporaryDirectory() as tmppath:
-    #Get the APK to patch. Combine app bundles/split APKs into a single APK.
+    # Get the APK to patch. Combine app bundles/split APKs into a single APK.
     apkfile = getTargetAPK(pkgname, apkpaths, tmppath, args.disable_styles_hack, args.extract_only)
     
-    #Save the APK if requested
+    # Save the APK if requested
     if args.save_apk is not None or args.extract_only:
       targetName = args.save_apk if args.save_apk is not None else pkgname + ".apk"
       print("\nSaving a copy of the APK to " + targetName)
@@ -48,7 +48,7 @@ def main():
         os.remove(apkfile)
         return
     
-    #Patch the target APK with objection
+    # Patch the target APK with objection
     print("\nPatching " + apkfile.split(os.sep)[-1] + " with objection.")
     if getObjectionVersion() >= pkg_resources.parse_version("1.9.3"):
       assertSubprocessSuccessfulRun(["objection", "patchapk", "--skip-resources", "--ignore-nativelibs", "-s", apkfile], getStdout())
@@ -57,19 +57,19 @@ def main():
     os.remove(apkfile)
     shutil.move(apkfile[:-4] + ".objection.apk", apkfile)
     
-    #Enable support for user-installed CA certs (e.g. Burp Suite CA installed on device by user)
-    if args.no_enable_user_certs == False:
+    # Enable support for user-installed CA certs (e.g. Burp Suite CA installed on device by user)
+    if not args.no_enable_user_certs:
       enableUserCerts(apkfile)
     
-    #Uninstall the original package from the device
+    # Uninstall the original package from the device
     print("\nUninstalling the original package from the device.")
     assertSubprocessSuccessfulRun(["adb", "uninstall", pkgname], getStdout())
     
-    #Install the patched APK
+    # Install the patched APK
     print("\nInstalling the patched APK to the device.")
     assertSubprocessSuccessfulRun(["adb", "install", apkfile], getStdout())
     
-    #Done
+    # Done
     print("\nDone, cleaning up temporary files.")
 
 def assertSubprocessSuccessfulRun(args, stdout=subprocess.PIPE):
@@ -97,7 +97,7 @@ def checkDependencies(extract_only):
     print("Error, missing dependencies, ensure the following commands are available on the PATH: " + (", ".join(missing)))
     sys.exit(1)
   
-  #Verify that an Android device is connected
+  # Verify that an Android device is connected
   proc = subprocess.run(["adb", "devices"], stdout=subprocess.PIPE)
   if proc.returncode != 0:
     print("Error: Failed to run 'adb devices'.")
@@ -107,8 +107,8 @@ def checkDependencies(extract_only):
     print("Error, no Android device connected (\"adb devices\"), connect a device first.")
     sys.exit(1)
   
-  #Check that the included keystore exists
-  if os.path.exists(os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore"))) == False:
+  # Check that the included keystore exists
+  if not os.path.exists(os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore"))):
     print("Error, the keystore was not found at " + os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")) + ", please clone the repository or get the keystore file and place it at this location.")
     sys.exit(1)
 
@@ -116,9 +116,9 @@ def checkDependencies(extract_only):
 # Grab command line parameters
 ####################
 def getArgs():
-  #Only parse args once
+  # Only parse args once
   if not hasattr(getArgs, "parsed_args"):
-    #Parse the command line
+    # Parse the command line
     parser = argparse.ArgumentParser(
       description="patch-apk - Pull and patch Android apps for use with objection/frida. Supports split APKs."
     )
@@ -129,24 +129,24 @@ def getArgs():
     parser.add_argument("--debug-output", help="Enable debug output.", action="store_true")
     parser.add_argument("pkgname", help="The name, or partial name, of the package to patch (e.g. com.foo.bar).")
     
-    #Store the parsed args
+    # Store the parsed args
     getArgs.parsed_args = parser.parse_args()
   
-  #Return the parsed command line args
+  # Return the parsed command line args
   return getArgs.parsed_args
 
 ####################
 # Debug print
 ####################
 def dbgPrint(msg):
-  if getArgs().debug_output == True:
+  if getArgs().debug_output:
     print(msg)
 
 ####################
 # Get the stdout target for subprocess calls. Set to DEVNULL unless debug output is enabled.
 ####################
 def getStdout():
-  if getArgs().debug_output == True:
+  if getArgs().debug_output:
     return None
   else:
     return subprocess.DEVNULL
@@ -173,7 +173,7 @@ def runApkTool(params):
     args = ["apktool.bat"]
     args.extend(params)
     
-    #apktool.bat has a dirty hack that execute "pause", so we need a dirty hack to kill the pause command...
+    # apktool.bat has a dirty hack that execute "pause", so we need a dirty hack to kill the pause command...
     proc = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=getStdout())
     proc.communicate(b"\r\n")
     return proc
@@ -200,10 +200,10 @@ def fixPrivateResources(baseapkdir):
 # Build the APK
 ####################
 def build(baseapkdir):
-  #Fix private resources preventing builds (apktool wontfix: https://github.com/iBotPeaches/Apktool/issues/2761)
+  # Fix private resources preventing builds (apktool wontfix: https://github.com/iBotPeaches/Apktool/issues/2761)
   fixPrivateResources(baseapkdir)
 
-  if os.path.exists(os.path.join(baseapkdir, "res", "navigation")) == True:
+  if os.path.exists(os.path.join(baseapkdir, "res", "navigation")):
     print("[+] Found res/navigation directory, rebuilding with 'apktool --use-aapt2'.")
     ret = runApkTool(["--use-aapt2", "b", baseapkdir])
     if ret.returncode != 0:
@@ -227,13 +227,13 @@ def build(baseapkdir):
 # Fixes https://github.com/NickstaDB/patch-apk/issues/31 by no longer using jarsigner (V1 APK signatures)
 ####################
 def signAndZipAlign(baseapkdir, baseapkfilename):
-  #Zip align the new APK
+  # Zip align the new APK
   print("[+] Zip aligning new APK.")
   assertSubprocessSuccessfulRun(["zipalign", "-f", "4", os.path.join(baseapkdir, "dist", baseapkfilename),
     os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk")], getStdout())
   shutil.move(os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk"), os.path.join(baseapkdir, "dist", baseapkfilename))
 
-  #Sign the new APK
+  # Sign the new APK
   print("[+] Signing new APK.")
   assertSubprocessSuccessfulRun(["apksigner", "sign", "--ks",
     os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")), "--ks-pass",
@@ -246,7 +246,7 @@ def signAndZipAlign(baseapkdir, baseapkfilename):
 # the user for selection.
 ####################
 def verifyPackageName(pkgname):
-  #Get a list of installed packages matching the given name
+  # Get a list of installed packages matching the given name
   packages = []
   proc = subprocess.run(["adb", "shell", "pm", "list", "packages"], stdout=subprocess.PIPE)
   if proc.returncode != 0:
@@ -259,13 +259,13 @@ def verifyPackageName(pkgname):
       if pkgname.lower() in line.lower():
         packages.append(line)
   
-  #Bail out if no matching packages were found
+  # Bail out if no matching packages were found
   if len(packages) == 0:
     print("Error, no packages found on the device matching the search term '" + pkgname + "'.")
     print("Run 'adb shell pm list packages' to verify installed package names.")
     sys.exit(1)
   
-  #Return the target package name, offering a choice to the user if necessary
+  # Return the target package name, offering a choice to the user if necessary
   if len(packages) == 1:
     return packages[0]
   else:
@@ -275,7 +275,7 @@ def verifyPackageName(pkgname):
       for i in range(len(packages)):
         print("[" + str(i + 1) + "] " + packages[i])
       choice = input("Choice: ")
-      if choice.isnumeric() == False or int(choice) < 1 or int(choice) > len(packages):
+      if not choice.isnumeric() or int(choice) < 1 or int(choice) > len(packages):
         print("Invalid choice.\n")
         choice = -1
     return packages[int(choice) - 1]
@@ -303,7 +303,7 @@ def getAPKPathsForPackage(pkgname):
 # If the package is an app bundle/split APK, combine the APKs into a single APK.
 ####################
 def getTargetAPK(pkgname, apkpaths, tmppath, disableStylesHack, extract_only):
-  #Pull the APKs from the device
+  # Pull the APKs from the device
   print("\nPulling APK file(s) from device.")
   localapks = []
   for remotepath in apkpaths:
@@ -312,11 +312,11 @@ def getTargetAPK(pkgname, apkpaths, tmppath, disableStylesHack, extract_only):
     print("[+] Pulling: " + pkgname + "-" + baseapkname)
     assertSubprocessSuccessfulRun(["adb", "pull", remotepath, localapks[-1]], getStdout())
   
-  #Return the target APK path
+  # Return the target APK path
   if len(localapks) == 1:
     return localapks[0]
   else:
-    #Combine split APKs
+    # Combine split APKs
     return combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_only)
 
 ####################
@@ -325,7 +325,7 @@ def getTargetAPK(pkgname, apkpaths, tmppath, disableStylesHack, extract_only):
 def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_only):
   print("\nApp bundle/split APK detected, rebuilding as a single APK.")
   
-  #Extract the individual APKs
+  # Extract the individual APKs
   print("\nExtracting individual APKs with apktool.")
   baseapkdir = os.path.join(tmppath, pkgname + "-base")
   baseapkfilename = pkgname + "-base.apk"
@@ -338,32 +338,32 @@ def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_onl
       print("Error: Failed to run 'apktool d " + apkpath + " -o " + apkdir + "'.\nRun with --debug-output for more information.")
       sys.exit(1)
     
-    #Record the destination paths of all but the base APK
-    if apkpath.endswith("base.apk") == False:
+    # Record the destination paths of all but the base APK
+    if not apkpath.endswith("base.apk"):
       splitapkpaths.append(apkdir)
     
-    #Check for ProGuard/AndResGuard - this might b0rk decompile/recompile
+    # Check for ProGuard/AndResGuard - this might b0rk decompile/recompile
     if detectProGuard(apkdir):
       print("\n[~] WARNING: Detected ProGuard/AndResGuard, decompile/recompile may not succeed.\n")
   
-  #Walk the extracted APK directories and copy files and directories to the base APK
+  # Walk the extracted APK directories and copy files and directories to the base APK
   copySplitApkFiles(baseapkdir, splitapkpaths)
   
-  #Fix public resource identifiers
+  # Fix public resource identifiers
   fixPublicResourceIDs(baseapkdir, splitapkpaths)
   
-  #Hack: Delete duplicate style resource entries.
-  if disableStylesHack == False:
+  # Hack: Delete duplicate style resource entries.
+  if not disableStylesHack:
     hackRemoveDuplicateStyleEntries(baseapkdir)
   
   #Disable APK splitting in the base AndroidManifest.xml file
   disableApkSplitting(baseapkdir)
 
-  #Fix apktool bug where ampersands are improperly escaped: https://github.com/iBotPeaches/Apktool/issues/2703
+  # Fix apktool bug where ampersands are improperly escaped: https://github.com/iBotPeaches/Apktool/issues/2703
   print("\nFixing any improperly escaped ampersands.")
   rawREReplace(os.path.join(baseapkdir, "res", "values", "strings.xml"), r'(&amp)([^;])', r'\1;\2')
   
-  #Rebuild the base APK
+  # Rebuild the base APK
   print("Rebuilding as a single APK.")
   build(baseapkdir)
   
@@ -373,16 +373,16 @@ def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_onl
   
   signAndZipAlign(baseapkdir, baseapkfilename)
   
-  #Return the new APK path
+  # Return the new APK path
   return os.path.join(baseapkdir, "dist", baseapkfilename)
 
 ####################
 # Attempt to detect ProGuard/AndResGuard.
 ####################
 def detectProGuard(extractedPath):
-  if os.path.exists(os.path.join(extractedPath, "original", "META-INF", "proguard")) == True:
+  if os.path.exists(os.path.join(extractedPath, "original", "META-INF", "proguard")):
     return True
-  if os.path.exists(os.path.join(extractedPath, "original", "META-INF", "MANIFEST.MF")) == True:
+  if os.path.exists(os.path.join(extractedPath, "original", "META-INF", "MANIFEST.MF")):
     fh = open(os.path.join(extractedPath, "original", "META-INF", "MANIFEST.MF"))
     d = fh.read()
     fh.close()
@@ -397,26 +397,26 @@ def copySplitApkFiles(baseapkdir, splitapkpaths):
   print("\nCopying files and directories from split APKs into base APK.")
   for apkdir in splitapkpaths:
     for (root, dirs, files) in os.walk(apkdir):
-      #Skip the original files directory
-      if root.startswith(os.path.join(apkdir, "original")) == False:
-        #Create any missing directories
+      # Skip the original files directory
+      if not root.startswith(os.path.join(apkdir, "original")):
+        # Create any missing directories
         for d in dirs:
-          #Translate directory path to base APK path and create the directory if it doesn't exist
+          # Translate directory path to base APK path and create the directory if it doesn't exist
           p = baseapkdir + os.path.join(root, d)[len(apkdir):]
-          if os.path.exists(p) == False:
+          if not os.path.exists(p):
             dbgPrint("[+] Creating directory in base APK: " + p[len(baseapkdir):])
             os.mkdir(p)
         
-        #Copy files into the base APK
+        # Copy files into the base APK
         for f in files:
-          #Skip the AndroidManifest.xml and apktool.yml in the APK root directory
+          # Skip the AndroidManifest.xml and apktool.yml in the APK root directory
           if apkdir == root and (f == "AndroidManifest.xml" or f == "apktool.yml"):
             continue
           
-          #Translate path to base APK
+          # Translate path to base APK
           p = baseapkdir + os.path.join(root, f)[len(apkdir):]
           
-          #Copy files into the base APK, except for XML files in the res directory
+          # Copy files into the base APK, except for XML files in the res directory
           if f.lower().endswith(".xml") and p.startswith(os.path.join(baseapkdir, "res")):
             continue
           dbgPrint("[+] Moving file to base APK: " + p[len(baseapkdir):])
@@ -429,18 +429,18 @@ def copySplitApkFiles(baseapkdir, splitapkpaths):
 # resource names.
 ####################
 def fixPublicResourceIDs(baseapkdir, splitapkpaths):
-  #Bail if the base APK does not have a public.xml
-  if os.path.exists(os.path.join(baseapkdir, "res", "values", "public.xml")) == False:
+  # Bail if the base APK does not have a public.xml
+  if not os.path.exists(os.path.join(baseapkdir, "res", "values", "public.xml")):
     return
   print("\nFound public.xml in the base APK, fixing resource identifiers across split APKs.")
   
-  #Mappings of resource IDs and names
+  # Mappings of resource IDs and names
   idToDummyName = {}
   dummyNameToRealName = {}
   
-  #Step 1) Find all resource IDs that apktool has assigned a name of APKTOOL_DUMMY_XXX to.
-  #        Load these into the lookup tables ready to resolve the real resource names from
-  #        the split APKs in step 2 below.
+  # Step 1) Find all resource IDs that apktool has assigned a name of APKTOOL_DUMMY_XXX to.
+  #         Load these into the lookup tables ready to resolve the real resource names from
+  #         the split APKs in step 2 below.
   baseXmlTree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "res", "values", "public.xml"))
   for el in baseXmlTree.getroot():
     if "name" in el.attrib and "id" in el.attrib:
@@ -449,10 +449,10 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
         dummyNameToRealName[el.attrib["name"]] = None
   print("[+] Resolving " + str(len(idToDummyName)) + " resource identifiers.")
   
-  #Step 2) Parse the public.xml file from each split APK in search of resource IDs matching
-  #        those loaded during step 1. Each match gives the true resource name allowing us to
-  #        replace all APKTOOL_DUMMY_XXX resource names with the true resource names back in
-  #        the base APK.
+  # Step 2) Parse the public.xml file from each split APK in search of resource IDs matching
+  #         those loaded during step 1. Each match gives the true resource name allowing us to
+  #         replace all APKTOOL_DUMMY_XXX resource names with the true resource names back in
+  #         the base APK.
   found = 0
   for splitdir in splitapkpaths:
     if os.path.exists(os.path.join(splitdir, "res", "values", "public.xml")):
@@ -464,8 +464,8 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
             found += 1
   print("[+] Located " + str(found) + " true resource names.")
   
-  #Step 3) Update the base APK to replace all APKTOOL_DUMMY_XXX resource names with the true
-  #        resource name.
+  # Step 3) Update the base APK to replace all APKTOOL_DUMMY_XXX resource names with the true
+  #         resource name.
   updated = 0
   for el in baseXmlTree.getroot():
     if "name" in el.attrib and "id" in el.attrib:
@@ -475,28 +475,28 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
   baseXmlTree.write(os.path.join(baseapkdir, "res", "values", "public.xml"), encoding="utf-8", xml_declaration=True)
   print("[+] Updated " + str(updated) + " dummy resource names with true names in the base APK.")
   
-  #Step 4) Find all references to APKTOOL_DUMMY_XXX resources within other XML resource files
-  #        in the base APK and update them to refer to the true resource name.
+  # Step 4) Find all references to APKTOOL_DUMMY_XXX resources within other XML resource files
+  #         in the base APK and update them to refer to the true resource name.
   updated = 0
   for (root, dirs, files) in os.walk(os.path.join(baseapkdir, "res")):
     for f in files:
       if f.lower().endswith(".xml"):
         try:
-          #Load the XML
+          # Load the XML
           xmlPath = os.path.join(root, f)
           dbgPrint("[~] Parsing " + xmlPath)
           tree = xml.etree.ElementTree.parse(xmlPath)
           
-          #Register the namespaces and get the prefix for the "android" namespace
+          # Register the namespaces and get the prefix for the "android" namespace
           namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(baseapkdir, "AndroidManifest.xml"), events=["start-ns"])])
           for ns in namespaces:
             xml.etree.ElementTree.register_namespace(ns, namespaces[ns])
           ns = "{" + namespaces["android"] + "}"
           
-          #Update references to APKTOOL_DUMMY_XXX resources
+          # Update references to APKTOOL_DUMMY_XXX resources
           changed = False
           for el in tree.iter():
-            #Check for references to APKTOOL_DUMMY_XXX resources in attributes of this element
+            # Check for references to APKTOOL_DUMMY_XXX resources in attributes of this element
             for attr in el.attrib:
               val = el.attrib[attr]
               if val.startswith("@") and "/" in val and val.split("/")[1].startswith("APKTOOL_DUMMY_") and dummyNameToRealName[val.split("/")[1]] is not None:
@@ -511,12 +511,12 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
               if changed:
                 dbgPrint("[~] Patching dummy apktool attribute \"" + attr + "\" value \"" + val + "\"" + (" -> \"" + el.attrib[attr] + "\"" if val != el.attrib[attr] else "") + " (" + str(updated) + ")")
               
-              #Fix for untracked bug where drawables are decoded without drawable values (@null)
+              # Fix for untracked bug where drawables are decoded without drawable values (@null)
               if f == "drawables.xml" and attr == "name" and el.text is None:
                 dbgPrint("[~] Patching null decoded drawable \"" + el.attrib[attr] + "\" (" + str(updated) + ")")
                 el.text = NULL_DECODED_DRAWABLE_COLOR
             
-            #Check for references to APKTOOL_DUMMY_XXX resources in the element text
+            # Check for references to APKTOOL_DUMMY_XXX resources in the element text
             val = el.text
             if val is not None and val.startswith("@") and "/" in val and val.split("/")[1].startswith("APKTOOL_DUMMY_") and dummyNameToRealName[val.split("/")[1]] is not None:
               el.text = val.split("/")[0] + "/" + dummyNameToRealName[val.split("/")[1]]
@@ -524,8 +524,8 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
               changed = True
               dbgPrint("[~] Patching dummy apktool element \"" + el.get('name', el.tag) + "\" value \"" + val + (" -> \"" + el.text + "\"" if val != el.text else "") + str(updated) + ")")
           
-          #Save the file if it was updated
-          if changed == True:
+          # Save the file if it was updated
+          if changed:
             dbgPrint("[+] Writing patched " + f)
             tree.write(os.path.join(root, f), encoding="utf-8", xml_declaration=True)
         except xml.etree.ElementTree.ParseError:
@@ -545,16 +545,16 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
 # This hack parses res/values/styles.xml, finds all offending elements, removes them, then saves the result.
 ####################
 def hackRemoveDuplicateStyleEntries(baseapkdir):
-  #Bail if there is no styles.xml
-  if os.path.exists(os.path.join(baseapkdir, "res", "values", "styles.xml")) == False:
+  # Bail if there is no styles.xml
+  if not os.path.exists(os.path.join(baseapkdir, "res", "values", "styles.xml")):
     return
   print("\nFound styles.xml in the base APK, checking for duplicate <style> -> <item> elements and removing.")
   print("[~] Warning: this is a complete hack and may impact the visuals of the app, disable with --disable-styles-hack.")
   
-  #Duplicates
+  # Duplicates
   dupes = []
   
-  #Parse styles.xml and find all <item> elements with duplicate names
+  # Parse styles.xml and find all <item> elements with duplicate names
   tree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "res", "values", "styles.xml"))
   for styleEl in tree.getroot().findall("style"):
     itemNames = []
@@ -564,11 +564,11 @@ def hackRemoveDuplicateStyleEntries(baseapkdir):
       else:
         itemNames.append(itemEl.attrib["name"])
   
-  #Delete all duplicates from the tree
+  # Delete all duplicates from the tree
   for dupe in dupes:
     dupe[0].remove(dupe[1])
   
-  #Save the result if any duplicates were found and removed
+  # Save the result if any duplicates were found and removed
   if len(dupes) > 0:
     tree.write(os.path.join(baseapkdir, "res", "values", "styles.xml"), encoding="utf-8", xml_declaration=True)
     print("[+] Removed " + str(len(dupes)) + " duplicate entries from styles.xml.")
@@ -582,16 +582,16 @@ def hackRemoveDuplicateStyleEntries(baseapkdir):
 def disableApkSplitting(baseapkdir):
   print("\nDisabling APK splitting in AndroidManifest.xml of base APK.")
   
-  #Load AndroidManifest.xml
+  # Load AndroidManifest.xml
   tree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "AndroidManifest.xml"))
   
-  #Register the namespaces and get the prefix for the "android" namespace
+  # Register the namespaces and get the prefix for the "android" namespace
   namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(baseapkdir, "AndroidManifest.xml"), events=["start-ns"])])
   for ns in namespaces:
     xml.etree.ElementTree.register_namespace(ns, namespaces[ns])
   ns = "{" + namespaces["android"] + "}"
   
-  #Disable APK splitting
+  # Disable APK splitting
   appEl = None
   elsToRemove = []
   for el in tree.iter():
@@ -610,7 +610,7 @@ def disableApkSplitting(baseapkdir):
   for el in elsToRemove:
     appEl.remove(el)
   
-  #Save the updated AndroidManifest.xml
+  # Save the updated AndroidManifest.xml
   tree.write(os.path.join(baseapkdir, "AndroidManifest.xml"), encoding="utf-8", xml_declaration=True)
 
 ####################
@@ -634,10 +634,10 @@ def rawREReplace(path, pattern, replacement):
 # Patch an APK to enable support for user-installed CA certs (e.g. Burp Suite CA cert).
 ####################
 def enableUserCerts(apkfile):
-  #Create a separate temp directory to work from
+  # Create a separate temp directory to work from
   print("\nPatching APK to enable support for user-installed CA certificates.")
   with tempfile.TemporaryDirectory() as tmppath:
-    #Extract the APK
+    # Extract the APK
     apkdir = os.path.join(tmppath, apkfile.split(os.sep)[-1][:-4])
     apkname = apkdir.split(os.sep)[-1] + ".apk"
     ret = runApkTool(["d", apkfile, "-o", apkdir])
@@ -645,7 +645,7 @@ def enableUserCerts(apkfile):
       print("Error: Failed to run 'apktool d " + apkfile + " -o " + apkdir + "'.\nRun with --debug-output for more information.")
       sys.exit(1)
     
-    #Load AndroidManifest.xml and check for or create the networkSecurityConfig attribute
+    # Load AndroidManifest.xml and check for or create the networkSecurityConfig attribute
     tree = xml.etree.ElementTree.parse(os.path.join(apkdir, "AndroidManifest.xml"))
     namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(apkdir, "AndroidManifest.xml"), events=["start-ns"])])
     for ns in namespaces:
@@ -655,13 +655,13 @@ def enableUserCerts(apkfile):
       el.attrib[ns + "networkSecurityConfig"] = "@xml/network_security_config"
     tree.write(os.path.join(apkdir, "AndroidManifest.xml"), encoding="utf-8", xml_declaration=True)
     
-    #Create a network security config file
+    # Create a network security config file
     fh = open(os.path.join(apkdir, "res", "xml", "network_security_config.xml"), "wb")
     fh.write("<?xml version=\"1.0\" encoding=\"utf-8\" ?><network-security-config><base-config><trust-anchors><certificates src=\"system\" /><certificates src=\"user\" /></trust-anchors></base-config></network-security-config>".encode("utf-8"))
     fh.close()
     
-    #Rebuild and sign the APK
-    build(apkdir) #Fix https://github.com/NickstaDB/patch-apk/issues/30
+    # Rebuild and sign the APK
+    build(apkdir) # Fix https://github.com/NickstaDB/patch-apk/issues/30
     signAndZipAlign(apkdir, apkname)
 
 ####################

From 3536a06ac16ca0f9ece757d44ef50cc8bf097071 Mon Sep 17 00:00:00 2001
From: Jeroen Beckers <jbeckers@nviso.eu>
Date: Wed, 22 Feb 2023 16:19:48 +0100
Subject: [PATCH 27/38] Some refactoring

---
 patch-apk.py     | 1044 +++++++++++++++++++++++-----------------------
 requirements.txt |    2 +
 2 files changed, 534 insertions(+), 512 deletions(-)
 create mode 100644 requirements.txt

diff --git a/patch-apk.py b/patch-apk.py
index 9e35f8a..3906e9f 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -8,6 +8,8 @@
 import tempfile
 import xml.etree.ElementTree
 import re
+from progress.bar import Bar
+from termcolor import colored
 
 SUPPORTED_VERSION = "2.5.0"
 NULL_DECODED_DRAWABLE_COLOR = "#000000ff"
@@ -16,66 +18,65 @@
 # Main()
 ####################
 def main():
-  # Grab argz
-  args = getArgs()
-
-  # Warn for unexpected version
-  apktoolVersion = getApktoolVersion()
-  if apktoolVersion != pkg_resources.parse_version(SUPPORTED_VERSION):
-    print("WARNING: currently installed apktool version " + apktoolVersion + " is not the same as what this version of this script is developed for (" + SUPPORTED_VERSION + "), you may suffer from build failures, bugs, and obsolete patches")
-
-  # Check that dependencies are available
-  checkDependencies(args.extract_only)
-  
-  # Verify the package name and ensure it's installed (also supports partial package names)
-  pkgname = verifyPackageName(args.pkgname)
-  
-  # Get the APK path(s) from the device
-  apkpaths = getAPKPathsForPackage(pkgname)
-  
-  # Create a temp directory to work from
-  with tempfile.TemporaryDirectory() as tmppath:
-    # Get the APK to patch. Combine app bundles/split APKs into a single APK.
-    apkfile = getTargetAPK(pkgname, apkpaths, tmppath, args.disable_styles_hack, args.extract_only)
-    
-    # Save the APK if requested
-    if args.save_apk is not None or args.extract_only:
-      targetName = args.save_apk if args.save_apk is not None else pkgname + ".apk"
-      print("\nSaving a copy of the APK to " + targetName)
-      shutil.copy(apkfile, targetName)
-
-      if args.extract_only:
-        os.remove(apkfile)
-        return
-    
-    # Patch the target APK with objection
-    print("\nPatching " + apkfile.split(os.sep)[-1] + " with objection.")
-    if getObjectionVersion() >= pkg_resources.parse_version("1.9.3"):
-      assertSubprocessSuccessfulRun(["objection", "patchapk", "--skip-resources", "--ignore-nativelibs", "-s", apkfile], getStdout())
-    else:
-      assertSubprocessSuccessfulRun(["objection", "patchapk", "--skip-resources", "-s", apkfile], getStdout())
-    os.remove(apkfile)
-    shutil.move(apkfile[:-4] + ".objection.apk", apkfile)
-    
-    # Enable support for user-installed CA certs (e.g. Burp Suite CA installed on device by user)
-    if not args.no_enable_user_certs:
-      enableUserCerts(apkfile)
+    # Grab argz
+    args = getArgs()
+
+    # Warn for unexpected version
+    apktoolVersion = getApktoolVersion()
+    if apktoolVersion != pkg_resources.parse_version(SUPPORTED_VERSION):
+        warningPrint("WARNING: currently installed apktool version " + str(apktoolVersion) + " is not the same as what this version of this script is developed for (" + SUPPORTED_VERSION + "), you may suffer from build failures, bugs, and obsolete patches")
+
+    # Check that dependencies are available
+    checkDependencies(args.extract_only)
     
-    # Uninstall the original package from the device
-    print("\nUninstalling the original package from the device.")
-    assertSubprocessSuccessfulRun(["adb", "uninstall", pkgname], getStdout())
+    # Verify the package name and ensure it's installed (also supports partial package names)
+    pkgname = verifyPackageName(args.pkgname)
     
-    # Install the patched APK
-    print("\nInstalling the patched APK to the device.")
-    assertSubprocessSuccessfulRun(["adb", "install", apkfile], getStdout())
+    # Get the APK path(s) from the device
+    apkpaths = getAPKPathsForPackage(pkgname)
     
-    # Done
-    print("\nDone, cleaning up temporary files.")
+    # Create a temp directory to work from
+    with tempfile.TemporaryDirectory() as tmppath:
+        # Get the APK to patch. Combine app bundles/split APKs into a single APK.
+        apkfile = getTargetAPK(pkgname, apkpaths, tmppath, args.disable_styles_hack, args.extract_only)
+        
+        # Save the APK if requested
+        if args.save_apk is not None or args.extract_only:
+            targetName = args.save_apk if args.save_apk is not None else pkgname + ".apk"
+            print("\n[+] Saving a copy of the APK to " + targetName)
+            shutil.copy(apkfile, targetName)
+
+            if args.extract_only:
+                os.remove(apkfile)
+                return
+        
+        # Patch the target APK with objection
+        print("\n[+] Patching " + apkfile.split(os.sep)[-1] + " with objection.")
+        if getObjectionVersion() >= pkg_resources.parse_version("1.9.3"):
+            assertSubprocessSuccessfulRun(["objection", "patchapk", "--skip-resources", "--ignore-nativelibs", "-s", apkfile], getStdout())
+        else:
+            assertSubprocessSuccessfulRun(["objection", "patchapk", "--skip-resources", "-s", apkfile], getStdout())
+        os.remove(apkfile)
+        shutil.move(apkfile[:-4] + ".objection.apk", apkfile)
+        
+        # Enable support for user-installed CA certs (e.g. Burp Suite CA installed on device by user)
+        if not args.no_enable_user_certs:
+            enableUserCerts(apkfile)
+        
+        # Uninstall the original package from the device
+        print("\n[+] Uninstalling the original package from the device.")
+        assertSubprocessSuccessfulRun(["adb", "uninstall", pkgname], getStdout())
+        
+        # Install the patched APK
+        print("\n[+] Installing the patched APK to the device.")
+        # assertSubprocessSuccessfulRun(["adb", "install", apkfile], getStdout())
+        
+        # Done
+        print("\n[+] Done")
 
 def assertSubprocessSuccessfulRun(args, stdout=subprocess.PIPE):
-  if subprocess.run(args, stdout).returncode != 0:
-    print(f"Error: Failed to run {' '.join(args)}.\nRun with --debug-output for more information.")
-    sys.exit(1)
+    if subprocess.run(args, stdout=stdout).returncode != 0:
+        abort(f"Error: Failed to run {' '.join(args)}.\nRun with --debug-output for more information.")
 
 ####################
 # Check that required dependencies are present:
@@ -84,161 +85,163 @@ def assertSubprocessSuccessfulRun(args, stdout=subprocess.PIPE):
 # -> Keystore
 ####################
 def checkDependencies(extract_only):
-  deps = ["adb", "apktool", "aapt"]
+    deps = ["adb", "apktool", "aapt"]
 
-  if not extract_only:
-    deps += ["objection", "zipalign", "apksigner"]
+    if not extract_only:
+        deps += ["objection", "zipalign", "apksigner"]
 
-  missing = []
-  for dep in deps:
-    if shutil.which(dep) is None:
-      missing.append(dep)
-  if len(missing) > 0:
-    print("Error, missing dependencies, ensure the following commands are available on the PATH: " + (", ".join(missing)))
-    sys.exit(1)
-  
-  # Verify that an Android device is connected
-  proc = subprocess.run(["adb", "devices"], stdout=subprocess.PIPE)
-  if proc.returncode != 0:
-    print("Error: Failed to run 'adb devices'.")
-    sys.exit(1)
-  deviceOut = proc.stdout.decode("utf-8")
-  if len(deviceOut.strip().split(os.linesep)) == 1:
-    print("Error, no Android device connected (\"adb devices\"), connect a device first.")
-    sys.exit(1)
-  
-  # Check that the included keystore exists
-  if not os.path.exists(os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore"))):
-    print("Error, the keystore was not found at " + os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")) + ", please clone the repository or get the keystore file and place it at this location.")
-    sys.exit(1)
+    missing = []
+    for dep in deps:
+        if shutil.which(dep) is None:
+            missing.append(dep)
+    if len(missing) > 0:
+        abort("Error, missing dependencies, ensure the following commands are available on the PATH: " + (", ".join(missing)))
+    
+    # Verify that an Android device is connected
+    proc = subprocess.run(["adb", "devices"], stdout=subprocess.PIPE)
+    if proc.returncode != 0:
+        abort("Error: Failed to run 'adb devices'.")
+    deviceOut = proc.stdout.decode("utf-8")
+    if len(deviceOut.strip().split(os.linesep)) == 1:
+        abort("Error, no Android device connected (\"adb devices\"), connect a device first.")
+    
+    # Check that the included keystore exists
+    if not os.path.exists(os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore"))):
+        abort("Error, the keystore was not found at " + os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")) + ", please clone the repository or get the keystore file and place it at this location.")
 
 ####################
 # Grab command line parameters
 ####################
 def getArgs():
-  # Only parse args once
-  if not hasattr(getArgs, "parsed_args"):
-    # Parse the command line
-    parser = argparse.ArgumentParser(
-      description="patch-apk - Pull and patch Android apps for use with objection/frida. Supports split APKs."
-    )
-    parser.add_argument("--no-enable-user-certs", help="Prevent patch-apk from enabling user-installed certificate support via network security config in the patched APK.", action="store_true")
-    parser.add_argument("--save-apk", help="Save a copy of the APK (or single APK) prior to patching for use with other tools. APK will be saved under the given name.")
-    parser.add_argument("--extract-only", help="Disable including objection and pushing modified APK to device.", action="store_true")
-    parser.add_argument("--disable-styles-hack", help="Disable the styles hack that removes duplicate entries from res/values/styles.xml.", action="store_true")
-    parser.add_argument("--debug-output", help="Enable debug output.", action="store_true")
-    parser.add_argument("pkgname", help="The name, or partial name, of the package to patch (e.g. com.foo.bar).")
-    
-    # Store the parsed args
-    getArgs.parsed_args = parser.parse_args()
-  
-  # Return the parsed command line args
-  return getArgs.parsed_args
+    # Only parse args once
+    if not hasattr(getArgs, "parsed_args"):
+        # Parse the command line
+        parser = argparse.ArgumentParser(
+            description="patch-apk - Pull and patch Android apps for use with objection/frida. Supports split APKs."
+        )
+        parser.add_argument("--no-enable-user-certs", help="Prevent patch-apk from enabling user-installed certificate support via network security config in the patched APK.", action="store_true")
+        parser.add_argument("--save-apk", help="Save a copy of the APK (or single APK) prior to patching for use with other tools. APK will be saved under the given name.")
+        parser.add_argument("--extract-only", help="Disable including objection and pushing modified APK to device.", action="store_true")
+        parser.add_argument("--disable-styles-hack", help="Disable the styles hack that removes duplicate entries from res/values/styles.xml.", action="store_true")
+        parser.add_argument("--debug-output", help="Enable debug output.", action="store_true")
+        parser.add_argument("-v", "--verbose", help="Enable verbose output.", action="store_true")
+        parser.add_argument("pkgname", help="The name, or partial name, of the package to patch (e.g. com.foo.bar).")
+        
+        # Store the parsed args
+        getArgs.parsed_args = parser.parse_args()
+    
+    # Return the parsed command line args
+    return getArgs.parsed_args
 
 ####################
 # Debug print
 ####################
 def dbgPrint(msg):
-  if getArgs().debug_output:
-    print(msg)
+    if getArgs().debug_output:
+        print(msg)
+
+####################
+# Warning print
+####################
+def warningPrint(msg):
+    print(colored(msg, "yellow"))
+
+####################
+# Abort will print given error message and exit the app
+####################
+def abort(msg):
+    print(colored(msg, "red"))
+    sys.exit(1)
 
 ####################
 # Get the stdout target for subprocess calls. Set to DEVNULL unless debug output is enabled.
 ####################
 def getStdout():
-  if getArgs().debug_output:
-    return None
-  else:
-    return subprocess.DEVNULL
+    if getArgs().debug_output:
+        return None
+    else:
+        return subprocess.DEVNULL
 
 ####################
 # Get objection version
 ####################
 def getObjectionVersion():
-  proc = subprocess.run(["objection", "version"], stdout=subprocess.PIPE)
-  return pkg_resources.parse_version(proc.stdout.decode("utf-8").strip().split(": ")[-1].strip())
+    proc = subprocess.run(["objection", "version"], stdout=subprocess.PIPE)
+    return pkg_resources.parse_version(proc.stdout.decode("utf-8").strip().split(": ")[-1].strip())
 
 ####################
 # Get apktool version
 ####################
 def getApktoolVersion():
-  proc = subprocess.run(["apktool", "-version"], stdout=subprocess.PIPE)
-  return pkg_resources.parse_version(proc.stdout.decode("utf-8").strip().split("-")[0].strip())
+    proc = subprocess.run(["apktool", "-version"], stdout=subprocess.PIPE)
+    return pkg_resources.parse_version(proc.stdout.decode("utf-8").strip().split("-")[0].strip())
 
 ####################
 # Wrapper to run apktool platform-independently, complete with a dirty hack to fix apktool's dirty hack.
 ####################
 def runApkTool(params):
-  if os.name == "nt":
-    args = ["apktool.bat"]
-    args.extend(params)
-    
-    # apktool.bat has a dirty hack that execute "pause", so we need a dirty hack to kill the pause command...
-    proc = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=getStdout())
-    proc.communicate(b"\r\n")
-    return proc
-  else:
-    args = ["apktool"]
-    args.extend(params)
-    return subprocess.run(args, stdout=getStdout())
+    if os.name == "nt":
+        args = ["apktool.bat"]
+        args.extend(params)
+        
+        # apktool.bat has a dirty hack that execute "pause", so we need a dirty hack to kill the pause command...
+        proc = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=getStdout())
+        proc.communicate(b"\r\n")
+        return proc
+    else:
+        args = ["apktool"]
+        args.extend(params)
+        return subprocess.run(args, stdout=getStdout())
 
 ####################
 # Fix private resources preventing builds (apktool wontfix: https://github.com/iBotPeaches/Apktool/issues/2761)
 ####################
 def fixPrivateResources(baseapkdir):
-  print("Forcing all private resources to be public")
-  updated = 0
-  for (root, dirs, files) in os.walk(os.path.join(baseapkdir, "res")):
-    for f in files:
-      if f.lower().endswith(".xml"):
-        rawREReplace(os.path.join(root, f), '@android', '@*android')
-        updated += 1
-  if updated > 0:
-    print("[+] Updated " + str(updated) + " private resources before building APK.")
+    print("\n[+] Forcing all private resources to be public")
+    updated = 0
+    for (root, dirs, files) in os.walk(os.path.join(baseapkdir, "res")):
+        for f in files:
+            if f.lower().endswith(".xml"):
+                rawREReplace(os.path.join(root, f), '@android', '@*android')
+                updated += 1
+    if updated > 0:
+        verbosePrint("Updated " + str(updated) + " private resources before building APK.")
 
 ####################
 # Build the APK
 ####################
 def build(baseapkdir):
-  # Fix private resources preventing builds (apktool wontfix: https://github.com/iBotPeaches/Apktool/issues/2761)
-  fixPrivateResources(baseapkdir)
-
-  if os.path.exists(os.path.join(baseapkdir, "res", "navigation")):
-    print("[+] Found res/navigation directory, rebuilding with 'apktool --use-aapt2'.")
-    ret = runApkTool(["--use-aapt2", "b", baseapkdir])
-    if ret.returncode != 0:
-      print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
-      sys.exit(1)
-  elif getApktoolVersion() > pkg_resources.parse_version("2.4.2"):
-    print("[+] Found apktool version > 2.4.2, rebuilding with 'apktool --use-aapt2'.")
-    ret = runApkTool(["--use-aapt2", "b", baseapkdir])
-    if ret.returncode != 0:
-      print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
-      sys.exit(1)
-  else:
-    print("[+] Building APK with apktool.")
-    ret = runApkTool(["b", baseapkdir])
-    if ret.returncode != 0:
-      print("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
-      sys.exit(1)
+    # Fix private resources preventing builds (apktool wontfix: https://github.com/iBotPeaches/Apktool/issues/2761)
+    fixPrivateResources(baseapkdir)
+
+    if os.path.exists(os.path.join(baseapkdir, "res", "navigation")) or getApktoolVersion() > pkg_resources.parse_version("2.4.2"):
+        print("\n[+] Rebuilding with 'apktool --use-aapt2'.")
+        ret = runApkTool(["--use-aapt2", "b", baseapkdir])
+        if ret.returncode != 0:
+            abort("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
+    else:
+        print("\n[+] Rebuilding APK with apktool.")
+        ret = runApkTool(["b", baseapkdir])
+        if ret.returncode != 0:
+            abort("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
 
 ####################
 # Sign the APK with apksigner and zip align
 # Fixes https://github.com/NickstaDB/patch-apk/issues/31 by no longer using jarsigner (V1 APK signatures)
 ####################
 def signAndZipAlign(baseapkdir, baseapkfilename):
-  # Zip align the new APK
-  print("[+] Zip aligning new APK.")
-  assertSubprocessSuccessfulRun(["zipalign", "-f", "4", os.path.join(baseapkdir, "dist", baseapkfilename),
-    os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk")], getStdout())
-  shutil.move(os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk"), os.path.join(baseapkdir, "dist", baseapkfilename))
+    # Zip align the new APK
+    print("\n[+] Zip aligning new APK.")
+    assertSubprocessSuccessfulRun(["zipalign", "-f", "4", os.path.join(baseapkdir, "dist", baseapkfilename),
+        os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk")], getStdout())
+    shutil.move(os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk"), os.path.join(baseapkdir, "dist", baseapkfilename))
 
-  # Sign the new APK
-  print("[+] Signing new APK.")
-  assertSubprocessSuccessfulRun(["apksigner", "sign", "--ks",
-    os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")), "--ks-pass",
-    "pass:patch-apk", "--ks-key-alias", "patch-apk-key", os.path.join(baseapkdir, "dist", baseapkfilename)],
-    getStdout())
+    # Sign the new APK
+    print("\n[+] Signing new APK.")
+    assertSubprocessSuccessfulRun(["apksigner", "sign", "--ks",
+        os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")), "--ks-pass",
+        "pass:patch-apk", "--ks-key-alias", "patch-apk-key", os.path.join(baseapkdir, "dist", baseapkfilename)],
+        getStdout())
 
 ####################
 # Verify the package name - checks whether the target package is installed
@@ -246,181 +249,200 @@ def signAndZipAlign(baseapkdir, baseapkfilename):
 # the user for selection.
 ####################
 def verifyPackageName(pkgname):
-  # Get a list of installed packages matching the given name
-  packages = []
-  proc = subprocess.run(["adb", "shell", "pm", "list", "packages"], stdout=subprocess.PIPE)
-  if proc.returncode != 0:
-    print("Error: Failed to run 'adb shell pm list packages'.")
-    sys.exit(1)
-  out = proc.stdout.decode("utf-8")
-  for line in out.split(os.linesep):
-    if line.startswith("package:"):
-      line = line[8:].strip()
-      if pkgname.lower() in line.lower():
-        packages.append(line)
-  
-  # Bail out if no matching packages were found
-  if len(packages) == 0:
-    print("Error, no packages found on the device matching the search term '" + pkgname + "'.")
-    print("Run 'adb shell pm list packages' to verify installed package names.")
-    sys.exit(1)
-  
-  # Return the target package name, offering a choice to the user if necessary
-  if len(packages) == 1:
-    return packages[0]
-  else:
-    print("Multiple matching packages installed, select the package to patch.")
-    choice = -1
-    while choice == -1:
-      for i in range(len(packages)):
-        print("[" + str(i + 1) + "] " + packages[i])
-      choice = input("Choice: ")
-      if not choice.isnumeric() or int(choice) < 1 or int(choice) > len(packages):
-        print("Invalid choice.\n")
+    # Get a list of installed packages matching the given name
+    packages = []
+    proc = subprocess.run(["adb", "shell", "pm", "list", "packages"], stdout=subprocess.PIPE)
+    if proc.returncode != 0:
+        abort("Error: Failed to run 'adb shell pm list packages'.")
+    out = proc.stdout.decode("utf-8")
+    for line in out.split(os.linesep):
+        if line.startswith("package:"):
+            line = line[8:].strip()
+            if pkgname.lower() in line.lower():
+                packages.append(line)
+    
+    # Bail out if no matching packages were found
+    if len(packages) == 0:
+        abort("Error, no packages found on the device matching the search term '" + pkgname + "'.\nRun 'adb shell pm list packages' to verify installed package names.")
+    
+    # Return the target package name, offering a choice to the user if necessary
+    if len(packages) == 1:
+        return packages[0]
+    else:
+        warningPrint("\n[!] Multiple matching packages installed, select the package to patch.\n")
         choice = -1
-    return packages[int(choice) - 1]
+        while choice == -1:
+            for i in range(len(packages)):
+                print("[" + str(i + 1) + "] " + packages[i])
+            choice = input("Choice: ")
+            if not choice.isnumeric() or int(choice) < 1 or int(choice) > len(packages):
+                print("Invalid choice.\n")
+                choice = -1
+        return packages[int(choice) - 1]
 
 ####################
 # Get the APK path(s) on the device for the given package name.
 ####################
 def getAPKPathsForPackage(pkgname):
-  print("\nGetting APK path(s) for package: " + pkgname)
-  paths = []
-  proc = subprocess.run(["adb", "shell", "pm", "path", pkgname], stdout=subprocess.PIPE)
-  if proc.returncode != 0:
-    print("Error: Failed to run 'adb shell pm path " + pkgname + "'.")
-    sys.exit(1)
-  out = proc.stdout.decode("utf-8")
-  for line in out.split(os.linesep):
-    if line.startswith("package:"):
-      line = line[8:].strip()
-      print("[+] APK path: " + line)
-      paths.append(line)
-  return paths
+    print("\n[+] Retrieving APK path(s) for package: " + pkgname)
+    paths = []
+    proc = subprocess.run(["adb", "shell", "pm", "path", pkgname], stdout=subprocess.PIPE)
+    if proc.returncode != 0:
+        abort("Error: Failed to run 'adb shell pm path " + pkgname + "'.")
+    out = proc.stdout.decode("utf-8")
+
+    for line in out.split(os.linesep):
+        if line.startswith("package:"):
+            line = line[8:].strip()
+            verbosePrint("APK path: " + line)
+            paths.append(line)
+
+    return paths
 
 ####################
 # Pull the APK file(s) for the package and return the local file path to work with.
 # If the package is an app bundle/split APK, combine the APKs into a single APK.
 ####################
 def getTargetAPK(pkgname, apkpaths, tmppath, disableStylesHack, extract_only):
-  # Pull the APKs from the device
-  print("\nPulling APK file(s) from device.")
-  localapks = []
-  for remotepath in apkpaths:
-    baseapkname = remotepath.split('/')[-1]
-    localapks.append(os.path.join(tmppath, pkgname + "-" + baseapkname))
-    print("[+] Pulling: " + pkgname + "-" + baseapkname)
-    assertSubprocessSuccessfulRun(["adb", "pull", remotepath, localapks[-1]], getStdout())
-  
-  # Return the target APK path
-  if len(localapks) == 1:
-    return localapks[0]
-  else:
-    # Combine split APKs
-    return combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_only)
+    # Pull the APKs from the device
+    print("")
+    bar = Bar('[+] Pulling APK file(s) from device', max=len(apkpaths))
+    verboseOutput = ""
+
+    localapks = []
+    for remotepath in apkpaths:
+        baseapkname = remotepath.split('/')[-1]
+        localapks.append(os.path.join(tmppath, pkgname + "-" + baseapkname))
+        verboseOutput += f"Pulled: {pkgname}-{baseapkname}\n"
+        bar.next()
+        # assertSubprocessSuccessfulRun(["adb", "pull", remotepath, localapks[-1]], getStdout())
+        assertSubprocessSuccessfulRun(["adb", "pull", remotepath, localapks[-1]], getStdout() )
+    
+    bar.finish()
+    verbosePrint(verboseOutput)
+
+    # Return the target APK path
+    if len(localapks) == 1:
+        return localapks[0]
+    else:
+        # Combine split APKs
+        return combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_only)
+
+def verbosePrint(msg):
+    if getArgs().verbose:
+        for line in msg.split("\n"):
+            print(colored("\t" + line, "light_grey"))
 
 ####################
 # Combine app bundles/split APKs into a single APK for patching.
 ####################
 def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_only):
-  print("\nApp bundle/split APK detected, rebuilding as a single APK.")
-  
-  # Extract the individual APKs
-  print("\nExtracting individual APKs with apktool.")
-  baseapkdir = os.path.join(tmppath, pkgname + "-base")
-  baseapkfilename = pkgname + "-base.apk"
-  splitapkpaths = []
-  for apkpath in localapks:
-    print("[+] Extracting: " + apkpath)
-    apkdir = apkpath[:-4]
-    ret = runApkTool(["d", apkpath, "-o", apkdir])
-    if ret.returncode != 0:
-      print("Error: Failed to run 'apktool d " + apkpath + " -o " + apkdir + "'.\nRun with --debug-output for more information.")
-      sys.exit(1)
-    
-    # Record the destination paths of all but the base APK
-    if not apkpath.endswith("base.apk"):
-      splitapkpaths.append(apkdir)
-    
-    # Check for ProGuard/AndResGuard - this might b0rk decompile/recompile
-    if detectProGuard(apkdir):
-      print("\n[~] WARNING: Detected ProGuard/AndResGuard, decompile/recompile may not succeed.\n")
-  
-  # Walk the extracted APK directories and copy files and directories to the base APK
-  copySplitApkFiles(baseapkdir, splitapkpaths)
-  
-  # Fix public resource identifiers
-  fixPublicResourceIDs(baseapkdir, splitapkpaths)
-  
-  # Hack: Delete duplicate style resource entries.
-  if not disableStylesHack:
-    hackRemoveDuplicateStyleEntries(baseapkdir)
-  
-  #Disable APK splitting in the base AndroidManifest.xml file
-  disableApkSplitting(baseapkdir)
-
-  # Fix apktool bug where ampersands are improperly escaped: https://github.com/iBotPeaches/Apktool/issues/2703
-  print("\nFixing any improperly escaped ampersands.")
-  rawREReplace(os.path.join(baseapkdir, "res", "values", "strings.xml"), r'(&amp)([^;])', r'\1;\2')
-  
-  # Rebuild the base APK
-  print("Rebuilding as a single APK.")
-  build(baseapkdir)
-  
-  # If only extracting, no need to sign / zipalign
-  if extract_only:
+    warningPrint("\n[!] App bundle/split APK detected, rebuilding as a single APK.")
+    
+    # Extract the individual APKs
+    baseapkdir = os.path.join(tmppath, pkgname + "-base")
+    baseapkfilename = pkgname + "-base.apk"
+    splitapkpaths = []
+
+    print("")
+    bar = Bar('[+] Disassembling split APKs', max=len(localapks))
+    verboseOutput = ""
+    
+    for apkpath in localapks:
+        verboseOutput += "\nExtracted: " + apkpath
+        bar.next()
+        apkdir = apkpath[:-4]
+        ret = runApkTool(["d", apkpath, "-o", apkdir])
+        if ret.returncode != 0:
+            abort("\nError: Failed to run 'apktool d " + apkpath + " -o " + apkdir + "'.\nRun with --debug-output for more information.")
+        
+        # Record the destination paths of all but the base APK
+        if not apkpath.endswith("base.apk"):
+            splitapkpaths.append(apkdir)
+        
+        # Check for ProGuard/AndResGuard - this might b0rk decompile/recompile
+        if detectProGuard(apkdir):
+            warningPrint("\n[!] WARNING: Detected ProGuard/AndResGuard, decompile/recompile may not succeed.\n")
+    
+    bar.finish()
+
+    verbosePrint(verboseOutput)
+
+    # Walk the extracted APK directories and copy files and directories to the base APK
+    copySplitApkFiles(baseapkdir, splitapkpaths)
+    
+    # Fix public resource identifiers
+    fixPublicResourceIDs(baseapkdir, splitapkpaths)
+    
+    # Hack: Delete duplicate style resource entries.
+    if not disableStylesHack:
+        hackRemoveDuplicateStyleEntries(baseapkdir)
+    
+    #Disable APK splitting in the base AndroidManifest.xml file
+    disableApkSplitting(baseapkdir)
+
+    # Fix apktool bug where ampersands are improperly escaped: https://github.com/iBotPeaches/Apktool/issues/2703
+    print("\n[+] Fixing any improperly escaped ampersands.")
+    rawREReplace(os.path.join(baseapkdir, "res", "values", "strings.xml"), r'(&amp)([^;])', r'\1;\2')
+    
+    # Rebuild the base APK
+    print("\n[+] Rebuilding as a single APK.")
+    build(baseapkdir)
+    
+    # If only extracting, no need to sign / zipalign
+    if extract_only:
+        return os.path.join(baseapkdir, "dist", baseapkfilename)
+    
+    signAndZipAlign(baseapkdir, baseapkfilename)
+    
+    # Return the new APK path
     return os.path.join(baseapkdir, "dist", baseapkfilename)
-  
-  signAndZipAlign(baseapkdir, baseapkfilename)
-  
-  # Return the new APK path
-  return os.path.join(baseapkdir, "dist", baseapkfilename)
 
 ####################
 # Attempt to detect ProGuard/AndResGuard.
 ####################
 def detectProGuard(extractedPath):
-  if os.path.exists(os.path.join(extractedPath, "original", "META-INF", "proguard")):
-    return True
-  if os.path.exists(os.path.join(extractedPath, "original", "META-INF", "MANIFEST.MF")):
-    fh = open(os.path.join(extractedPath, "original", "META-INF", "MANIFEST.MF"))
-    d = fh.read()
-    fh.close()
-    if "proguard" in d.lower():
-      return True
-  return False
+    if os.path.exists(os.path.join(extractedPath, "original", "META-INF", "proguard")):
+        return True
+    if os.path.exists(os.path.join(extractedPath, "original", "META-INF", "MANIFEST.MF")):
+        fh = open(os.path.join(extractedPath, "original", "META-INF", "MANIFEST.MF"))
+        d = fh.read()
+        fh.close()
+        if "proguard" in d.lower():
+            return True
+    return False
 
 ####################
 # Copy files and directories from split APKs into the base APK directory.
 ####################
 def copySplitApkFiles(baseapkdir, splitapkpaths):
-  print("\nCopying files and directories from split APKs into base APK.")
-  for apkdir in splitapkpaths:
-    for (root, dirs, files) in os.walk(apkdir):
-      # Skip the original files directory
-      if not root.startswith(os.path.join(apkdir, "original")):
-        # Create any missing directories
-        for d in dirs:
-          # Translate directory path to base APK path and create the directory if it doesn't exist
-          p = baseapkdir + os.path.join(root, d)[len(apkdir):]
-          if not os.path.exists(p):
-            dbgPrint("[+] Creating directory in base APK: " + p[len(baseapkdir):])
-            os.mkdir(p)
-        
-        # Copy files into the base APK
-        for f in files:
-          # Skip the AndroidManifest.xml and apktool.yml in the APK root directory
-          if apkdir == root and (f == "AndroidManifest.xml" or f == "apktool.yml"):
-            continue
-          
-          # Translate path to base APK
-          p = baseapkdir + os.path.join(root, f)[len(apkdir):]
-          
-          # Copy files into the base APK, except for XML files in the res directory
-          if f.lower().endswith(".xml") and p.startswith(os.path.join(baseapkdir, "res")):
-            continue
-          dbgPrint("[+] Moving file to base APK: " + p[len(baseapkdir):])
-          shutil.move(os.path.join(root, f), p)
+    print("\n[+] Copying files and directories from split APKs into base APK.")
+    for apkdir in splitapkpaths:
+        for (root, dirs, files) in os.walk(apkdir):
+            # Skip the original files directory
+            if not root.startswith(os.path.join(apkdir, "original")):
+                # Create any missing directories
+                for d in dirs:
+                    # Translate directory path to base APK path and create the directory if it doesn't exist
+                    p = baseapkdir + os.path.join(root, d)[len(apkdir):]
+                    if not os.path.exists(p):
+                        dbgPrint("[+] Creating directory in base APK: " + p[len(baseapkdir):])
+                        os.mkdir(p)
+                
+                # Copy files into the base APK
+                for f in files:
+                    # Skip the AndroidManifest.xml and apktool.yml in the APK root directory
+                    if apkdir == root and (f == "AndroidManifest.xml" or f == "apktool.yml"):
+                        continue
+                    
+                    # Translate path to base APK
+                    p = baseapkdir + os.path.join(root, f)[len(apkdir):]
+                    
+                    # Copy files into the base APK, except for XML files in the res directory
+                    if f.lower().endswith(".xml") and p.startswith(os.path.join(baseapkdir, "res")):
+                        continue
+                    dbgPrint("[+] Moving file to base APK: " + p[len(baseapkdir):])
+                    shutil.move(os.path.join(root, f), p)
 
 ####################
 # Fix public resource identifiers that are shared across split APKs.
@@ -429,108 +451,108 @@ def copySplitApkFiles(baseapkdir, splitapkpaths):
 # resource names.
 ####################
 def fixPublicResourceIDs(baseapkdir, splitapkpaths):
-  # Bail if the base APK does not have a public.xml
-  if not os.path.exists(os.path.join(baseapkdir, "res", "values", "public.xml")):
-    return
-  print("\nFound public.xml in the base APK, fixing resource identifiers across split APKs.")
-  
-  # Mappings of resource IDs and names
-  idToDummyName = {}
-  dummyNameToRealName = {}
-  
-  # Step 1) Find all resource IDs that apktool has assigned a name of APKTOOL_DUMMY_XXX to.
-  #         Load these into the lookup tables ready to resolve the real resource names from
-  #         the split APKs in step 2 below.
-  baseXmlTree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "res", "values", "public.xml"))
-  for el in baseXmlTree.getroot():
-    if "name" in el.attrib and "id" in el.attrib:
-      if el.attrib["name"].startswith("APKTOOL_DUMMY_") and el.attrib["name"] not in idToDummyName:
-        idToDummyName[el.attrib["id"]] = el.attrib["name"]
-        dummyNameToRealName[el.attrib["name"]] = None
-  print("[+] Resolving " + str(len(idToDummyName)) + " resource identifiers.")
-  
-  # Step 2) Parse the public.xml file from each split APK in search of resource IDs matching
-  #         those loaded during step 1. Each match gives the true resource name allowing us to
-  #         replace all APKTOOL_DUMMY_XXX resource names with the true resource names back in
-  #         the base APK.
-  found = 0
-  for splitdir in splitapkpaths:
-    if os.path.exists(os.path.join(splitdir, "res", "values", "public.xml")):
-      tree = xml.etree.ElementTree.parse(os.path.join(splitdir, "res", "values", "public.xml"))
-      for el in tree.getroot():
+    # Bail if the base APK does not have a public.xml
+    if not os.path.exists(os.path.join(baseapkdir, "res", "values", "public.xml")):
+        return
+    print("\n[+] Found public.xml in the base APK, fixing resource identifiers across split APKs.")
+    
+    # Mappings of resource IDs and names
+    idToDummyName = {}
+    dummyNameToRealName = {}
+    
+    # Step 1) Find all resource IDs that apktool has assigned a name of APKTOOL_DUMMY_XXX to.
+    #         Load these into the lookup tables ready to resolve the real resource names from
+    #         the split APKs in step 2 below.
+    baseXmlTree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "res", "values", "public.xml"))
+    for el in baseXmlTree.getroot():
         if "name" in el.attrib and "id" in el.attrib:
-          if el.attrib["id"] in idToDummyName:
-            dummyNameToRealName[idToDummyName[el.attrib["id"]]] = el.attrib["name"]
-            found += 1
-  print("[+] Located " + str(found) + " true resource names.")
-  
-  # Step 3) Update the base APK to replace all APKTOOL_DUMMY_XXX resource names with the true
-  #         resource name.
-  updated = 0
-  for el in baseXmlTree.getroot():
-    if "name" in el.attrib and "id" in el.attrib:
-      if el.attrib["name"] in dummyNameToRealName and dummyNameToRealName[el.attrib["name"]] is not None:
-        el.attrib["name"] = dummyNameToRealName[el.attrib["name"]]
-        updated += 1
-  baseXmlTree.write(os.path.join(baseapkdir, "res", "values", "public.xml"), encoding="utf-8", xml_declaration=True)
-  print("[+] Updated " + str(updated) + " dummy resource names with true names in the base APK.")
-  
-  # Step 4) Find all references to APKTOOL_DUMMY_XXX resources within other XML resource files
-  #         in the base APK and update them to refer to the true resource name.
-  updated = 0
-  for (root, dirs, files) in os.walk(os.path.join(baseapkdir, "res")):
-    for f in files:
-      if f.lower().endswith(".xml"):
-        try:
-          # Load the XML
-          xmlPath = os.path.join(root, f)
-          dbgPrint("[~] Parsing " + xmlPath)
-          tree = xml.etree.ElementTree.parse(xmlPath)
-          
-          # Register the namespaces and get the prefix for the "android" namespace
-          namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(baseapkdir, "AndroidManifest.xml"), events=["start-ns"])])
-          for ns in namespaces:
-            xml.etree.ElementTree.register_namespace(ns, namespaces[ns])
-          ns = "{" + namespaces["android"] + "}"
-          
-          # Update references to APKTOOL_DUMMY_XXX resources
-          changed = False
-          for el in tree.iter():
-            # Check for references to APKTOOL_DUMMY_XXX resources in attributes of this element
-            for attr in el.attrib:
-              val = el.attrib[attr]
-              if val.startswith("@") and "/" in val and val.split("/")[1].startswith("APKTOOL_DUMMY_") and dummyNameToRealName[val.split("/")[1]] is not None:
-                el.attrib[attr] = val.split("/")[0] + "/" + dummyNameToRealName[val.split("/")[1]]
-                updated += 1
-                changed = True
-              elif val.startswith("APKTOOL_DUMMY_") and dummyNameToRealName[val] is not None:
-                el.attrib[attr] = dummyNameToRealName[val]
+            if el.attrib["name"].startswith("APKTOOL_DUMMY_") and el.attrib["name"] not in idToDummyName:
+                idToDummyName[el.attrib["id"]] = el.attrib["name"]
+                dummyNameToRealName[el.attrib["name"]] = None
+    verbosePrint("Resolving " + str(len(idToDummyName)) + " resource identifiers.")
+    
+    # Step 2) Parse the public.xml file from each split APK in search of resource IDs matching
+    #         those loaded during step 1. Each match gives the true resource name allowing us to
+    #         replace all APKTOOL_DUMMY_XXX resource names with the true resource names back in
+    #         the base APK.
+    found = 0
+    for splitdir in splitapkpaths:
+        if os.path.exists(os.path.join(splitdir, "res", "values", "public.xml")):
+            tree = xml.etree.ElementTree.parse(os.path.join(splitdir, "res", "values", "public.xml"))
+            for el in tree.getroot():
+                if "name" in el.attrib and "id" in el.attrib:
+                    if el.attrib["id"] in idToDummyName:
+                        dummyNameToRealName[idToDummyName[el.attrib["id"]]] = el.attrib["name"]
+                        found += 1
+    verbosePrint("Located " + str(found) + " true resource names.")
+    
+    # Step 3) Update the base APK to replace all APKTOOL_DUMMY_XXX resource names with the true
+    #         resource name.
+    updated = 0
+    for el in baseXmlTree.getroot():
+        if "name" in el.attrib and "id" in el.attrib:
+            if el.attrib["name"] in dummyNameToRealName and dummyNameToRealName[el.attrib["name"]] is not None:
+                el.attrib["name"] = dummyNameToRealName[el.attrib["name"]]
                 updated += 1
-                changed = True
-              
-              if changed:
-                dbgPrint("[~] Patching dummy apktool attribute \"" + attr + "\" value \"" + val + "\"" + (" -> \"" + el.attrib[attr] + "\"" if val != el.attrib[attr] else "") + " (" + str(updated) + ")")
-              
-              # Fix for untracked bug where drawables are decoded without drawable values (@null)
-              if f == "drawables.xml" and attr == "name" and el.text is None:
-                dbgPrint("[~] Patching null decoded drawable \"" + el.attrib[attr] + "\" (" + str(updated) + ")")
-                el.text = NULL_DECODED_DRAWABLE_COLOR
-            
-            # Check for references to APKTOOL_DUMMY_XXX resources in the element text
-            val = el.text
-            if val is not None and val.startswith("@") and "/" in val and val.split("/")[1].startswith("APKTOOL_DUMMY_") and dummyNameToRealName[val.split("/")[1]] is not None:
-              el.text = val.split("/")[0] + "/" + dummyNameToRealName[val.split("/")[1]]
-              updated += 1
-              changed = True
-              dbgPrint("[~] Patching dummy apktool element \"" + el.get('name', el.tag) + "\" value \"" + val + (" -> \"" + el.text + "\"" if val != el.text else "") + str(updated) + ")")
-          
-          # Save the file if it was updated
-          if changed:
-            dbgPrint("[+] Writing patched " + f)
-            tree.write(os.path.join(root, f), encoding="utf-8", xml_declaration=True)
-        except xml.etree.ElementTree.ParseError:
-          print("[-] XML parse error in " + os.path.join(root, f) + ", skipping.")
-  print("[+] Updated " + str(updated) + " references to dummy resource names in the base APK.")
+    baseXmlTree.write(os.path.join(baseapkdir, "res", "values", "public.xml"), encoding="utf-8", xml_declaration=True)
+    verbosePrint("Updated " + str(updated) + " dummy resource names with true names in the base APK.")
+    
+    # Step 4) Find all references to APKTOOL_DUMMY_XXX resources within other XML resource files
+    #         in the base APK and update them to refer to the true resource name.
+    updated = 0
+    for (root, dirs, files) in os.walk(os.path.join(baseapkdir, "res")):
+        for f in files:
+            if f.lower().endswith(".xml"):
+                try:
+                    # Load the XML
+                    xmlPath = os.path.join(root, f)
+                    dbgPrint("[~] Parsing " + xmlPath)
+                    tree = xml.etree.ElementTree.parse(xmlPath)
+                    
+                    # Register the namespaces and get the prefix for the "android" namespace
+                    namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(baseapkdir, "AndroidManifest.xml"), events=["start-ns"])])
+                    for ns in namespaces:
+                        xml.etree.ElementTree.register_namespace(ns, namespaces[ns])
+                    ns = "{" + namespaces["android"] + "}"
+                    
+                    # Update references to APKTOOL_DUMMY_XXX resources
+                    changed = False
+                    for el in tree.iter():
+                        # Check for references to APKTOOL_DUMMY_XXX resources in attributes of this element
+                        for attr in el.attrib:
+                            val = el.attrib[attr]
+                            if val.startswith("@") and "/" in val and val.split("/")[1].startswith("APKTOOL_DUMMY_") and dummyNameToRealName[val.split("/")[1]] is not None:
+                                el.attrib[attr] = val.split("/")[0] + "/" + dummyNameToRealName[val.split("/")[1]]
+                                updated += 1
+                                changed = True
+                            elif val.startswith("APKTOOL_DUMMY_") and dummyNameToRealName[val] is not None:
+                                el.attrib[attr] = dummyNameToRealName[val]
+                                updated += 1
+                                changed = True
+                            
+                            if changed:
+                                dbgPrint("[~] Patching dummy apktool attribute \"" + attr + "\" value \"" + val + "\"" + (" -> \"" + el.attrib[attr] + "\"" if val != el.attrib[attr] else "") + " (" + str(updated) + ")")
+                            
+                            # Fix for untracked bug where drawables are decoded without drawable values (@null)
+                            if f == "drawables.xml" and attr == "name" and el.text is None:
+                                dbgPrint("[~] Patching null decoded drawable \"" + el.attrib[attr] + "\" (" + str(updated) + ")")
+                                el.text = NULL_DECODED_DRAWABLE_COLOR
+                        
+                        # Check for references to APKTOOL_DUMMY_XXX resources in the element text
+                        val = el.text
+                        if val is not None and val.startswith("@") and "/" in val and val.split("/")[1].startswith("APKTOOL_DUMMY_") and dummyNameToRealName[val.split("/")[1]] is not None:
+                            el.text = val.split("/")[0] + "/" + dummyNameToRealName[val.split("/")[1]]
+                            updated += 1
+                            changed = True
+                            dbgPrint("[~] Patching dummy apktool element \"" + el.get('name', el.tag) + "\" value \"" + val + (" -> \"" + el.text + "\"" if val != el.text else "") + str(updated) + ")")
+                    
+                    # Save the file if it was updated
+                    if changed:
+                        dbgPrint("[+] Writing patched " + f)
+                        tree.write(os.path.join(root, f), encoding="utf-8", xml_declaration=True)
+                except xml.etree.ElementTree.ParseError:
+                    print("[-] XML parse error in " + os.path.join(root, f) + ", skipping.")
+    verbosePrint("Updated " + str(updated) + " references to dummy resource names in the base APK.")
 
 ####################
 # Hack to remove duplicate style resource entries before rebuilding.
@@ -545,33 +567,33 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
 # This hack parses res/values/styles.xml, finds all offending elements, removes them, then saves the result.
 ####################
 def hackRemoveDuplicateStyleEntries(baseapkdir):
-  # Bail if there is no styles.xml
-  if not os.path.exists(os.path.join(baseapkdir, "res", "values", "styles.xml")):
-    return
-  print("\nFound styles.xml in the base APK, checking for duplicate <style> -> <item> elements and removing.")
-  print("[~] Warning: this is a complete hack and may impact the visuals of the app, disable with --disable-styles-hack.")
-  
-  # Duplicates
-  dupes = []
-  
-  # Parse styles.xml and find all <item> elements with duplicate names
-  tree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "res", "values", "styles.xml"))
-  for styleEl in tree.getroot().findall("style"):
-    itemNames = []
-    for itemEl in styleEl:
-      if "name" in itemEl.attrib and itemEl.attrib["name"] in itemNames:
-        dupes.append([styleEl, itemEl])
-      else:
-        itemNames.append(itemEl.attrib["name"])
-  
-  # Delete all duplicates from the tree
-  for dupe in dupes:
-    dupe[0].remove(dupe[1])
-  
-  # Save the result if any duplicates were found and removed
-  if len(dupes) > 0:
-    tree.write(os.path.join(baseapkdir, "res", "values", "styles.xml"), encoding="utf-8", xml_declaration=True)
-    print("[+] Removed " + str(len(dupes)) + " duplicate entries from styles.xml.")
+    # Bail if there is no styles.xml
+    if not os.path.exists(os.path.join(baseapkdir, "res", "values", "styles.xml")):
+        return
+    print("\n[+] Found styles.xml in the base APK, checking for duplicate <style> -> <item> elements and removing.")
+    warningPrint("\tWarning: this is a complete hack and may impact the visuals of the app, disable with --disable-styles-hack.")
+    
+    # Duplicates
+    dupes = []
+    
+    # Parse styles.xml and find all <item> elements with duplicate names
+    tree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "res", "values", "styles.xml"))
+    for styleEl in tree.getroot().findall("style"):
+        itemNames = []
+        for itemEl in styleEl:
+            if "name" in itemEl.attrib and itemEl.attrib["name"] in itemNames:
+                dupes.append([styleEl, itemEl])
+            else:
+                itemNames.append(itemEl.attrib["name"])
+    
+    # Delete all duplicates from the tree
+    for dupe in dupes:
+        dupe[0].remove(dupe[1])
+    
+    # Save the result if any duplicates were found and removed
+    if len(dupes) > 0:
+        tree.write(os.path.join(baseapkdir, "res", "values", "styles.xml"), encoding="utf-8", xml_declaration=True)
+        print("[+] Removed " + str(len(dupes)) + " duplicate entries from styles.xml.")
 
 ####################
 # Update AndroidManifest.xml to disable APK splitting.
@@ -580,96 +602,94 @@ def hackRemoveDuplicateStyleEntries(baseapkdir):
 # -> Removes meta-data elements with the name "com.android.vending.splits" or "com.android.vending.splits.required"
 ####################
 def disableApkSplitting(baseapkdir):
-  print("\nDisabling APK splitting in AndroidManifest.xml of base APK.")
-  
-  # Load AndroidManifest.xml
-  tree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "AndroidManifest.xml"))
-  
-  # Register the namespaces and get the prefix for the "android" namespace
-  namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(baseapkdir, "AndroidManifest.xml"), events=["start-ns"])])
-  for ns in namespaces:
-    xml.etree.ElementTree.register_namespace(ns, namespaces[ns])
-  ns = "{" + namespaces["android"] + "}"
-  
-  # Disable APK splitting
-  appEl = None
-  elsToRemove = []
-  for el in tree.iter():
-    if el.tag == "application":
-      appEl = el
-      if ns + "isSplitRequired" in el.attrib:
-        del el.attrib[ns + "isSplitRequired"]
-      if ns + "extractNativeLibs" in el.attrib:
-        el.attrib[ns + "extractNativeLibs"] = "true"
-    elif appEl is not None and el.tag == "meta-data":
-      if ns + "name" in el.attrib:
-        if el.attrib[ns + "name"] == "com.android.vending.splits.required":
-          elsToRemove.append(el)
-        elif el.attrib[ns + "name"] == "com.android.vending.splits":
-          elsToRemove.append(el)
-  for el in elsToRemove:
-    appEl.remove(el)
-  
-  # Save the updated AndroidManifest.xml
-  tree.write(os.path.join(baseapkdir, "AndroidManifest.xml"), encoding="utf-8", xml_declaration=True)
+    print("\n[+] Disabling APK splitting in AndroidManifest.xml of base APK.")
+    
+    # Load AndroidManifest.xml
+    tree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "AndroidManifest.xml"))
+    
+    # Register the namespaces and get the prefix for the "android" namespace
+    namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(baseapkdir, "AndroidManifest.xml"), events=["start-ns"])])
+    for ns in namespaces:
+        xml.etree.ElementTree.register_namespace(ns, namespaces[ns])
+    ns = "{" + namespaces["android"] + "}"
+    
+    # Disable APK splitting
+    appEl = None
+    elsToRemove = []
+    for el in tree.iter():
+        if el.tag == "application":
+            appEl = el
+            if ns + "isSplitRequired" in el.attrib:
+                del el.attrib[ns + "isSplitRequired"]
+            if ns + "extractNativeLibs" in el.attrib:
+                el.attrib[ns + "extractNativeLibs"] = "true"
+        elif appEl is not None and el.tag == "meta-data":
+            if ns + "name" in el.attrib:
+                if el.attrib[ns + "name"] == "com.android.vending.splits.required":
+                    elsToRemove.append(el)
+                elif el.attrib[ns + "name"] == "com.android.vending.splits":
+                    elsToRemove.append(el)
+    for el in elsToRemove:
+        appEl.remove(el)
+    
+    # Save the updated AndroidManifest.xml
+    tree.write(os.path.join(baseapkdir, "AndroidManifest.xml"), encoding="utf-8", xml_declaration=True)
 
 ####################
 # Replace occurrences of a pattern in a file with a replacement pattern or function (a la re.sub)
 ####################
 def rawREReplace(path, pattern, replacement):
-  if os.path.exists(path):
-    contents = ""
-    with open(path, 'r') as file:
-      contents = file.read()
-    newContents = re.sub(pattern, replacement, contents)
-    if (contents != newContents):
-      dbgPrint("\n[~] Patching " + path)
-      with open(path, 'w') as file:
-        file.write(newContents)
-  else:
-    print("\nError: Failed to find file at " + path + " for pattern replacement")
-    sys.exit(1)
+    if os.path.exists(path):
+        contents = ""
+        with open(path, 'r') as file:
+            contents = file.read()
+        newContents = re.sub(pattern, replacement, contents)
+        if (contents != newContents):
+            dbgPrint("\n[~] Patching " + path)
+            with open(path, 'w') as file:
+                file.write(newContents)
+    else:
+        abort("\nError: Failed to find file at " + path + " for pattern replacement")
 
 ####################
 # Patch an APK to enable support for user-installed CA certs (e.g. Burp Suite CA cert).
 ####################
 def enableUserCerts(apkfile):
-  # Create a separate temp directory to work from
-  print("\nPatching APK to enable support for user-installed CA certificates.")
-  with tempfile.TemporaryDirectory() as tmppath:
-    # Extract the APK
-    apkdir = os.path.join(tmppath, apkfile.split(os.sep)[-1][:-4])
-    apkname = apkdir.split(os.sep)[-1] + ".apk"
-    ret = runApkTool(["d", apkfile, "-o", apkdir])
-    if ret.returncode != 0:
-      print("Error: Failed to run 'apktool d " + apkfile + " -o " + apkdir + "'.\nRun with --debug-output for more information.")
-      sys.exit(1)
-    
-    # Load AndroidManifest.xml and check for or create the networkSecurityConfig attribute
-    tree = xml.etree.ElementTree.parse(os.path.join(apkdir, "AndroidManifest.xml"))
-    namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(apkdir, "AndroidManifest.xml"), events=["start-ns"])])
-    for ns in namespaces:
-      xml.etree.ElementTree.register_namespace(ns, namespaces[ns])
-    ns = "{" + namespaces["android"] + "}"
-    for el in tree.findall("application"):
-      el.attrib[ns + "networkSecurityConfig"] = "@xml/network_security_config"
-    tree.write(os.path.join(apkdir, "AndroidManifest.xml"), encoding="utf-8", xml_declaration=True)
-    
-    # Create a network security config file
-    fh = open(os.path.join(apkdir, "res", "xml", "network_security_config.xml"), "wb")
-    fh.write("<?xml version=\"1.0\" encoding=\"utf-8\" ?><network-security-config><base-config><trust-anchors><certificates src=\"system\" /><certificates src=\"user\" /></trust-anchors></base-config></network-security-config>".encode("utf-8"))
-    fh.close()
-    
-    # Rebuild and sign the APK
-    build(apkdir) # Fix https://github.com/NickstaDB/patch-apk/issues/30
-    signAndZipAlign(apkdir, apkname)
+    # Create a separate temp directory to work from
+    print("\n[+] Patching APK to enable support for user-installed CA certificates.")
+    with tempfile.TemporaryDirectory() as tmppath:
+        # Extract the APK
+        apkdir = os.path.join(tmppath, apkfile.split(os.sep)[-1][:-4])
+        apkname = apkdir.split(os.sep)[-1] + ".apk"
+        ret = runApkTool(["d", apkfile, "-o", apkdir])
+        if ret.returncode != 0:
+            abort("Error: Failed to run 'apktool d " + apkfile + " -o " + apkdir + "'.\nRun with --debug-output for more information.")
+        
+        # Load AndroidManifest.xml and check for or create the networkSecurityConfig attribute
+        tree = xml.etree.ElementTree.parse(os.path.join(apkdir, "AndroidManifest.xml"))
+        namespaces = dict([node for _,node in xml.etree.ElementTree.iterparse(os.path.join(apkdir, "AndroidManifest.xml"), events=["start-ns"])])
+        for ns in namespaces:
+            xml.etree.ElementTree.register_namespace(ns, namespaces[ns])
+        ns = "{" + namespaces["android"] + "}"
+        for el in tree.findall("application"):
+            el.attrib[ns + "networkSecurityConfig"] = "@xml/network_security_config"
+        tree.write(os.path.join(apkdir, "AndroidManifest.xml"), encoding="utf-8", xml_declaration=True)
+        
+        # Create a network security config file
+        fh = open(os.path.join(apkdir, "res", "xml", "network_security_config.xml"), "wb")
+        fh.write("<?xml version=\"1.0\" encoding=\"utf-8\" ?><network-security-config><base-config><trust-anchors><certificates src=\"system\" /><certificates src=\"user\" /></trust-anchors></base-config></network-security-config>".encode("utf-8"))
+        fh.close()
+        
+        # Rebuild and sign the APK
+        build(apkdir) # Fix https://github.com/NickstaDB/patch-apk/issues/30
+        signAndZipAlign(apkdir, apkname)
 
 ####################
 # Main
 ####################
 if __name__ == "__main__":
-  try:
-    main()
-  except KeyboardInterrupt:
-    sys.exit()
+    try:
+        main()
+    except KeyboardInterrupt:
+        sys.exit()
 
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..6ae3c31
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+progress
+termcolor
\ No newline at end of file

From 3c7d2341f561742d44a8ca8ee0a7f844eea8eb77 Mon Sep 17 00:00:00 2001
From: Jeroen Beckers <jbeckers@nviso.eu>
Date: Wed, 22 Feb 2023 17:57:25 +0100
Subject: [PATCH 28/38] Bunch of improvements and refactoring

---
 README.md        | 14 +++++++-
 patch-apk.py     | 94 ++++++++++++++++++++++--------------------------
 requirements.txt |  3 +-
 3 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/README.md b/README.md
index 1196fba..156bfb1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
-# MODIFIED FOR APKTOOL 2.5.0 #
+# :warning: Active fork for NickstaDB/patch-apk
+
+As the original projects has been set to read-only, I've created an active fork which combines most interesting modifications. If you identify any issues, please open a ticket.
+
+Original credit goes to @NickstaDB and significant modifications were made by myself and @jseigelis
 
 # patch-apk - App Bundle/Split APK Aware Patcher for Objection #
 An APK patcher, for use with [objection](https://github.com/sensepost/objection), that supports Android app bundles/split APKs. It automates the following:
@@ -13,6 +17,14 @@ An APK patcher, for use with [objection](https://github.com/sensepost/objection)
 
 ### Changelog ###
 
+* **22nd February 2022:** Took over project and added various features:
+  * Merged modifications from @jseigelis's fork
+  * Removed support for outdated objection versions
+  * Fixed bug for `--debug-output`
+  * Added `--verbose` flag
+  * Fixed bug with objection AndroidManifest extraction
+  * Updated output format
+
 * **29th April 2021:** Implemented a fix for an issue with `apktool` where the handling of some resource XML elements changed and the `--use-aapt2` flag is required ([https://github.com/iBotPeaches/Apktool/issues/2462](https://github.com/iBotPeaches/Apktool/issues/2462)).
 * **28th April 2021:** Fixed a bug with `objection` version detection when the `objection version` command output an update notice.
 * **1st August 2020:** Updated for compatibility with `objection` version 1.9.3 and above and fixed a bug with line endings when retrieving package names from the Android device/emulator.
diff --git a/patch-apk.py b/patch-apk.py
index 3906e9f..9df6194 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -11,7 +11,7 @@
 from progress.bar import Bar
 from termcolor import colored
 
-SUPPORTED_VERSION = "2.5.0"
+SUPPORTED_VERSION = "2.6.1"
 NULL_DECODED_DRAWABLE_COLOR = "#000000ff"
 
 ####################
@@ -52,10 +52,14 @@ def main():
         
         # Patch the target APK with objection
         print("\n[+] Patching " + apkfile.split(os.sep)[-1] + " with objection.")
-        if getObjectionVersion() >= pkg_resources.parse_version("1.9.3"):
-            assertSubprocessSuccessfulRun(["objection", "patchapk", "--skip-resources", "--ignore-nativelibs", "-s", apkfile], getStdout())
-        else:
-            assertSubprocessSuccessfulRun(["objection", "patchapk", "--skip-resources", "-s", apkfile], getStdout())
+        if subprocess.run(["objection", "patchapk", "--skip-resources", "--ignore-nativelibs", "-s", apkfile], stdout=getStdout(), stderr=getStdout()).returncode != 0:
+            print("\n[+] Objection patching failed, trying alternative approach")
+            warningPrint("[!] If you get an error, the application might not have a launchable activity")
+            
+            # Try without --skip-resources, since objection potentially wasn't able to identify the starting activity
+            # There could have been another reason for the failure, but it's a sensible fallback
+            assertSubprocessSuccessfulRun(["objection", "patchapk", "--ignore-nativelibs", "-s", apkfile])
+    
         os.remove(apkfile)
         shutil.move(apkfile[:-4] + ".objection.apk", apkfile)
         
@@ -65,19 +69,20 @@ def main():
         
         # Uninstall the original package from the device
         print("\n[+] Uninstalling the original package from the device.")
-        assertSubprocessSuccessfulRun(["adb", "uninstall", pkgname], getStdout())
+        assertSubprocessSuccessfulRun(["adb", "uninstall", pkgname])
         
         # Install the patched APK
         print("\n[+] Installing the patched APK to the device.")
-        # assertSubprocessSuccessfulRun(["adb", "install", apkfile], getStdout())
+        assertSubprocessSuccessfulRun(["adb", "install", apkfile])
+        print(apkfile)
         
         # Done
         print("\n[+] Done")
 
-def assertSubprocessSuccessfulRun(args, stdout=subprocess.PIPE):
-    if subprocess.run(args, stdout=stdout).returncode != 0:
+def assertSubprocessSuccessfulRun(args):
+    if subprocess.run(args, stdout=getStdout(), stderr=getStdout()).returncode != 0:
         abort(f"Error: Failed to run {' '.join(args)}.\nRun with --debug-output for more information.")
-
+        
 ####################
 # Check that required dependencies are present:
 # -> Tools used
@@ -146,6 +151,7 @@ def dbgPrint(msg):
 def warningPrint(msg):
     print(colored(msg, "yellow"))
 
+
 ####################
 # Abort will print given error message and exit the app
 ####################
@@ -162,13 +168,6 @@ def getStdout():
     else:
         return subprocess.DEVNULL
 
-####################
-# Get objection version
-####################
-def getObjectionVersion():
-    proc = subprocess.run(["objection", "version"], stdout=subprocess.PIPE)
-    return pkg_resources.parse_version(proc.stdout.decode("utf-8").strip().split(": ")[-1].strip())
-
 ####################
 # Get apktool version
 ####################
@@ -197,7 +196,7 @@ def runApkTool(params):
 # Fix private resources preventing builds (apktool wontfix: https://github.com/iBotPeaches/Apktool/issues/2761)
 ####################
 def fixPrivateResources(baseapkdir):
-    print("\n[+] Forcing all private resources to be public")
+    verbosePrint("[+] Forcing all private resources to be public")
     updated = 0
     for (root, dirs, files) in os.walk(os.path.join(baseapkdir, "res")):
         for f in files:
@@ -205,7 +204,7 @@ def fixPrivateResources(baseapkdir):
                 rawREReplace(os.path.join(root, f), '@android', '@*android')
                 updated += 1
     if updated > 0:
-        verbosePrint("Updated " + str(updated) + " private resources before building APK.")
+        verbosePrint("[+] Updated " + str(updated) + " private resources before building APK.")
 
 ####################
 # Build the APK
@@ -215,12 +214,12 @@ def build(baseapkdir):
     fixPrivateResources(baseapkdir)
 
     if os.path.exists(os.path.join(baseapkdir, "res", "navigation")) or getApktoolVersion() > pkg_resources.parse_version("2.4.2"):
-        print("\n[+] Rebuilding with 'apktool --use-aapt2'.")
+        verbosePrint("[+] Rebuilding with 'apktool --use-aapt2'.")
         ret = runApkTool(["--use-aapt2", "b", baseapkdir])
         if ret.returncode != 0:
             abort("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
     else:
-        print("\n[+] Rebuilding APK with apktool.")
+        verbosePrint("[+] Rebuilding APK with apktool.")
         ret = runApkTool(["b", baseapkdir])
         if ret.returncode != 0:
             abort("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
@@ -231,17 +230,15 @@ def build(baseapkdir):
 ####################
 def signAndZipAlign(baseapkdir, baseapkfilename):
     # Zip align the new APK
-    print("\n[+] Zip aligning new APK.")
+    verbosePrint("[+] Zip aligning new APK.")
     assertSubprocessSuccessfulRun(["zipalign", "-f", "4", os.path.join(baseapkdir, "dist", baseapkfilename),
-        os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk")], getStdout())
+        os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk")])
     shutil.move(os.path.join(baseapkdir, "dist", baseapkfilename[:-4] + "-aligned.apk"), os.path.join(baseapkdir, "dist", baseapkfilename))
 
     # Sign the new APK
-    print("\n[+] Signing new APK.")
-    assertSubprocessSuccessfulRun(["apksigner", "sign", "--ks",
-        os.path.realpath(os.path.join(os.path.realpath(__file__), "..", "data", "patch-apk.keystore")), "--ks-pass",
-        "pass:patch-apk", "--ks-key-alias", "patch-apk-key", os.path.join(baseapkdir, "dist", baseapkfilename)],
-        getStdout())
+    verbosePrint("[+] Signing new APK.")
+    apkpath = os.path.join(baseapkdir, "dist", baseapkfilename)
+    assertSubprocessSuccessfulRun(["objection", "signapk", apkpath])
 
 ####################
 # Verify the package name - checks whether the target package is installed
@@ -294,7 +291,7 @@ def getAPKPathsForPackage(pkgname):
     for line in out.split(os.linesep):
         if line.startswith("package:"):
             line = line[8:].strip()
-            verbosePrint("APK path: " + line)
+            verbosePrint("[+] APK path: " + line)
             paths.append(line)
 
     return paths
@@ -313,13 +310,13 @@ def getTargetAPK(pkgname, apkpaths, tmppath, disableStylesHack, extract_only):
     for remotepath in apkpaths:
         baseapkname = remotepath.split('/')[-1]
         localapks.append(os.path.join(tmppath, pkgname + "-" + baseapkname))
-        verboseOutput += f"Pulled: {pkgname}-{baseapkname}\n"
+        verboseOutput += f"[+] Pulled: {pkgname}-{baseapkname}\n"
         bar.next()
-        # assertSubprocessSuccessfulRun(["adb", "pull", remotepath, localapks[-1]], getStdout())
-        assertSubprocessSuccessfulRun(["adb", "pull", remotepath, localapks[-1]], getStdout() )
+        # assertSubprocessSuccessfulRun(["adb", "pull", remotepath, localapks[-1]])
+        assertSubprocessSuccessfulRun(["adb", "pull", remotepath, localapks[-1]] )
     
     bar.finish()
-    verbosePrint(verboseOutput)
+    verbosePrint(verboseOutput.rstrip())
 
     # Return the target APK path
     if len(localapks) == 1:
@@ -331,7 +328,7 @@ def getTargetAPK(pkgname, apkpaths, tmppath, disableStylesHack, extract_only):
 def verbosePrint(msg):
     if getArgs().verbose:
         for line in msg.split("\n"):
-            print(colored("\t" + line, "light_grey"))
+            print(colored("    " + line, "light_grey"))
 
 ####################
 # Combine app bundles/split APKs into a single APK for patching.
@@ -369,6 +366,7 @@ def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_onl
     verbosePrint(verboseOutput)
 
     # Walk the extracted APK directories and copy files and directories to the base APK
+    print("\n[+] Rebuilding as a single APK")
     copySplitApkFiles(baseapkdir, splitapkpaths)
     
     # Fix public resource identifiers
@@ -382,21 +380,16 @@ def combineSplitAPKs(pkgname, localapks, tmppath, disableStylesHack, extract_onl
     disableApkSplitting(baseapkdir)
 
     # Fix apktool bug where ampersands are improperly escaped: https://github.com/iBotPeaches/Apktool/issues/2703
-    print("\n[+] Fixing any improperly escaped ampersands.")
+    verbosePrint("[+] Fixing any improperly escaped ampersands.")
     rawREReplace(os.path.join(baseapkdir, "res", "values", "strings.xml"), r'(&amp)([^;])', r'\1;\2')
     
     # Rebuild the base APK
-    print("\n[+] Rebuilding as a single APK.")
     build(baseapkdir)
     
-    # If only extracting, no need to sign / zipalign
-    if extract_only:
-        return os.path.join(baseapkdir, "dist", baseapkfilename)
-    
-    signAndZipAlign(baseapkdir, baseapkfilename)
-    
     # Return the new APK path
     return os.path.join(baseapkdir, "dist", baseapkfilename)
+   
+    
 
 ####################
 # Attempt to detect ProGuard/AndResGuard.
@@ -416,7 +409,6 @@ def detectProGuard(extractedPath):
 # Copy files and directories from split APKs into the base APK directory.
 ####################
 def copySplitApkFiles(baseapkdir, splitapkpaths):
-    print("\n[+] Copying files and directories from split APKs into base APK.")
     for apkdir in splitapkpaths:
         for (root, dirs, files) in os.walk(apkdir):
             # Skip the original files directory
@@ -454,7 +446,7 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
     # Bail if the base APK does not have a public.xml
     if not os.path.exists(os.path.join(baseapkdir, "res", "values", "public.xml")):
         return
-    print("\n[+] Found public.xml in the base APK, fixing resource identifiers across split APKs.")
+    verbosePrint("\n[+] Found public.xml in the base APK, fixing resource identifiers across split APKs.")
     
     # Mappings of resource IDs and names
     idToDummyName = {}
@@ -469,7 +461,7 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
             if el.attrib["name"].startswith("APKTOOL_DUMMY_") and el.attrib["name"] not in idToDummyName:
                 idToDummyName[el.attrib["id"]] = el.attrib["name"]
                 dummyNameToRealName[el.attrib["name"]] = None
-    verbosePrint("Resolving " + str(len(idToDummyName)) + " resource identifiers.")
+    verbosePrint("[+] Resolving " + str(len(idToDummyName)) + " resource identifiers.")
     
     # Step 2) Parse the public.xml file from each split APK in search of resource IDs matching
     #         those loaded during step 1. Each match gives the true resource name allowing us to
@@ -484,7 +476,7 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
                     if el.attrib["id"] in idToDummyName:
                         dummyNameToRealName[idToDummyName[el.attrib["id"]]] = el.attrib["name"]
                         found += 1
-    verbosePrint("Located " + str(found) + " true resource names.")
+    verbosePrint("[+] Located " + str(found) + " true resource names.")
     
     # Step 3) Update the base APK to replace all APKTOOL_DUMMY_XXX resource names with the true
     #         resource name.
@@ -495,7 +487,7 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
                 el.attrib["name"] = dummyNameToRealName[el.attrib["name"]]
                 updated += 1
     baseXmlTree.write(os.path.join(baseapkdir, "res", "values", "public.xml"), encoding="utf-8", xml_declaration=True)
-    verbosePrint("Updated " + str(updated) + " dummy resource names with true names in the base APK.")
+    verbosePrint("[+] Updated " + str(updated) + " dummy resource names with true names in the base APK.")
     
     # Step 4) Find all references to APKTOOL_DUMMY_XXX resources within other XML resource files
     #         in the base APK and update them to refer to the true resource name.
@@ -552,7 +544,7 @@ def fixPublicResourceIDs(baseapkdir, splitapkpaths):
                         tree.write(os.path.join(root, f), encoding="utf-8", xml_declaration=True)
                 except xml.etree.ElementTree.ParseError:
                     print("[-] XML parse error in " + os.path.join(root, f) + ", skipping.")
-    verbosePrint("Updated " + str(updated) + " references to dummy resource names in the base APK.")
+    verbosePrint("[+] Updated " + str(updated) + " references to dummy resource names in the base APK.")
 
 ####################
 # Hack to remove duplicate style resource entries before rebuilding.
@@ -570,8 +562,6 @@ def hackRemoveDuplicateStyleEntries(baseapkdir):
     # Bail if there is no styles.xml
     if not os.path.exists(os.path.join(baseapkdir, "res", "values", "styles.xml")):
         return
-    print("\n[+] Found styles.xml in the base APK, checking for duplicate <style> -> <item> elements and removing.")
-    warningPrint("\tWarning: this is a complete hack and may impact the visuals of the app, disable with --disable-styles-hack.")
     
     # Duplicates
     dupes = []
@@ -592,6 +582,8 @@ def hackRemoveDuplicateStyleEntries(baseapkdir):
     
     # Save the result if any duplicates were found and removed
     if len(dupes) > 0:
+        verbosePrint("\n[+] Found styles.xml in the base APK, checking for duplicate <style> -> <item> elements and removing.")
+        warningPrint("[!] Warning: this is a complete hack and may impact the visuals of the app, disable with --disable-styles-hack.")
         tree.write(os.path.join(baseapkdir, "res", "values", "styles.xml"), encoding="utf-8", xml_declaration=True)
         print("[+] Removed " + str(len(dupes)) + " duplicate entries from styles.xml.")
 
@@ -602,7 +594,7 @@ def hackRemoveDuplicateStyleEntries(baseapkdir):
 # -> Removes meta-data elements with the name "com.android.vending.splits" or "com.android.vending.splits.required"
 ####################
 def disableApkSplitting(baseapkdir):
-    print("\n[+] Disabling APK splitting in AndroidManifest.xml of base APK.")
+    verbosePrint("[+] Disabling APK splitting in AndroidManifest.xml of base APK.")
     
     # Load AndroidManifest.xml
     tree = xml.etree.ElementTree.parse(os.path.join(baseapkdir, "AndroidManifest.xml"))
diff --git a/requirements.txt b/requirements.txt
index 6ae3c31..68ae0d0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
 progress
-termcolor
\ No newline at end of file
+termcolor
+objection==1.11.0
\ No newline at end of file

From be384bac9b086778347f75cb88ce1cd15461c7bc Mon Sep 17 00:00:00 2001
From: Jeroen Beckers <jbeckers@nviso.eu>
Date: Wed, 22 Feb 2023 18:06:09 +0100
Subject: [PATCH 29/38] Update documentation

---
 README.md    | 168 +++++++++++++++++++++++++++++----------------------
 patch-apk.py |   1 -
 2 files changed, 95 insertions(+), 74 deletions(-)

diff --git a/README.md b/README.md
index 156bfb1..ad6ca69 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@ An APK patcher, for use with [objection](https://github.com/sensepost/objection)
   * Added `--verbose` flag
   * Fixed bug with objection AndroidManifest extraction
   * Updated output format
+  * Remove dependency on apksigner by using objection's signapk command
 
 * **29th April 2021:** Implemented a fix for an issue with `apktool` where the handling of some resource XML elements changed and the `--use-aapt2` flag is required ([https://github.com/iBotPeaches/Apktool/issues/2462](https://github.com/iBotPeaches/Apktool/issues/2462)).
 * **28th April 2021:** Fixed a bug with `objection` version detection when the `objection version` command output an update notice.
@@ -70,104 +71,125 @@ When `patch-apk.py` is done, the installed app should be patched with objection
 **Partial Package Name Matching:** Pass a partial package name to `patch-apk.py` and it'll automatically grab the correct package name or ask you to confirm from available options.
 
 ```
-$ python3 patch-apk.py ovid
-Multiple matching packages installed, select the package to patch.
-[1] com.android.providers.telephony
-[2] com.android.providers.calendar
-[3] com.android.providers.media
-[4] com.android.providers.downloads
-[5] com.android.providers.downloads.ui
-[6] com.android.providers.settings
-[7] com.android.providers.partnerbookmarks
-[8] com.android.bookmarkprovider
-[9] com.android.providers.blockednumber
-[10] com.android.providers.userdictionary
-[11] com.joinzoe.covid_zoe
-[12] com.android.providers.contacts
-Choice:
+$ python3 patch-apk.py proxy
+
+[!] Multiple matching packages installed, select the package to patch.
+
+[1] org.proxydroid
+[2] com.android.proxyhandler
+Choice: 
+
 ```
 
 **Patching Split APKs:** Split APKs are automatically detected and combined into a single APK before patching. Split APKs can be identified by multiple APK paths being returned by the `adb shell pm path` command as shown below.
 
 ```
-$ adb shell pm path com.joinzoe.covid_zoe
-package:/data/app/com.joinzoe.covid_zoe-vck7Y7NlVGutCaaAbonakw==/base.apk
-package:/data/app/com.joinzoe.covid_zoe-vck7Y7NlVGutCaaAbonakw==/split_config.arm64_v8a.apk
-package:/data/app/com.joinzoe.covid_zoe-vck7Y7NlVGutCaaAbonakw==/split_config.en.apk
-package:/data/app/com.joinzoe.covid_zoe-vck7Y7NlVGutCaaAbonakw==/split_config.xxhdpi.apk
+$ adb shell pm path org.proxydroid
+package:/data/app/~~TP7sglBuEoDc3yH0wpZdiA==/org.proxydroid-PCy1JxTMVJT3KmxVqaagGQ==/base.apk
+package:/data/app/~~TP7sglBuEoDc3yH0wpZdiA==/org.proxydroid-PCy1JxTMVJT3KmxVqaagGQ==/split_config.arm64_v8a.apk
+package:/data/app/~~TP7sglBuEoDc3yH0wpZdiA==/org.proxydroid-PCy1JxTMVJT3KmxVqaagGQ==/split_config.en.apk
+package:/data/app/~~TP7sglBuEoDc3yH0wpZdiA==/org.proxydroid-PCy1JxTMVJT3KmxVqaagGQ==/split_config.fr.apk
+package:/data/app/~~TP7sglBuEoDc3yH0wpZdiA==/org.proxydroid-PCy1JxTMVJT3KmxVqaagGQ==/split_config.nl.apk
+package:/data/app/~~TP7sglBuEoDc3yH0wpZdiA==/org.proxydroid-PCy1JxTMVJT3KmxVqaagGQ==/split_config.xxhdpi.apk
 ```
 
-The following shows `patch-apk.py` detecting, rebuilding, and patching a split APK. Some output has been snipped for brevity.
+The following shows `patch-apk.py` detecting, rebuilding, and patching a split APK. Some output has been snipped for brevity. The `-v` flag has been set to show additional info.
 
 ```
-$ python3 patch-apk.py covid
-Getting APK path(s) for package: com.joinzoe.covid_zoe
-[+] APK path: /data/app/com.joinzoe.covid_zoe-vck7Y7NlVGutCaaAbonakw==/base.apk
-[+] APK path: /data/app/com.joinzoe.covid_zoe-vck7Y7NlVGutCaaAbonakw==/split_config.arm64_v8a.apk
-[+] APK path: /data/app/com.joinzoe.covid_zoe-vck7Y7NlVGutCaaAbonakw==/split_config.en.apk
-[+] APK path: /data/app/com.joinzoe.covid_zoe-vck7Y7NlVGutCaaAbonakw==/split_config.xxhdpi.apk
-
-Pulling APK file(s) from device.
-[+] Pulling: com.joinzoe.covid_zoe-base.apk
-[+] Pulling: com.joinzoe.covid_zoe-split_config.arm64_v8a.apk
-[+] Pulling: com.joinzoe.covid_zoe-split_config.en.apk
-[+] Pulling: com.joinzoe.covid_zoe-split_config.xxhdpi.apk
-
-App bundle/split APK detected, rebuilding as a single APK.
-
-Extracting individual APKs with apktool.
-[+] Extracting: /tmp/tmp1kir74u_/com.joinzoe.covid_zoe-base.apk
-[+] Extracting: /tmp/tmp1kir74u_/com.joinzoe.covid_zoe-split_config.arm64_v8a.apk
-[+] Extracting: /tmp/tmp1kir74u_/com.joinzoe.covid_zoe-split_config.en.apk
-[+] Extracting: /tmp/tmp1kir74u_/com.joinzoe.covid_zoe-split_config.xxhdpi.apk
-
-Copying files and directories from split APKs into base APK.
-[+] Creating directory in base APK: /lib
-[+] Creating directory in base APK: /lib/arm64-v8a
-[+] Moving file to base APK: /lib/arm64-v8a/libfb.so
-...
-[+] Moving file to base APK: /res/drawable-xxxhdpi/shell_launch_background_image.png
+$ python3 patch-apk.py org.proxydroid -v
+
+[+] Retrieving APK path(s) for package: org.proxydroid
+    [+] APK path: /data/app/~~FTVBmscrJiLerJdXIEa5tw==/org.proxydroid-KMq91nU1y9Qz8ZZAGM--RA==/base.apk
+    [+] APK path: /data/app/~~FTVBmscrJiLerJdXIEa5tw==/org.proxydroid-KMq91nU1y9Qz8ZZAGM--RA==/split_config.arm64_v8a.apk
+    [+] APK path: /data/app/~~FTVBmscrJiLerJdXIEa5tw==/org.proxydroid-KMq91nU1y9Qz8ZZAGM--RA==/split_config.en.apk
+    [+] APK path: /data/app/~~FTVBmscrJiLerJdXIEa5tw==/org.proxydroid-KMq91nU1y9Qz8ZZAGM--RA==/split_config.fr.apk
+    [+] APK path: /data/app/~~FTVBmscrJiLerJdXIEa5tw==/org.proxydroid-KMq91nU1y9Qz8ZZAGM--RA==/split_config.nl.apk
+    [+] APK path: /data/app/~~FTVBmscrJiLerJdXIEa5tw==/org.proxydroid-KMq91nU1y9Qz8ZZAGM--RA==/split_config.xxhdpi.apk
+
+[+] Pulling APK file(s) from device |################################| 6/6
+    [+] Pulled: org.proxydroid-base.apk
+    [+] Pulled: org.proxydroid-split_config.arm64_v8a.apk
+    [+] Pulled: org.proxydroid-split_config.en.apk
+    [+] Pulled: org.proxydroid-split_config.fr.apk
+    [+] Pulled: org.proxydroid-split_config.nl.apk
+    [+] Pulled: org.proxydroid-split_config.xxhdpi.apk
+
+[!] App bundle/split APK detected, rebuilding as a single APK.
+
+[+] Disassembling split APKs |################################| 6/6
+    
+    Extracted: /var/folders/t3/vz305z151ng8y2rwvpkx28xw0000gn/T/tmpyw7wl64i/org.proxydroid-base.apk
+    Extracted: /var/folders/t3/vz305z151ng8y2rwvpkx28xw0000gn/T/tmpyw7wl64i/org.proxydroid-split_config.arm64_v8a.apk
+    Extracted: /var/folders/t3/vz305z151ng8y2rwvpkx28xw0000gn/T/tmpyw7wl64i/org.proxydroid-split_config.en.apk
+    Extracted: /var/folders/t3/vz305z151ng8y2rwvpkx28xw0000gn/T/tmpyw7wl64i/org.proxydroid-split_config.fr.apk
+    Extracted: /var/folders/t3/vz305z151ng8y2rwvpkx28xw0000gn/T/tmpyw7wl64i/org.proxydroid-split_config.nl.apk
+    Extracted: /var/folders/t3/vz305z151ng8y2rwvpkx28xw0000gn/T/tmpyw7wl64i/org.proxydroid-split_config.xxhdpi.apk
+
+[+] Rebuilding as a single APK
+    
+    [+] Found public.xml in the base APK, fixing resource identifiers across split APKs.
+    [+] Resolving 21 resource identifiers.
+    [+] Located 21 true resource names.
+    [+] Updated 21 dummy resource names with true names in the base APK.
+    [+] Updated 47 references to dummy resource names in the base APK.
+    [+] Disabling APK splitting in AndroidManifest.xml of base APK.
+    [+] Fixing any improperly escaped ampersands.
+    [+] Forcing all private resources to be public
+    [+] Updated 350 private resources before building APK.
+    [+] Rebuilding with 'apktool --use-aapt2'.
+
+[+] Patching org.proxydroid-base.apk with objection.
+
+[+] Patching APK to enable support for user-installed CA certificates.
+    [+] Forcing all private resources to be public
+    [+] Updated 351 private resources before building APK.
+    [+] Rebuilding with 'apktool --use-aapt2'.
+    [+] Zip aligning new APK.
+    [+] Signing new APK.
+
+[+] Uninstalling the original package from the device.
+
+[+] Installing the patched APK to the device.
+
+[+] Done
+```
 
-Found public.xml in the base APK, fixing resource identifiers across split APKs.
-[+] Resolving 83 resource identifiers.
-[+] Located 83 true resource names.
-[+] Updated 83 dummy resource names with true names in the base APK.
-[+] Updated 164 references to dummy resource names in the base APK.
+After `patch-apk.py` completes, we can run `adb shell pm path` again to verify that there is now a single patched APK installed on the device.
 
-Disabling APK splitting in AndroidManifest.xml of base APK.
+```
+$ adb shell pm path org.proxydroid
+package:/data/app/org.proxydroid-9NuZnT-lK3qM_IZQEHhTgA==/base.apk
+```
 
-Rebuilding as a single APK.
-[+] Building APK with apktool.
-[+] Signing new APK.
-[+] Zip aligning new APK.
+By default, patch-apk will inject the frida gadget and modify the network security config. It is also possible to only perform an extraction by providing the `--extract-only` flag. Any split apks will still be merged and a local copy of the APK will be produced:
 
-Patching com.joinzoe.covid_zoe-base.apk with objection.
+```
+$ python3 patch-apk.py org.proxydroid --extract-only
 
-Patching APK to enable support for user-installed CA certificates.
+[+] Retrieving APK path(s) for package: org.proxydroid
 
-Uninstalling the original package from the device.
+[+] Pulling APK file(s) from device |################################| 6/6
 
-Installing the patched APK to the device.
+[!] App bundle/split APK detected, rebuilding as a single APK.
 
-Done, cleaning up temporary files.
-```
+[+] Disassembling split APKs |################################| 6/6
 
-After `patch-apk.py` completes, we can run `adb shell pm path` again to verify that there is now a single patched APK installed on the device.
+[+] Rebuilding as a single APK
 
-```
-$ adb shell pm path com.joinzoe.covid_zoe
-package:/data/app/com.joinzoe.covid_zoe-9NuZnT-lK3qM_IZQEHhTgA==/base.apk
+[+] Saving a copy of the APK to org.proxydroid.apk
 ```
 
 ## Combining Split APKs ##
 Split APKs have been supported since Android 5/Lollipop (June 2014, API level 21). Essentially this allows an app to be split across multiple APK files, for example one might contain the main code and another might contain image resources for a given screen resolution. We can identify whether an app uses split APKs with the `adb shell pm path` command like so:
 
 ```
-$ adb shell pm path com.joinzoe.covid_zoe
-package:/data/app/com.joinzoe.covid_zoe-NW8ZbgI5VPzvSZ1NgMa4CQ==/base.apk
-package:/data/app/com.joinzoe.covid_zoe-NW8ZbgI5VPzvSZ1NgMa4CQ==/split_config.arm64_v8a.apk
-package:/data/app/com.joinzoe.covid_zoe-NW8ZbgI5VPzvSZ1NgMa4CQ==/split_config.en.apk
-package:/data/app/com.joinzoe.covid_zoe-NW8ZbgI5VPzvSZ1NgMa4CQ==/split_config.xxhdpi.apk
+$ adb shell pm path org.proxydroid
+package:/data/app/~~TP7sglBuEoDc3yH0wpZdiA==/org.proxydroid-PCy1JxTMVJT3KmxVqaagGQ==/base.apk
+package:/data/app/~~TP7sglBuEoDc3yH0wpZdiA==/org.proxydroid-PCy1JxTMVJT3KmxVqaagGQ==/split_config.arm64_v8a.apk
+package:/data/app/~~TP7sglBuEoDc3yH0wpZdiA==/org.proxydroid-PCy1JxTMVJT3KmxVqaagGQ==/split_config.en.apk
+package:/data/app/~~TP7sglBuEoDc3yH0wpZdiA==/org.proxydroid-PCy1JxTMVJT3KmxVqaagGQ==/split_config.fr.apk
+package:/data/app/~~TP7sglBuEoDc3yH0wpZdiA==/org.proxydroid-PCy1JxTMVJT3KmxVqaagGQ==/split_config.nl.apk
+package:/data/app/~~TP7sglBuEoDc3yH0wpZdiA==/org.proxydroid-PCy1JxTMVJT3KmxVqaagGQ==/split_config.xxhdpi.apk
 ```
 
 These can be combined into a single APK for use with other tools such as `objection patchapk`. This is done by `patch-apk.py` as follows:
diff --git a/patch-apk.py b/patch-apk.py
index 9df6194..4d6fc51 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -74,7 +74,6 @@ def main():
         # Install the patched APK
         print("\n[+] Installing the patched APK to the device.")
         assertSubprocessSuccessfulRun(["adb", "install", apkfile])
-        print(apkfile)
         
         # Done
         print("\n[+] Done")

From f52baecb76126fcb89a5a1a59f6e9f6f6b182d75 Mon Sep 17 00:00:00 2001
From: Jeroen Beckers <jbeckers@nviso.eu>
Date: Wed, 22 Feb 2023 18:08:43 +0100
Subject: [PATCH 30/38] It's 2023

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ad6ca69..8528a07 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ An APK patcher, for use with [objection](https://github.com/sensepost/objection)
 
 ### Changelog ###
 
-* **22nd February 2022:** Took over project and added various features:
+* **22nd February 2023:** Took over project and added various features:
   * Merged modifications from @jseigelis's fork
   * Removed support for outdated objection versions
   * Fixed bug for `--debug-output`

From 0458b8bae4844c95d96d6c01dcd7330de964180d Mon Sep 17 00:00:00 2001
From: Jeroen Beckers <dauntless@dauntless.be>
Date: Wed, 23 Aug 2023 11:31:18 +0200
Subject: [PATCH 31/38] Remove apktool warning

---
 patch-apk.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index 4d6fc51..213f06f 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -8,10 +8,9 @@
 import tempfile
 import xml.etree.ElementTree
 import re
-from progress.bar import Bar
-from termcolor import colored
+from progress.bar import Bar # pip3 install progress
+from termcolor import colored # pip3 install termcolor
 
-SUPPORTED_VERSION = "2.6.1"
 NULL_DECODED_DRAWABLE_COLOR = "#000000ff"
 
 ####################
@@ -21,13 +20,12 @@ def main():
     # Grab argz
     args = getArgs()
 
-    # Warn for unexpected version
-    apktoolVersion = getApktoolVersion()
-    if apktoolVersion != pkg_resources.parse_version(SUPPORTED_VERSION):
-        warningPrint("WARNING: currently installed apktool version " + str(apktoolVersion) + " is not the same as what this version of this script is developed for (" + SUPPORTED_VERSION + "), you may suffer from build failures, bugs, and obsolete patches")
-
     # Check that dependencies are available
     checkDependencies(args.extract_only)
+
+    # Warn for unexpected version
+    apktoolVersion = getApktoolVersion()
+    print(f"Using apktool v{apktoolVersion}")
     
     # Verify the package name and ensure it's installed (also supports partial package names)
     pkgname = verifyPackageName(args.pkgname)

From 1eddebeaf4603f66df3f18566a81d32f848bf8bc Mon Sep 17 00:00:00 2001
From: Jeroen Beckers <me.githbub@dauntless.be>
Date: Thu, 10 Oct 2024 12:05:48 +0200
Subject: [PATCH 32/38] Remove split properties from <manifest> tag

---
 patch-apk.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/patch-apk.py b/patch-apk.py
index 213f06f..515eb35 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -621,6 +621,15 @@ def disableApkSplitting(baseapkdir):
     for el in elsToRemove:
         appEl.remove(el)
     
+    # Clean up <manifest> tag
+    root = tree.getroot()
+    if ns + "isSplitRequired" in root.attrib:
+        del root.attrib[ns + "isSplitRequired"]
+    if ns + "requiredSplitTypes" in root.attrib:
+        del root.attrib[ns + "requiredSplitTypes"]
+    if ns + "splitTypes" in root.attrib:
+        del root.attrib[ns + "splitTypes"]
+
     # Save the updated AndroidManifest.xml
     tree.write(os.path.join(baseapkdir, "AndroidManifest.xml"), encoding="utf-8", xml_declaration=True)
 

From cba9cd52674cd41d6bc5c0326dda72a7720e718a Mon Sep 17 00:00:00 2001
From: Jeroen Beckers <me.githbub@dauntless.be>
Date: Thu, 10 Oct 2024 13:11:26 +0200
Subject: [PATCH 33/38] Add multi-user support

---
 patch-apk.py | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index 515eb35..7f53a2c 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -31,7 +31,7 @@ def main():
     pkgname = verifyPackageName(args.pkgname)
     
     # Get the APK path(s) from the device
-    apkpaths = getAPKPathsForPackage(pkgname)
+    current_user, apkpaths = getAPKPathsForPackage(pkgname)
     
     # Create a temp directory to work from
     with tempfile.TemporaryDirectory() as tmppath:
@@ -66,12 +66,12 @@ def main():
             enableUserCerts(apkfile)
         
         # Uninstall the original package from the device
-        print("\n[+] Uninstalling the original package from the device.")
-        assertSubprocessSuccessfulRun(["adb", "uninstall", pkgname])
+        print(f"\n[+] Uninstalling the original package from the device. (user: {current_user})")
+        assertSubprocessSuccessfulRun(["adb", "uninstall", "--user", current_user, pkgname])
         
         # Install the patched APK
-        print("\n[+] Installing the patched APK to the device.")
-        assertSubprocessSuccessfulRun(["adb", "install", apkfile])
+        print(f"\n[+] Installing the patched APK to the device. (user: {current_user})")
+        assertSubprocessSuccessfulRun(["adb", "install", "--user", current_user, apkfile])
         
         # Done
         print("\n[+] Done")
@@ -277,12 +277,27 @@ def verifyPackageName(pkgname):
 ####################
 # Get the APK path(s) on the device for the given package name.
 ####################
-def getAPKPathsForPackage(pkgname):
-    print("\n[+] Retrieving APK path(s) for package: " + pkgname)
+def getAPKPathsForPackage(pkgname, current_user = "0", users_to_try = None):
+    print(f"\n[+] Retrieving APK path(s) for package: {pkgname} for user {current_user}")
     paths = []
-    proc = subprocess.run(["adb", "shell", "pm", "path", pkgname], stdout=subprocess.PIPE)
+    proc = subprocess.run(["adb", "shell", "pm", "path", "--user", current_user, pkgname], stdout=subprocess.PIPE)
     if proc.returncode != 0:
-        abort("Error: Failed to run 'adb shell pm path " + pkgname + "'.")
+        if not users_to_try:
+            proc = subprocess.run(["adb", "shell", "pm", "list", "users"], stdout=subprocess.PIPE)
+            out = proc.stdout.decode("utf-8")
+
+            pattern = r'UserInfo{(\d+):'
+            users_to_try = re.findall(pattern, out)
+
+        if current_user in users_to_try:
+            users_to_try.remove(current_user)
+
+        if len(users_to_try) > 0:
+            warningPrint(f"[!] Package not found for user {current_user}, trying next user")
+            return getAPKPathsForPackage(pkgname, users_to_try[0], users_to_try)
+        else:
+            abort("Error: Failed to run 'adb shell pm path " + pkgname + "'.")
+    
     out = proc.stdout.decode("utf-8")
 
     for line in out.split(os.linesep):
@@ -291,7 +306,7 @@ def getAPKPathsForPackage(pkgname):
             verbosePrint("[+] APK path: " + line)
             paths.append(line)
 
-    return paths
+    return current_user, paths
 
 ####################
 # Pull the APK file(s) for the package and return the local file path to work with.
@@ -690,4 +705,3 @@ def enableUserCerts(apkfile):
         main()
     except KeyboardInterrupt:
         sys.exit()
-

From d6519d99cbc5e159dc6a4bff89c1a60d5f64e076 Mon Sep 17 00:00:00 2001
From: Jeroen Beckers <me.githbub@dauntless.be>
Date: Tue, 15 Oct 2024 10:32:19 +0200
Subject: [PATCH 34/38] Update changelog

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 8528a07..7029e4d 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,10 @@ An APK patcher, for use with [objection](https://github.com/sensepost/objection)
 
 ### Changelog ###
 
+* **10th October 2024:**
+  * Added mult-user support. If the apk file path can't be found for the default user, it will try other users
+  * Remove split-apk tags from <manifest>. Doesn't seem to be documented, but Android verifies these too.
+  
 * **22nd February 2023:** Took over project and added various features:
   * Merged modifications from @jseigelis's fork
   * Removed support for outdated objection versions

From baa948a74300008072c3f0bb4196df1ecf8e12a9 Mon Sep 17 00:00:00 2001
From: lsellens <lsellens@gmail.com>
Date: Tue, 8 Apr 2025 11:13:24 -0500
Subject: [PATCH 35/38] Replace deprecated pkg_resources usage with
 packaging.version

---
 patch-apk.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index 7f53a2c..895f9b1 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 import argparse
 import os
-import pkg_resources
+from packaging.version import parse as parse_version
 import shutil
 import subprocess
 import sys
@@ -170,7 +170,7 @@ def getStdout():
 ####################
 def getApktoolVersion():
     proc = subprocess.run(["apktool", "-version"], stdout=subprocess.PIPE)
-    return pkg_resources.parse_version(proc.stdout.decode("utf-8").strip().split("-")[0].strip())
+    return parse_version(proc.stdout.decode("utf-8").strip().split("-")[0].strip())
 
 ####################
 # Wrapper to run apktool platform-independently, complete with a dirty hack to fix apktool's dirty hack.
@@ -210,7 +210,7 @@ def build(baseapkdir):
     # Fix private resources preventing builds (apktool wontfix: https://github.com/iBotPeaches/Apktool/issues/2761)
     fixPrivateResources(baseapkdir)
 
-    if os.path.exists(os.path.join(baseapkdir, "res", "navigation")) or getApktoolVersion() > pkg_resources.parse_version("2.4.2"):
+    if os.path.exists(os.path.join(baseapkdir, "res", "navigation")) or getApktoolVersion() > parse_version("2.4.2"):
         verbosePrint("[+] Rebuilding with 'apktool --use-aapt2'.")
         ret = runApkTool(["--use-aapt2", "b", baseapkdir])
         if ret.returncode != 0:

From 3051718858dc977d7ad4948301ad40852b572829 Mon Sep 17 00:00:00 2001
From: TheDauntless <info@dauntless.be>
Date: Mon, 7 Jul 2025 12:03:48 +0200
Subject: [PATCH 36/38] Fixes No module named packaging
 TheDauntless/patch-apk#9

---
 requirements.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 68ae0d0..2869b37 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
 progress
 termcolor
-objection==1.11.0
\ No newline at end of file
+objection==1.11.0
+packaging
\ No newline at end of file

From 2529f4883456112f3624ad13931fba83e6a8c68e Mon Sep 17 00:00:00 2001
From: TheDauntless <info@dauntless.be>
Date: Mon, 7 Jul 2025 12:12:41 +0200
Subject: [PATCH 37/38] apktool has changed the version command. Fixes Invalid
 version: Apktool 2.12.0 TheDauntless/patch-apk#10

---
 patch-apk.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index 895f9b1..53ca5ef 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -169,8 +169,17 @@ def getStdout():
 # Get apktool version
 ####################
 def getApktoolVersion():
-    proc = subprocess.run(["apktool", "-version"], stdout=subprocess.PIPE)
-    return parse_version(proc.stdout.decode("utf-8").strip().split("-")[0].strip())
+    commands = [["apktool", "version"], ["apktool", "-version"]]
+    
+    for cmd in commands:
+        try:
+            proc = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True)
+            output = proc.stdout.decode("utf-8").strip()
+            version_str = output.split("-")[0].strip()
+            return parse_version(version_str)
+        except (Exception):
+            continue
+    raise Exception("Error: Failed to get apktool version.")
 
 ####################
 # Wrapper to run apktool platform-independently, complete with a dirty hack to fix apktool's dirty hack.

From 4579bbe929e20a3e603042646073e4f28fa33373 Mon Sep 17 00:00:00 2001
From: TheDauntless <info@dauntless.be>
Date: Mon, 7 Jul 2025 12:22:21 +0200
Subject: [PATCH 38/38] Fixes Unrecognized command: --use-aapt2
 TheDauntless/patch-apk#11

---
 patch-apk.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/patch-apk.py b/patch-apk.py
index 53ca5ef..922a7bc 100755
--- a/patch-apk.py
+++ b/patch-apk.py
@@ -219,16 +219,10 @@ def build(baseapkdir):
     # Fix private resources preventing builds (apktool wontfix: https://github.com/iBotPeaches/Apktool/issues/2761)
     fixPrivateResources(baseapkdir)
 
-    if os.path.exists(os.path.join(baseapkdir, "res", "navigation")) or getApktoolVersion() > parse_version("2.4.2"):
-        verbosePrint("[+] Rebuilding with 'apktool --use-aapt2'.")
-        ret = runApkTool(["--use-aapt2", "b", baseapkdir])
-        if ret.returncode != 0:
-            abort("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
-    else:
-        verbosePrint("[+] Rebuilding APK with apktool.")
-        ret = runApkTool(["b", baseapkdir])
-        if ret.returncode != 0:
-            abort("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
+    verbosePrint("[+] Rebuilding APK with apktool.")
+    ret = runApkTool(["b", baseapkdir])
+    if ret.returncode != 0:
+        abort("Error: Failed to run 'apktool b " + baseapkdir + "'.\nRun with --debug-output for more information.")
 
 ####################
 # Sign the APK with apksigner and zip align