fix(Spotify - Unlock Premium): Fix hiding context menu ads for latest version (#5415)

Author: Nuckyz

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/UnlockPremiumPatch.java

@@ -97,13 +97,13 @@ private static class OverrideAttribute {
      */
     private static final List<List<ComponentFilter>> CONTEXT_MENU_ITEMS_COMPONENT_FILTERS = List.of(
             // "Listen to music ad-free" upsell on playlists.
-            List.of(new ResourceIdComponentFilter("context_menu_remove_ads", "id")),
+            List.of(new ResourceIdComponentFilter("context_menu_remove_ads", "string")),
             // "Listen to music ad-free" upsell on albums.
-            List.of(new ResourceIdComponentFilter("playlist_entity_reinventfree_adsfree_context_menu_item", "id")),
+            List.of(new ResourceIdComponentFilter("playlist_entity_reinventfree_adsfree_context_menu_item", "string")),
             // "Start a Jam" context menu item, but only filtered if the user does not have premium and the item is
             // being used as a Premium upsell (ad).
             List.of(
-                    new ResourceIdComponentFilter("group_session_context_menu_start", "id"),
+                    new ResourceIdComponentFilter("group_session_context_menu_start", "string"),
                     new StringComponentFilter("isPremiumUpsell=true")
             )
     );
@@ -227,7 +227,8 @@ public static boolean isFilteredContextMenuItem(Object contextMenuItem) {
                     if (componentFilter.filterUnavailable()) {
                         Logger.printInfo(() -> "isFilteredContextMenuItem: Filter " +
                                 componentFilter.getFilterRepresentation() + " not available, skipping");
-                        continue;
+                        allMatch = false;
+                        break;
                     }
 
                     if (!stringifiedContextMenuItem.contains(componentFilter.getFilterValue())) {

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

@@ -49,8 +49,8 @@ internal val contextMenuViewModelConstructorFingerprint = fingerprint {
 /**
  * Used to find the interface name of a context menu item.
  */
-internal val browsePodcastsContextMenuItemClassFingerprint = fingerprint {
-    strings("browse_podcast_item", "ui_navigate")
+internal val removeAdsContextMenuItemClassFingerprint = fingerprint {
+    strings("remove_ads_item", "ui_navigate")
 }
 
 internal const val CONTEXT_MENU_ITEM_CLASS_DESCRIPTOR_PLACEHOLDER = "Lapp/revanced/ContextMenuItemPlaceholder;"

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

@@ -161,7 +161,7 @@ val unlockPremiumPatch = bytecodePatch(
             // minified names used at runtime. The instructions need to match the original names so we can call the
             // method in the extension.
             extensionFilterContextMenuItemsFingerprint.method.apply {
-                val contextMenuItemInterfaceClassDef = browsePodcastsContextMenuItemClassFingerprint
+                val contextMenuItemInterfaceClassDef = removeAdsContextMenuItemClassFingerprint
                     .originalClassDef
                     .interfaces
                     .firstOrNull()