From 3f8b29ed40343f44d9e89ea752c2557981994308 Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Fri, 6 Oct 2023 12:27:50 +0900 Subject: [PATCH] fix(youtube/disable-haptic-feedback): force close occurs in YouTube v18.27.36 --- .../player/hapticfeedback/patch/HapticFeedBackPatch.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/patch/HapticFeedBackPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/patch/HapticFeedBackPatch.kt index 03352f3d8..d628b7649 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/patch/HapticFeedBackPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/patch/HapticFeedBackPatch.kt @@ -19,6 +19,7 @@ import app.revanced.patches.youtube.player.hapticfeedback.fingerprints.ZoomHapti import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch import app.revanced.util.integrations.Constants.PLAYER +import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction @Patch @@ -65,7 +66,9 @@ class HapticFeedBackPatch : BytecodePatch( var register = 0 if (this.name == "run") { - index = it.scanResult.patternScanResult!!.startIndex + index = implementation!!.instructions.indexOfFirst { instruction -> + instruction.opcode == Opcode.SGET + } register = getInstruction(index).registerA }