YouTube: Support multiple videoQualityMenuViewInflate methods

Support YouTube 20.43.32

Author: chsbuffer

app/src/main/java/io/github/chsbuffer/revancedxposed/youtube/video/quality/AdvancedVideoQualityMenuPatch.kt

@@ -29,17 +29,19 @@ fun YoutubeHook.AdvancedVideoQualityMenu() {
     // region Patch for the old type of the video quality menu.
     // Used for regular videos when spoofing to old app version,
     // and for the Shorts quality flyout on newer app versions.
-    ::videoQualityMenuViewInflateFingerprint.hookMethod(scopedHook(DexMethod("Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;").toMember()) {
-        val bottom_sheet_list_fragment =
-            Utils.getResourceIdentifier("bottom_sheet_list_fragment", "layout")
-        val bottom_sheet_list_view = Utils.getResourceIdentifier("bottom_sheet_list_view", "id")
-        after {
-            if (it.args[0] != bottom_sheet_list_fragment) return@after
-            val view = it.result as View
-            val listView: ListView = view.findViewById(bottom_sheet_list_view)
-            AdvancedVideoQualityMenuPatch.addVideoQualityListMenuListener(listView)
-        }
-    })
+    ::videoQualityMenuViewInflateFingerprint.dexMethodList.forEach {
+        it.hookMethod(scopedHook(DexMethod("Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;").toMember()) {
+            val bottom_sheet_list_fragment =
+                Utils.getResourceIdentifier("bottom_sheet_list_fragment", "layout")
+            val bottom_sheet_list_view = Utils.getResourceIdentifier("bottom_sheet_list_view", "id")
+            after {
+                if (it.args[0] != bottom_sheet_list_fragment) return@after
+                val view = it.result as View
+                val listView: ListView = view.findViewById(bottom_sheet_list_view)
+                AdvancedVideoQualityMenuPatch.addVideoQualityListMenuListener(listView)
+            }
+        })
+    }
 
     // Force YT to add the 'advanced' quality menu for Shorts.
     ::videoQualityMenuOptionsFingerprint.hookMethod {

app/src/main/java/io/github/chsbuffer/revancedxposed/youtube/video/quality/Fingerprints.kt

@@ -2,8 +2,14 @@ package io.github.chsbuffer.revancedxposed.youtube.video.quality
 
 import io.github.chsbuffer.revancedxposed.AccessFlags
 import io.github.chsbuffer.revancedxposed.Opcode
+import io.github.chsbuffer.revancedxposed.accessFlags
+import io.github.chsbuffer.revancedxposed.findMethodListDirect
 import io.github.chsbuffer.revancedxposed.fingerprint
+import io.github.chsbuffer.revancedxposed.literal
+import io.github.chsbuffer.revancedxposed.opcodes
+import io.github.chsbuffer.revancedxposed.parameters
 import io.github.chsbuffer.revancedxposed.resourceMappings
+import io.github.chsbuffer.revancedxposed.returns
 
 val videoQualityItemOnClickParentFingerprint = fingerprint {
     returns("V")
@@ -41,25 +47,31 @@ val videoQualityBottomSheetListFragmentTitle get() = resourceMappings[
     "video_quality_bottom_sheet_list_fragment_title",
 ]
 
-val videoQualityMenuViewInflateFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("L")
-    parameters("L", "L", "L")
-    opcodes(
-        Opcode.INVOKE_SUPER,
-        Opcode.CONST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST_16,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-    )
-    literal { videoQualityBottomSheetListFragmentTitle }
-}
+val videoQualityMenuViewInflateFingerprint = findMethodListDirect {
+    // two matches in versions 20.43.32
+    // one match in versions <=v20.42.xx
+    findMethod {
+        matcher {
+            accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+            returns("L")
+            parameters("L", "L", "L")
+            opcodes(
+                Opcode.INVOKE_SUPER,
+                Opcode.CONST,
+                Opcode.CONST_4,
+                Opcode.INVOKE_VIRTUAL,
+                Opcode.MOVE_RESULT_OBJECT,
+                Opcode.CONST,
+                Opcode.INVOKE_VIRTUAL,
+                Opcode.MOVE_RESULT_OBJECT,
+                Opcode.CONST_16,
+                Opcode.INVOKE_VIRTUAL,
+                Opcode.CONST,
+                Opcode.INVOKE_VIRTUAL,
+                Opcode.MOVE_RESULT_OBJECT,
+                Opcode.CHECK_CAST,
+            )
+            literal { videoQualityBottomSheetListFragmentTitle }
+        }
+    }
+}