Use a resource patch to change the manifest instead of modifying xml as a text string

Author: LisoUseInAIKyrios

patches/src/main/kotlin/app/revanced/patches/music/layout/branding/CustomBrandingPatch.kt

@@ -75,6 +75,7 @@ val customBrandingPatch = baseCustomBrandingPatch(
     ),
     legacyMipmapFileNames = arrayOf("ic_launcher_release.png"),
     monochromeFileNames = arrayOf("ic_app_icons_themed_youtube_music.xml"),
+    manifestAppLauncherValue = "@string/app_launcher_name",
 
     block = {
         dependsOn(disableSplashAnimationPatch)

patches/src/main/kotlin/app/revanced/patches/shared/layout/branding/BaseCustomBrandingPatch.kt

@@ -9,9 +9,9 @@ import app.revanced.patcher.patch.stringOption
 import app.revanced.util.ResourceGroup
 import app.revanced.util.Utils.trimIndentMultiline
 import app.revanced.util.copyResources
+import app.revanced.util.findElementByAttributeValueOrThrow
 import java.io.File
 import java.nio.file.Files
-import java.util.logging.Logger
 
 private const val REVANCED_ICON = "ReVanced*Logo" // Can never be a valid path.
 
@@ -26,26 +26,6 @@ internal val mipmapDirectories = arrayOf(
 
 private fun formatResourceFileList(resourceNames: Array<String>) = resourceNames.joinToString("\n") { "- $it" }
 
-/**
- * Attempts to fix unescaped and invalid characters not allowed for an Android app name.
- */
-private fun escapeAppName(name: String): String? {
-    // Remove ASCII control characters.
-    val cleanedName = name.filter { it.code >= 32 }
-
-    // Replace invalid XML characters with escaped equivalents.
-    val escapedName = cleanedName
-        .replace("&", "&amp;") // Must be first to avoid double-escaping.
-        .replace("<", "&lt;")
-        .replace(">", "&gt;")
-        .replace(Regex("(?<!&)\""), "&quot;")
-
-    // Trim empty spacing.
-    val trimmed = escapedName.trim()
-
-    return trimmed.ifBlank { null }
-}
-
 /**
  * Shared custom branding patch for YouTube and YT Music.
  */
@@ -57,6 +37,7 @@ internal fun baseCustomBrandingPatch(
     adaptiveMipmapFileNames: Array<String>,
     legacyMipmapFileNames: Array<String>,
     monochromeFileNames: Array<String>,
+    manifestAppLauncherValue: String,
     block: ResourcePatchBuilder.() -> Unit = {},
     executeBlock: ResourcePatchContext.() -> Unit = {}
 ): ResourcePatch = resourcePatch(
@@ -93,6 +74,20 @@ internal fun baseCustomBrandingPatch(
 
     block()
 
+    dependsOn(
+        // Change the app name.
+        resourcePatch {
+            execute {
+                document("AndroidManifest.xml").use { document ->
+                    document.childNodes.findElementByAttributeValueOrThrow(
+                        "android:label",
+                        manifestAppLauncherValue
+                    ).nodeValue = appName!!
+                }
+            }
+        }
+    )
+
     execute {
         val iconPathTrimmed = iconPath!!.trim()
 
@@ -164,27 +159,6 @@ internal fun baseCustomBrandingPatch(
             }
         }
 
-        // Change the app name.
-        escapeAppName(appName!!)?.let { escapedAppName ->
-            val newValue = "android:label=\"$escapedAppName\""
-
-            val manifest = get("AndroidManifest.xml")
-            val original = manifest.readText()
-            val replacement = original
-                // YouTube
-                .replace("android:label=\"@string/application_name\"", newValue)
-                // YT Music
-                .replace("android:label=\"@string/app_launcher_name\"", newValue)
-
-            if (original == replacement) {
-                Logger.getLogger(this::class.java.name).warning(
-                    "Could not replace manifest app name"
-                )
-            }
-
-            manifest.writeText(replacement)
-        }
-
         executeBlock() // Must be after the main code to rename the new icons for YouTube 19.34+.
     }
 }

patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt

@@ -35,6 +35,7 @@ val customBrandingPatch = baseCustomBrandingPatch(
         "adaptive_monochrome_ic_youtube_launcher.xml",
         "ringo2_adaptive_monochrome_ic_youtube_launcher.xml"
     ),
+    manifestAppLauncherValue = "@string/application_name",
 
     block = {
         compatibleWith(