fix YT Music

Author: LisoUseInAIKyrios

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

@@ -61,10 +61,11 @@ val customBrandingPatch = baseCustomBrandingPatch(
     originalLauncherIconName = "ic_launcher_release",
     originalAppName = "@string/app_launcher_name",
     originalAppPackageName = MUSIC_PACKAGE_NAME,
+    copyExistingIntentsToAliases = false,
     numberOfPresetAppNames = 4,
     mainActivityOnCreateFingerprint = musicActivityOnCreateFingerprint,
     mainActivityName = MUSIC_MAIN_ACTIVITY_NAME,
-    activityAliasNameWithIntentToRemove = MUSIC_MAIN_ACTIVITY_NAME,
+    activityAliasNameWithIntents = MUSIC_MAIN_ACTIVITY_NAME,
     preferenceScreen = PreferenceScreen.GENERAL,
 
     block = {

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

@@ -64,10 +64,11 @@ internal fun baseCustomBrandingPatch(
     originalLauncherIconName: String,
     originalAppName: String,
     originalAppPackageName: String,
+    copyExistingIntentsToAliases: Boolean,
     numberOfPresetAppNames: Int,
     mainActivityOnCreateFingerprint: Fingerprint,
     mainActivityName: String,
-    activityAliasNameWithIntentToRemove: String,
+    activityAliasNameWithIntents: String,
     preferenceScreen: BasePreferenceScreen.Screen,
     block: ResourcePatchBuilder.() -> Unit = {},
     executeBlock: ResourcePatchContext.() -> Unit = {}
@@ -297,25 +298,35 @@ internal fun baseCustomBrandingPatch(
                 alias.setAttribute("android:targetActivity", mainActivityName)
 
                 // Copy all intents from the original alias so long press actions still work.
-                for (i in 0 until intents.length) {
-                    alias.appendChild(
-                        intents.item(i).cloneNode(true)
-                    )
+                if (copyExistingIntentsToAliases) {
+                    for (i in 0 until intents.length) {
+                        alias.appendChild(
+                            intents.item(i).cloneNode(true)
+                        )
+                    }
+                } else {
+                    val intentFilter = document.createElement("intent-filter").apply {
+                        val action = document.createElement("action")
+                        action.setAttribute("android:name", "android.intent.action.MAIN")
+                        appendChild(action)
+
+                        val category = document.createElement("category")
+                        category.setAttribute("android:name", "android.intent.category.LAUNCHER")
+                        appendChild(category)
+                    }
+                    alias.appendChild(intentFilter)
                 }
 
                 return alias
             }
 
-            // Remove the original main alias.
-            val originalIntent = document.childNodes.findElementByAttributeValueOrThrow(
+            val intentFilters = document.childNodes.findElementByAttributeValueOrThrow(
                 "android:name",
-                activityAliasNameWithIntentToRemove
-            )
-            originalIntent.parentNode.removeChild(originalIntent)
+                activityAliasNameWithIntents
+            ).childNodes
 
             val namePrefix = ".revanced_"
             val iconResourcePrefix = "revanced_launcher_"
-            val intentFilters = originalIntent.childNodes
             val application = document.getElementsByTagName("application")
                 .item(0) as Element
 
@@ -366,6 +377,15 @@ internal fun baseCustomBrandingPatch(
                     )
                 )
             }
+
+            // Remove the main action from the original alias, otherwise two apps icons
+            // can be shown in the launcher. Must do this after adding new aliases.
+            intentFilters.findElementByAttributeValueOrThrow(
+                "android:name",
+                "android.intent.action.MAIN"
+            ).let { intent ->
+                intent.parentNode.removeChild(intent)
+            }
         }
 
         executeBlock()

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

@@ -13,10 +13,11 @@ val customBrandingPatch = baseCustomBrandingPatch(
     originalLauncherIconName = "ic_launcher",
     originalAppName = "@string/application_name",
     originalAppPackageName = YOUTUBE_PACKAGE_NAME,
+    copyExistingIntentsToAliases = true,
     numberOfPresetAppNames = 4,
     mainActivityOnCreateFingerprint = mainActivityOnCreateFingerprint,
     mainActivityName = YOUTUBE_MAIN_ACTIVITY_NAME,
-    activityAliasNameWithIntentToRemove = "com.google.android.youtube.app.honeycomb.Shell\$HomeActivity",
+    activityAliasNameWithIntents = "com.google.android.youtube.app.honeycomb.Shell\$HomeActivity",
     preferenceScreen = PreferenceScreen.GENERAL_LAYOUT,
 
     block = {