From 1438f92246ec8aded20925cfd452186b071aeb50 Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Fri, 20 Oct 2023 11:20:29 +0900 Subject: [PATCH] feat(YouTube/Custom speed overlay): remove `Disable speed overlay` settings --- .../player/speedoverlay/SpeedOverlayPatch.kt | 17 ----------------- .../SpeedOverlayConfigFingerprint.kt | 10 ---------- 2 files changed, 27 deletions(-) delete mode 100644 src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/fingerprints/SpeedOverlayConfigFingerprint.kt diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/SpeedOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/SpeedOverlayPatch.kt index 5164e108e..e65f4f65c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/SpeedOverlayPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/SpeedOverlayPatch.kt @@ -8,7 +8,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.Patch -import app.revanced.patches.youtube.player.speedoverlay.fingerprints.SpeedOverlayConfigFingerprint import app.revanced.patches.youtube.player.speedoverlay.fingerprints.SpeedOverlayHookAlternativeFingerprint import app.revanced.patches.youtube.player.speedoverlay.fingerprints.SpeedOverlayHookFingerprint import app.revanced.patches.youtube.player.speedoverlay.fingerprints.YouTubeTextViewFingerprint @@ -17,7 +16,6 @@ import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.Speed import app.revanced.patches.youtube.utils.settings.SettingsPatch import app.revanced.util.integrations.Constants.UTILS_PATH import com.android.tools.smali.dexlib2.Opcode -import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c @@ -53,7 +51,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c @Suppress("unused") object SpeedOverlayPatch : BytecodePatch( setOf( - SpeedOverlayConfigFingerprint, SpeedOverlayHookAlternativeFingerprint, SpeedOverlayHookFingerprint, YouTubeTextViewFingerprint @@ -61,20 +58,6 @@ object SpeedOverlayPatch : BytecodePatch( ) { override fun execute(context: BytecodeContext) { - SpeedOverlayConfigFingerprint.result?.let { - it.mutableMethod.apply { - val insertIndex = implementation!!.instructions.size - 1 - val targetRegister = getInstruction(insertIndex).registerA - - addInstructions( - insertIndex, """ - invoke-static {v$targetRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->disableSpeedOverlay(Z)Z - move-result v$targetRegister - """ - ) - } - } ?: throw SpeedOverlayConfigFingerprint.exception - val speedOverlayHookResult = SpeedOverlayHookFingerprint.result ?: SpeedOverlayHookAlternativeFingerprint.result diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/fingerprints/SpeedOverlayConfigFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/fingerprints/SpeedOverlayConfigFingerprint.kt deleted file mode 100644 index 09d0402bd..000000000 --- a/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/fingerprints/SpeedOverlayConfigFingerprint.kt +++ /dev/null @@ -1,10 +0,0 @@ -package app.revanced.patches.youtube.player.speedoverlay.fingerprints - -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint -import app.revanced.util.bytecode.isWide32LiteralExists - -object SpeedOverlayConfigFingerprint : MethodFingerprint( - returnType = "Z", - parameters = emptyList(), - customFingerprint = { methodDef, _ -> methodDef.isWide32LiteralExists(45411330) } -) \ No newline at end of file