From 4d5fbc360f8d712667243c6b5b2241500f2e1386 Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Wed, 1 May 2024 02:33:44 +0900 Subject: [PATCH] feat(YouTube): `Disable update screen` patch has been integrated into `Hide layout components` patch --- .../components/LayoutComponentsPatch.kt | 15 +++++++++ ...pBlockingCheckResultToStringFingerprint.kt | 2 +- .../misc/updatescreen/UpdateScreenPatch.kt | 31 ------------------- .../youtube/settings/xml/revanced_prefs.xml | 1 - 4 files changed, 16 insertions(+), 33 deletions(-) rename src/main/kotlin/app/revanced/patches/youtube/{misc/updatescreen => general/components}/fingerprints/AppBlockingCheckResultToStringFingerprint.kt (77%) delete mode 100644 src/main/kotlin/app/revanced/patches/youtube/misc/updatescreen/UpdateScreenPatch.kt diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/components/LayoutComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/components/LayoutComponentsPatch.kt index d1f102d8d..fb3eff3b3 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/components/LayoutComponentsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/components/LayoutComponentsPatch.kt @@ -12,6 +12,7 @@ import app.revanced.patches.youtube.general.components.fingerprints.AccountListF import app.revanced.patches.youtube.general.components.fingerprints.AccountListParentFingerprint import app.revanced.patches.youtube.general.components.fingerprints.AccountMenuFingerprint import app.revanced.patches.youtube.general.components.fingerprints.AccountSwitcherAccessibilityLabelFingerprint +import app.revanced.patches.youtube.general.components.fingerprints.AppBlockingCheckResultToStringFingerprint import app.revanced.patches.youtube.general.components.fingerprints.BottomUiContainerFingerprint import app.revanced.patches.youtube.general.components.fingerprints.FloatingMicrophoneFingerprint import app.revanced.patches.youtube.general.components.fingerprints.PiPNotificationFingerprint @@ -36,6 +37,7 @@ import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction +import com.android.tools.smali.dexlib2.util.MethodUtil @Suppress("unused") object LayoutComponentsPatch : BaseBytecodePatch( @@ -52,6 +54,7 @@ object LayoutComponentsPatch : BaseBytecodePatch( AccountListParentFingerprint, AccountMenuParentFingerprint, AccountSwitcherAccessibilityLabelFingerprint, + AppBlockingCheckResultToStringFingerprint, BottomUiContainerFingerprint, FloatingMicrophoneFingerprint, PiPNotificationFingerprint, @@ -94,6 +97,18 @@ object LayoutComponentsPatch : BaseBytecodePatch( // endregion + // region patch for disable update screen + + AppBlockingCheckResultToStringFingerprint.resultOrThrow().mutableClass.methods.first { method -> + MethodUtil.isConstructor(method) + && method.parameters == listOf("Landroid/content/Intent;", "Z") + }.addInstructions( + 1, + "const/4 p1, 0x0" + ) + + // endregion + // region patch for hide account menu // for you tab diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/updatescreen/fingerprints/AppBlockingCheckResultToStringFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/general/components/fingerprints/AppBlockingCheckResultToStringFingerprint.kt similarity index 77% rename from src/main/kotlin/app/revanced/patches/youtube/misc/updatescreen/fingerprints/AppBlockingCheckResultToStringFingerprint.kt rename to src/main/kotlin/app/revanced/patches/youtube/general/components/fingerprints/AppBlockingCheckResultToStringFingerprint.kt index 65bcff8f9..82945c9c9 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/updatescreen/fingerprints/AppBlockingCheckResultToStringFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/components/fingerprints/AppBlockingCheckResultToStringFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.youtube.misc.updatescreen.fingerprints +package app.revanced.patches.youtube.general.components.fingerprints import app.revanced.patcher.fingerprint.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/updatescreen/UpdateScreenPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/updatescreen/UpdateScreenPatch.kt deleted file mode 100644 index 70b1bec43..000000000 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/updatescreen/UpdateScreenPatch.kt +++ /dev/null @@ -1,31 +0,0 @@ -package app.revanced.patches.youtube.misc.updatescreen - -import app.revanced.patcher.data.BytecodeContext -import app.revanced.patcher.extensions.InstructionExtensions.addInstructions -import app.revanced.patches.youtube.misc.updatescreen.fingerprints.AppBlockingCheckResultToStringFingerprint -import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE -import app.revanced.patches.youtube.utils.settings.SettingsPatch -import app.revanced.util.patch.BaseBytecodePatch -import app.revanced.util.resultOrThrow -import com.android.tools.smali.dexlib2.util.MethodUtil - -@Suppress("unused") -object UpdateScreenPatch : BaseBytecodePatch( - name = "Disable update screen", - description = "Disable the \"Update your app\" screen that appears when using an outdated client.", - dependencies = setOf(SettingsPatch::class), - compatiblePackages = COMPATIBLE_PACKAGE, - fingerprints = setOf(AppBlockingCheckResultToStringFingerprint) -) { - override fun execute(context: BytecodeContext) { - AppBlockingCheckResultToStringFingerprint.resultOrThrow().mutableClass.methods.first { method -> - MethodUtil.isConstructor(method) - && method.parameters == listOf("Landroid/content/Intent;", "Z") - }.addInstructions( - 1, - "const/4 p1, 0x0" - ) - - SettingsPatch.updatePatchStatus(this) - } -} \ No newline at end of file diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml index 80104f02b..0a06e41d7 100644 --- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml +++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml @@ -610,7 +610,6 @@ -