ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-05-09 02:54:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(YouTube Music - Custom header): Custom Header for YouTube Music is causing app crashing in 8.02.53 https://github.com/inotia00/ReVanced_Extended/issues/2692

Browse Source
This commit is contained in:
inotia00 2025-01-18 20:09:51 +09:00
parent 9ec17d4328
commit 68ac8ab6b2
2 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/shared/src/main/java/app/revanced/extension/music/patches/general/GeneralPatch.java
View File

@ -12,6 +12,7 @@ import android.widget.Button;
import android.widget.ImageView;
import app.revanced.extension.music.settings.Settings;
import app.revanced.extension.shared.utils.ResourceUtils;
/**
* @noinspection ALL
@ -19,6 +20,18 @@ import app.revanced.extension.music.settings.Settings;
@SuppressWarnings("unused")
public class GeneralPatch {
// region [Change header] patch
public static int getHeaderDrawableId(int original) {
final int headerId = ResourceUtils.getDrawableIdentifier("action_bar_logo");
return headerId == 0
? original
: headerId;
}
// endregion
// region [Change start page] patch
public static String changeStartPage(final String browseId) {

45
patches/src/main/kotlin/app/revanced/patches/music/layout/header/ChangeHeaderPatch.kt
View File

@ -4,8 +4,10 @@ import app.revanced.patcher.patch.bytecodePatch
import app.revanced.patcher.patch.resourcePatch
import app.revanced.patcher.patch.stringOption
import app.revanced.patches.music.utils.compatibility.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.extension.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.patch.PatchList.CUSTOM_HEADER_FOR_YOUTUBE_MUSIC
import app.revanced.patches.music.utils.playservice.is_7_06_or_greater
import app.revanced.patches.music.utils.playservice.is_7_27_or_greater
import app.revanced.patches.music.utils.playservice.versionCheckPatch
import app.revanced.patches.music.utils.resourceid.actionBarLogo
import app.revanced.patches.music.utils.resourceid.actionBarLogoRingo2
@ -15,14 +17,17 @@ import app.revanced.patches.music.utils.resourceid.ytmLogoRingo2
import app.revanced.patches.music.utils.settings.ResourceUtils.getIconType
import app.revanced.patches.music.utils.settings.ResourceUtils.updatePatchStatus
import app.revanced.patches.music.utils.settings.settingsPatch
import app.revanced.util.REGISTER_TEMPLATE_REPLACEMENT
import app.revanced.util.ResourceGroup
import app.revanced.util.Utils.printWarn
import app.revanced.util.Utils.trimIndentMultiline
import app.revanced.util.copyFile
import app.revanced.util.copyResources
import app.revanced.util.doRecursively
import app.revanced.util.replaceLiteralInstructionCall
import app.revanced.util.underBarOrThrow
import app.revanced.util.valueOrThrow
import org.w3c.dom.Element
private const val DEFAULT_HEADER_KEY = "Custom branding icon"
private const val DEFAULT_HEADER_VALUE = "custom_branding_icon"
@ -125,11 +130,26 @@ private val changeHeaderBytecodePatch = bytecodePatch(
return@execute
}
listOf(
actionBarLogoRingo2 to actionBarLogo,
ytmLogoRingo2 to ytmLogo,
).forEach { (originalResource, replacementResource) ->
replaceLiteralInstructionCall(originalResource, replacementResource)
if (actionBarLogoRingo2 == -1L || ytmLogoRingo2 == -1L) {
printWarn("Target resource not found!")
return@execute
}
if (is_7_27_or_greater) {
replaceLiteralInstructionCall(
actionBarLogoRingo2,
"""
invoke-static {v$REGISTER_TEMPLATE_REPLACEMENT}, $GENERAL_CLASS_DESCRIPTOR->getHeaderDrawableId(I)I
move-result v$REGISTER_TEMPLATE_REPLACEMENT
"""
)
} else {
listOf(
actionBarLogoRingo2 to actionBarLogo,
ytmLogoRingo2 to ytmLogo,
).forEach { (originalResource, replacementResource) ->
replaceLiteralInstructionCall(originalResource, replacementResource)
}
}
}
}
@ -186,6 +206,21 @@ val changeHeaderPatch = resourcePatch(
printWarn(warnings)
}
if (is_7_27_or_greater) {
document("res/layout/signin_fragment.xml").use { document ->
document.doRecursively node@{ node ->
if (node !is Element) return@node
if (node.attributes.getNamedItem("android:id")?.nodeValue == "@id/logo") {
node.getAttributeNode("android:src")
?.let { attribute ->
attribute.textContent = "@drawable/ytm_logo"
}
}
}
}
}
updatePatchStatus(CUSTOM_HEADER_FOR_YOUTUBE_MUSIC)
}