fix(youtube/bypass-ambient-mode-restrictions): update fingerprint

YT-Advanced · Sep 14, 2023 · 6087d7b · 6087d7b
1 parent 88d6389
commit 6087d7b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/...nced/patches/youtube/misc/ambientmode/fingerprints/PowerSaveModeAlternativeFingerprint.kt b/...nced/patches/youtube/misc/ambientmode/fingerprints/PowerSaveModeAlternativeFingerprint.kt
@@ -0,0 +1,23 @@
+package app.revanced.patches.youtube.misc.ambientmode.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.util.bytecode.isNarrowLiteralExists
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+object PowerSaveModeAlternativeFingerprint : MethodFingerprint(
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("Ljava/lang/Object;"),
+    opcodes = listOf(
+        Opcode.IF_GT,
+        Opcode.IGET,
+        Opcode.ADD_INT_2ADDR
+    ),
+    customFingerprint = { methodDef, _ ->
+        methodDef.isNarrowLiteralExists(107243) && methodDef.isNarrowLiteralExists(
+            140796
+        ) && methodDef.name == "accept"
+    }
+)
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/patch/PowerSaveModePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/patch/PowerSaveModePatch.kt
@@ -12,6 +12,7 @@ import app.revanced.patcher.patch.PatchException
 
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.youtube.misc.ambientmode.fingerprints.PowerSaveModeAlternativeFingerprint
 import app.revanced.patches.youtube.misc.ambientmode.fingerprints.PowerSaveModeFingerprint
 import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
@@ -34,11 +35,19 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 @YouTubeCompatibility
 
 class PowerSaveModePatch : BytecodePatch(
-    listOf(PowerSaveModeFingerprint)
+    listOf(
+        PowerSaveModeAlternativeFingerprint,
+        PowerSaveModeFingerprint
+    )
 ) {
     override fun execute(context: BytecodeContext) {
 
-        PowerSaveModeFingerprint.result?.let {
+        val result =
+            PowerSaveModeFingerprint.result
+                ?: PowerSaveModeAlternativeFingerprint.result
+                ?: throw PowerSaveModeFingerprint.exception
+
+        result.let {
             it.mutableMethod.apply {
                 var insertIndex = -1
 
@@ -62,7 +71,7 @@ class PowerSaveModePatch : BytecodePatch(
                 if (insertIndex == -1)
                     throw PatchException("Couldn't find PowerManager reference")
             }
-        } ?: throw PowerSaveModeFingerprint.exception
+        }
 
         /**
          * Add settings