Sync v5.31.1

* **Spotify - Unlock Premium:** Fix hiding context menu ads for latest version
* **Spotify - Unlock Premium:** Remove wrongfully hidden non ad browse sections
* **Spotify:** Remove other ads type from the browse screen
* **Spotify:** Remove support for old versions
* **YouTube - Hide ads:** Hide new type of general ad

Author: chsbuffer

app/build.gradle.kts

@@ -15,7 +15,7 @@ android {
         applicationId = "io.github.chsbuffer.revancedxposed"
         versionCode = 20
         versionName = "1.0.$versionCode"
-        val patchVersion = "5.30.0"
+        val patchVersion = "5.31.1"
         buildConfigField("String", "PATCH_VERSION", "\"$patchVersion\"")
     }
     flavorDimensions += "abi"

app/src/main/java/io/github/chsbuffer/revancedxposed/spotify/SanitizeSharingLinks.kt

@@ -5,26 +5,26 @@ import app.revanced.extension.spotify.misc.privacy.SanitizeSharingLinksPatch
 import de.robv.android.xposed.XC_MethodHook
 import de.robv.android.xposed.XposedHelpers
 import io.github.chsbuffer.revancedxposed.ScopedHook
-import io.github.chsbuffer.revancedxposed.strings
+import io.github.chsbuffer.revancedxposed.fingerprint
 import java.lang.reflect.Modifier
 
 fun SpotifyHook.SanitizeSharingLinks() {
     getDexMethod("shareCopyUrlFingerprint") {
-        findMethod {
-            matcher {
-                if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-                    returnType("java.lang.Object")
-                    paramTypes("java.lang.Object")
-                    strings("clipboard", "createNewSession failed")
-                    name("apply")
-                } else {
-                    returnType("java.lang.Object")
-                    paramTypes("java.lang.Object")
-                    strings("clipboard", "Spotify Link")
-                    name("invokeSuspend")
-                }
+        runCatching {
+            fingerprint {
+                returns("Ljava/lang/Object;")
+                parameters("Ljava/lang/Object;")
+                strings("clipboard", "Spotify Link")
+                methodMatcher { name = "invokeSuspend" }
+            }
+        }.getOrElse {
+            fingerprint {
+                returns("Ljava/lang/Object;")
+                parameters("Ljava/lang/Object;")
+                strings("clipboard", "createNewSession failed")
+                methodMatcher { name = "apply" }
             }
-        }.single()
+        }
     }.hookMethod(
         ScopedHook(
             XposedHelpers.findMethodExact(
@@ -43,22 +43,32 @@ fun SpotifyHook.SanitizeSharingLinks() {
     )
 
     getDexMethod("formatAndroidShareSheetUrlFingerprint") {
-        findMethod {
-            matcher {
-                returnType("java.lang.String")
-                addUsingNumber('\n'.code)
-                if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-                    modifiers = Modifier.PUBLIC
-                    paramTypes("com.spotify.share.social.sharedata.ShareData", "java.lang.String")
-                } else {
+        runCatching {
+            findMethod {
+                matcher {
+                    returnType("java.lang.String")
+                    addUsingNumber('\n'.code)
                     modifiers = Modifier.PUBLIC or Modifier.STATIC
                     paramTypes(null, "java.lang.String")
                 }
+            }.single {
+                // exclude
+                // `(PlayerState, String) -> String` usingNumbers(1, 10); usingStrings("")
+                !it.usingStrings.contains("")
+            }
+        }.getOrElse {
+            findMethod {
+                matcher {
+                    returnType("java.lang.String")
+                    addUsingNumber('\n'.code)
+                    modifiers = Modifier.PUBLIC
+                    paramTypes("com.spotify.share.social.sharedata.ShareData", "java.lang.String")
+                }
+            }.single {
+                // exclude
+                // `(PlayerState, String) -> String` usingNumbers(1, 10); usingStrings("")
+                !it.usingStrings.contains("")
             }
-        }.single {
-            // exclude
-            // `(PlayerState, String) -> String` usingNumbers(1, 10); usingStrings("")
-            !it.usingStrings.contains("")
         }
     }.hookMethod(object : XC_MethodHook() {
         override fun beforeHookedMethod(param: MethodHookParam) {

app/src/main/java/io/github/chsbuffer/revancedxposed/spotify/SpotifyHook.kt

@@ -6,6 +6,7 @@ import android.content.Context
 import app.revanced.extension.shared.Logger
 import app.revanced.extension.shared.Utils
 import app.revanced.extension.spotify.misc.UnlockPremiumPatch
+import com.spotify.remoteconfig.internal.AccountAttribute
 import de.robv.android.xposed.XC_MethodHook
 import de.robv.android.xposed.XposedBridge
 import de.robv.android.xposed.XposedHelpers
@@ -34,9 +35,6 @@ class SpotifyHook(app: Application, lpparam: LoadPackageParam) : BaseHook(app, l
         ::UnlockPremium,
     )
 
-    val IS_SPOTIFY_LEGACY_APP_TARGET =
-        runCatching { classLoader.loadClass("com.spotify.music.MainActivity") }.isSuccess
-
     fun Extension() {
         // Logger
         Utils.setContext(app)
@@ -77,16 +75,10 @@ class SpotifyHook(app: Application, lpparam: LoadPackageParam) : BaseHook(app, l
 fun SpotifyHook.UnlockPremium() {
     // Override the attributes map in the getter method.
     getDexMethod("productStateProtoFingerprint") {
-        findClass {
-            matcher {
-                if (IS_SPOTIFY_LEGACY_APP_TARGET) className("com.spotify.ucs.proto.v0.UcsResponseWrapper\$AccountAttributesResponse")
-                else className("com.spotify.remoteconfig.internal.ProductStateProto")
-            }
-        }.findMethod {
-            matcher {
-                returnType = "java.util.Map"
-            }
-        }.single().also { method ->
+        fingerprint {
+            returns("Ljava/util/Map;")
+            classMatcher { descriptor = "Lcom/spotify/remoteconfig/internal/ProductStateProto;" }
+        }.also { method ->
             getDexField("attributesMapField") {
                 method.usingFields.single().field
             }
@@ -95,7 +87,7 @@ fun SpotifyHook.UnlockPremium() {
         val field = getDexField("attributesMapField").toField()
         override fun beforeHookedMethod(param: MethodHookParam) {
             Logger.printDebug { field.get(param.thisObject)!!.toString() }
-            UnlockPremiumPatch.overrideAttributes(field.get(param.thisObject) as Map<String, *>)
+            UnlockPremiumPatch.overrideAttributes(field.get(param.thisObject) as Map<String, AccountAttribute>)
         }
     })
 
@@ -118,12 +110,6 @@ fun SpotifyHook.UnlockPremium() {
         }
     })
 
-    // following patches may not support legacy Spotify version.
-    if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-        Utils.showToastShort("Patching a legacy Spotify version. Patch functionality may be limited.")
-        return
-    }
-
     // Enable choosing a specific song/artist via Google Assistant.
     getDexMethod("contextFromJsonFingerprint") {
         fingerprint {

app/src/main/java/io/github/chsbuffer/revancedxposed/youtube/ad/HideAds.kt

@@ -17,16 +17,15 @@ fun YoutubeHook.HideAds() {
     )
 
     PreferenceScreen.ADS.addPreferences(
-        SwitchPreference("revanced_hide_creator_store_shelves"),
+        SwitchPreference("revanced_hide_creator_store_shelf"),
 //        SwitchPreference("revanced_hide_end_screen_store_banner"),
         SwitchPreference("revanced_hide_fullscreen_ads"),
         SwitchPreference("revanced_hide_general_ads"),
         SwitchPreference("revanced_hide_merchandise_banners"),
         SwitchPreference("revanced_hide_paid_promotion_label"),
         SwitchPreference("revanced_hide_self_sponsor_ads"),
-        SwitchPreference("revanced_hide_tagged_products"),
+        SwitchPreference("revanced_hide_shopping_links"),
         SwitchPreference("revanced_hide_view_products_banner"),
-        SwitchPreference("revanced_hide_visit_store_button"),
         SwitchPreference("revanced_hide_web_search_results"),
     )