From e83e62fc2400caf1c5179d25e0ac4fbd51ddba00 Mon Sep 17 00:00:00 2001
From: Pro-Tweaker <67857759+Pro-Tweaker@users.noreply.github.com>
Date: Mon, 7 Aug 2023 16:07:22 +0200
Subject: [PATCH] feat(Change package name): Append `.revanced` to package name
 by default (#2750)

Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>
---
 .../patch/ChangePackageNamePatch.kt           | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt b/src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt
index 0709e75c44..ab618dae2d 100644
--- a/src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt
@@ -9,39 +9,43 @@ import org.w3c.dom.Element
 
 @Patch(false)
 @Name("Change package name")
-@Description("Changes the package name.")
+@Description("Changes the package name. Appends \".revanced\" to the package name by default.")
 class ChangePackageNamePatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
-        packageName?.let { packageName ->
-            val packageNameRegex = Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$")
-            if (!packageName.matches(packageNameRegex))
-                return PatchResultError("Invalid package name")
+        val packageNameToUse = packageName ?: getDefaultPackageName(context)
 
-            var originalPackageName: String
-            context.xmlEditor["AndroidManifest.xml"].use { editor ->
-                val manifest = editor.file.getElementsByTagName("manifest").item(0) as Element
-                originalPackageName = manifest.getAttribute("package")
-            }
+        val packageNameRegex = Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$")
+        if (!packageNameToUse.matches(packageNameRegex))
+            return PatchResultError("Invalid package name")
 
-            if (!originalPackageName.matches(packageNameRegex))
-                return PatchResultError("Failed to get the original package name")
+        val originalPackageName = getOriginalPackageName(context)
 
-            context["AndroidManifest.xml"].apply {
-                readText().replace(originalPackageName, packageName).let(::writeText)
-            }
-
-        } ?: return PatchResultError("No package name provided")
+        context["AndroidManifest.xml"].apply {
+            readText().replace(originalPackageName, packageNameToUse).let(::writeText)
+        }
 
         return PatchResultSuccess()
     }
 
+    private fun getDefaultPackageName(context: ResourceContext): String {
+        val originalPackageName = getOriginalPackageName(context)
+        return "$originalPackageName.revanced"
+    }
+
+    private fun getOriginalPackageName(context: ResourceContext): String {
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
+            val manifest = editor.file.getElementsByTagName("manifest").item(0) as Element
+            return manifest.getAttribute("package")
+        }
+    }
+
     companion object : OptionsContainer() {
         var packageName: String? by option(
             PatchOption.StringOption(
                 key = "packageName",
                 default = null,
                 title = "Package name",
-                description = "The name of the package to rename of the app.",
+                description = "The name of the package to rename the app to.",
             )
         )
     }