fix(Spotify - Unlock Premium): Fix hiding context menu ads on newest versions by simplifying fingerprint (#5318)

Author: oSumAtrIX

patches/src/main/kotlin/app/revanced/patches/spotify/misc/Fingerprints.kt

@@ -57,7 +57,6 @@ internal val oldContextMenuViewModelAddItemFingerprint = fingerprint {
 
 internal val contextMenuViewModelConstructorFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
-    parameters("L", "Z", "Ljava/util/List;")
 }
 
 /**
@@ -67,7 +66,7 @@ internal val browsePodcastsContextMenuItemClassFingerprint = fingerprint {
     strings("browse_podcast_item", "ui_navigate")
 }
 
-internal const val CONTEXT_MENU_ITEM_PLACEHOLDER_CLASS_NAME = "Lapp/revanced/ContextMenuItemPlaceholder;"
+internal const val CONTEXT_MENU_ITEM_CLASS_DESCRIPTOR_PLACEHOLDER = "Lapp/revanced/ContextMenuItemPlaceholder;"
 internal val extensionFilterContextMenuItemsFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
     returns("Ljava/util/List;")
@@ -134,7 +133,7 @@ internal val homeStructureGetSectionsFingerprint =
     structureGetSectionsFingerprint("homeapi/proto/HomeStructure;")
 
 internal val browseSectionFingerprint = fingerprint {
-    custom { _, classDef -> classDef.endsWith("browsita/v1/resolved/Section;") }
+    custom { _, classDef-> classDef.endsWith("browsita/v1/resolved/Section;") }
 }
 
 internal val browseStructureGetSectionsFingerprint =

patches/src/main/kotlin/app/revanced/patches/spotify/misc/UnlockPremiumPatch.kt

@@ -178,29 +178,27 @@ val unlockPremiumPatch = bytecodePatch(
                     ?.let { interfaceName -> classes.find { it.type == interfaceName } }
                     ?: throw PatchException("Could not find context menu item interface.")
 
-                val contextMenuItemInterfaceName = contextMenuItemInterfaceClassDef.type
-
                 val contextMenuItemViewModelClassName = getViewModelFingerprint
                     .matchOrNull(contextMenuItemInterfaceClassDef)
                     ?.originalMethod
                     ?.returnType
                     ?: throw PatchException("Could not find context menu item view model class.")
 
                 val castContextMenuItemStubIndex = indexOfFirstInstructionOrThrow {
-                    getReference<TypeReference>()?.type == CONTEXT_MENU_ITEM_PLACEHOLDER_CLASS_NAME
+                    getReference<TypeReference>()?.type == CONTEXT_MENU_ITEM_CLASS_DESCRIPTOR_PLACEHOLDER
                 }
                 val contextMenuItemRegister = getInstruction<OneRegisterInstruction>(castContextMenuItemStubIndex)
                     .registerA
                 val getContextMenuItemStubViewModelIndex = indexOfFirstInstructionOrThrow {
-                    getReference<MethodReference>()?.definingClass == CONTEXT_MENU_ITEM_PLACEHOLDER_CLASS_NAME
+                    getReference<MethodReference>()?.definingClass == CONTEXT_MENU_ITEM_CLASS_DESCRIPTOR_PLACEHOLDER
                 }
 
                 val getViewModelDescriptor =
-                    "$contextMenuItemInterfaceName->getViewModel()$contextMenuItemViewModelClassName"
+                    "$contextMenuItemInterfaceClassDef->getViewModel()$contextMenuItemViewModelClassName"
 
                 replaceInstruction(
                     castContextMenuItemStubIndex,
-                    "check-cast v$contextMenuItemRegister, $contextMenuItemInterfaceName"
+                    "check-cast v$contextMenuItemRegister, $contextMenuItemInterfaceClassDef"
                 )
                 replaceInstruction(
                     getContextMenuItemStubViewModelIndex,
@@ -209,14 +207,15 @@ val unlockPremiumPatch = bytecodePatch(
             }
 
             contextMenuViewModelConstructorFingerprint.match(contextMenuViewModelClassDef).method.apply {
+                val itemsListParameter = parameters.indexOfFirst { it.type == "Ljava/util/List;" } + 1
                 val filterContextMenuItemsDescriptor =
                     "$EXTENSION_CLASS_DESCRIPTOR->filterContextMenuItems(Ljava/util/List;)Ljava/util/List;"
 
                 addInstructions(
                     0,
                     """
-                        invoke-static { p3 }, $filterContextMenuItemsDescriptor
-                        move-result-object p3
+                        invoke-static { p$itemsListParameter }, $filterContextMenuItemsDescriptor
+                        move-result-object p$itemsListParameter
                     """
                 )
             }
@@ -306,8 +305,8 @@ val unlockPremiumPatch = bytecodePatch(
                 onErrorReturnCallIndex,
                 "invoke-static { v$onErrorReturnValueRegister }, " +
                         "$singleClassName->just(Ljava/lang/Object;)$singleClassName\n" +
-                "move-result-object v$onErrorReturnValueRegister\n" +
-                "return-object v$onErrorReturnValueRegister"
+                        "move-result-object v$onErrorReturnValueRegister\n" +
+                        "return-object v$onErrorReturnValueRegister"
             )
 
             // Remove every instruction from the request call to right before the error static value construction.