Spotify: Update premium upsell removal in context menu

Author: chsbuffer

app/src/main/java/io/github/chsbuffer/revancedxposed/spotify/layout/hide/createbutton/Fingerprints.kt

@@ -11,12 +11,14 @@ val oldNavigationBarAddItemFingerprint = fingerprint {
     strings("Bottom navigation tabs exceeds maximum of 5 tabs")
 }
 
+@get:SkipTest
 val navigationBarItemSetClass = findClassDirect {
     fingerprint {
         strings("NavigationBarItemSet(")
     }.declaredClass!!
 }
 
+@get:SkipTest
 val navigationBarItemSetConstructorFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
     // Make sure the method checks whether navigation bar items are null before adding them.

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

@@ -1,7 +1,8 @@
 package io.github.chsbuffer.revancedxposed.spotify.misc
 
-import io.github.chsbuffer.revancedxposed.FindClassFunc
+import io.github.chsbuffer.revancedxposed.AccessFlags
 import io.github.chsbuffer.revancedxposed.Opcode
+import io.github.chsbuffer.revancedxposed.RequireAppVersion
 import io.github.chsbuffer.revancedxposed.SkipTest
 import io.github.chsbuffer.revancedxposed.findClassDirect
 import io.github.chsbuffer.revancedxposed.findFieldDirect
@@ -41,12 +42,33 @@ val contextFromJsonFingerprint = fingerprint {
         )
     }
 }
-val contextMenuViewModelClass: FindClassFunc = findClassDirect {
-    fingerprint {
-        strings("ContextMenuViewModel(header=")
+
+val contextMenuViewModelClass = findClassDirect {
+    return@findClassDirect runCatching {
+        fingerprint {
+            strings("ContextMenuViewModel(header=")
+        }
+    }.getOrElse {
+        fingerprint {
+            accessFlags(AccessFlags.CONSTRUCTOR)
+            strings("ContextMenuViewModel cannot contain items with duplicate itemResId. id=")
+            parameters("L", "Ljava/util/List;", "Z")
+        }
     }.declaredClass!!
 }
 
+val viewModelClazz = findClassDirect {
+    findMethod {
+        findFirst = true
+        matcher { name("getViewModel") }
+    }.single().returnType!!
+}
+
+val isPremiumUpsellField = findFieldDirect {
+    viewModelClazz().fields.filter { it.typeName == "boolean" }[1]
+}
+
+@get:RequireAppVersion("0.0.0.0", "9.0.60.127")
 val oldContextMenuViewModelAddItemFingerprint = fingerprint {
     classMatcher { className(contextMenuViewModelClass(dexkit).name) }
     parameters("L")

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

@@ -78,14 +78,20 @@ fun SpotifyHook.UnlockPremium() {
         Logger.printDebug { "Patch for newest versions. $it" }
         XposedBridge.hookAllConstructors(
             contextMenuViewModelClazz, object : XC_MethodHook() {
+                val isPremiumUpsell = ::isPremiumUpsellField.field
+
                 override fun beforeHookedMethod(param: MethodHookParam) {
                     val parameterTypes =
                         (param.method as Constructor<*>).parameterTypes
                     Logger.printDebug { "ContextMenuViewModel(${parameterTypes.joinToString(",") { it.name }})" }
                     for (i in 0 until param.args.size) {
                         if (parameterTypes[i].name != "java.util.List") continue
                         val original = param.args[i] as? List<*> ?: continue
-                        val filtered = UnlockPremiumPatch.filterContextMenuItems(original)
+                        Logger.printDebug { "List value type: ${original.firstOrNull()?.javaClass}" }
+                        val filtered = original.filter {
+                            it!!.callMethod("getViewModel").let { isPremiumUpsell.get(it) } != true
+                        }
+//                        val filtered = UnlockPremiumPatch.filterContextMenuItems(original)
                         param.args[i] = filtered
                         Logger.printDebug { "Filtered ${original.size - filtered.size} context menu items." }
                     }

app/src/test/java/io/github/chsbuffer/revancedxposed/SharedFingerprintsProvider.java

@@ -1,5 +1,6 @@
 package io.github.chsbuffer.revancedxposed;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -8,7 +9,7 @@ public static List<String> getSharedFingerprints(String app) {
         return switch (app) {
             case "youtube", "music" ->
                     Arrays.asList(io.github.chsbuffer.revancedxposed.shared.misc.debugging.FingerprintsKt.class.getName());
-            default -> null;
+            default -> new ArrayList<>();
         };
     }
 }