chore: Merge branch dev to main (#5414)

Author: oSumAtrIX

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [5.31.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.31.0...v5.31.1-dev.1) (2025-07-11)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Fix hiding context menu ads for latest version ([#5415](https://github.com/ReVanced/revanced-patches/issues/5415)) ([dcde393](https://github.com/ReVanced/revanced-patches/commit/dcde3935bde3172576d0f9f5ff9eb62ecfff7dfe))
+
 # [5.31.0](https://github.com/ReVanced/revanced-patches/compare/v5.30.0...v5.31.0) (2025-07-11)
 
 

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())) {

gradle.properties

@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.31.0
+version = 5.31.1-dev.1

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()

patches/src/main/resources/addresources/values/strings.xml

@@ -765,9 +765,9 @@ To show the Audio track menu, change \'Spoof video streams\' to iOS TV"</string>
             <string name="revanced_hide_cast_button_title">Hide Cast button</string>
             <string name="revanced_hide_cast_button_summary_on">Cast button is hidden</string>
             <string name="revanced_hide_cast_button_summary_off">Cast button is shown</string>
-            <string name="revanced_hide_player_control_buttons_background_title">Hide player control buttons background</string>
-            <string name="revanced_hide_player_control_buttons_background_summary_on">Player control buttons background is hidden</string>
-            <string name="revanced_hide_player_control_buttons_background_summary_off">Player control buttons background is shown</string>
+            <string name="revanced_hide_player_control_buttons_background_title">Hide player controls background</string>
+            <string name="revanced_hide_player_control_buttons_background_summary_on">Player controls background is hidden</string>
+            <string name="revanced_hide_player_control_buttons_background_summary_off">Player controls background is shown</string>
             <string name="revanced_hide_player_previous_next_buttons_title">Hide Previous &amp; Next buttons</string>
             <string name="revanced_hide_player_previous_next_buttons_summary_on">Buttons are hidden</string>
             <string name="revanced_hide_player_previous_next_buttons_summary_off">Buttons are shown</string>