fix(youtube): reliably resolve fingerprints

Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/createbutton/fingerprints/PivotBarCreateButtonViewFingerprint.kt

@@ -5,10 +5,7 @@ import org.jf.dexlib2.Opcode
 
 object PivotBarCreateButtonViewFingerprint : MethodFingerprint(
     opcodes = listOf(
+        Opcode.MOVE_OBJECT,
         Opcode.INVOKE_DIRECT_RANGE, // unique instruction anchor
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_STATIC
     )
 )

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt

@@ -22,6 +22,7 @@ import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.REGISTE
 import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.injectHook
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import org.jf.dexlib2.Opcode
 
 @Patch
 @DependsOn([IntegrationsPatch::class, ResourceMappingPatch::class, SettingsPatch::class, ResolvePivotBarFingerprintsPatch::class])
@@ -54,17 +55,24 @@ class CreateButtonRemoverPatch : BytecodePatch() {
                 return PivotBarCreateButtonViewFingerprint.toErrorResult()
         }
 
-        val createButtonResult = PivotBarCreateButtonViewFingerprint.result!!
-        val insertIndex = createButtonResult.scanResult.patternScanResult!!.endIndex
+        PivotBarCreateButtonViewFingerprint.result!!.apply {
+            val insertIndex = mutableMethod.implementation!!.instructions.let {
+                val scanStart = scanResult.patternScanResult!!.endIndex
 
-        /*
-         * Inject hooks
-         */
+                scanStart + it.subList(scanStart, it.size - 1).indexOfFirst { instruction ->
+                    instruction.opcode == Opcode.INVOKE_STATIC
+                }
+            }
 
-        val hook = "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, " +
-                "$INTEGRATIONS_CLASS_DESCRIPTOR->hideCreateButton(Landroid/view/View;)V"
+            /*
+             * Inject hooks
+             */
+            val hook = "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, " +
+                    "$INTEGRATIONS_CLASS_DESCRIPTOR->hideCreateButton(Landroid/view/View;)V"
+
+            mutableMethod.injectHook(hook, insertIndex)
+        }
 
-        createButtonResult.mutableMethod.injectHook(hook, insertIndex)
 
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/youtube/layout/playerpopuppanels/fingerprints/EngagementPanelControllerFingerprint.kt

@@ -4,33 +4,14 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
 
 
 @FuzzyPatternScanMethod(3)
 object EngagementPanelControllerFingerprint : MethodFingerprint(
-    "L", AccessFlags.PRIVATE or AccessFlags.FINAL, listOf("L", "L", "Z", "Z", "Z"), listOf(
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_FROM16,
-        Opcode.IGET_BOOLEAN,
-        Opcode.CONST_4,
-        Opcode.IF_NEZ,
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_STATIC,
-        Opcode.SGET_OBJECT,
-        Opcode.SGET_OBJECT,
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_STATIC,
-        Opcode.RETURN_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
+    returnType = "L",
+    access = AccessFlags.PRIVATE or AccessFlags.FINAL,
+    strings = listOf(
+        "EngagementPanelController: cannot show EngagementPanel before EngagementPanelController.init() has been called.",
+        "[EngagementPanel] Cannot show EngagementPanel before EngagementPanelController.init() has been called."
     )
 )

src/main/kotlin/app/revanced/patches/youtube/layout/playerpopuppanels/patch/PlayerPopupPanelsPatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.playerpopuppanels.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -10,12 +11,12 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.layout.playerpopuppanels.annotations.PlayerPopupPanelsCompatibility
 import app.revanced.patches.youtube.layout.playerpopuppanels.fingerprints.EngagementPanelControllerFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 
 @Patch
 @DependsOn([IntegrationsPatch::class, SettingsPatch::class])
@@ -39,7 +40,8 @@ class PlayerPopupPanelsPatch : BytecodePatch(
             )
         )
 
-        val engagementPanelControllerMethod = EngagementPanelControllerFingerprint.result!!.mutableMethod
+        val engagementPanelControllerMethod = EngagementPanelControllerFingerprint
+            .result?.mutableMethod ?: return EngagementPanelControllerFingerprint.toErrorResult()
 
         engagementPanelControllerMethod.addInstructions(
             0, """