YouTub: Updated PlayerType NavigationBarHook to support YT 20.28.35

Author: chsbuffer

app/src/main/java/io/github/chsbuffer/revancedxposed/youtube/misc/NavigationBarHook.kt

@@ -103,31 +103,4 @@ fun YoutubeHook.NavigationBarHook() {
     initializeButtonsFingerprint.hookMethod(ScopedHook(pivotBarButtonsCreateResourceViewFingerprint.toMethod()) {
         after { NavigationBar.navigationImageResourceTabLoaded(param.result as View) }
     })
-
-    // Fix YT bug of notification tab missing the filled icon.
-    val tabActivityCairo =
-        navigationEnumClass.toClass().enumConstants?.firstOrNull { (it as? Enum<*>)?.name == "TAB_ACTIVITY_CAIRO" } as? Enum<*>
-    if (tabActivityCairo != null) {
-        getDexMethod("setEnumMapFingerprint") {
-            fingerprint {
-                accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
-                literal {
-                    Utils.getResourceIdentifier("yt_fill_bell_black_24", "drawable")
-                }
-            }
-        }.hookMethod(object : XC_MethodHook() {
-            override fun afterHookedMethod(param: MethodHookParam) {
-                val obj = param.thisObject
-                param.thisObject.javaClass.declaredFields.forEach {
-                    it.isAccessible = true
-                    val enumMap = it.get(obj) as? EnumMap<*, *>
-                    if (enumMap !is EnumMap<*, *>) return@forEach
-                    // check is valueType int (resource id)
-                    val valueType = enumMap.values.first()::class.java
-                    if (valueType != Int::class.java) return@forEach
-                    NavigationBar.setCairoNotificationFilledIcon(enumMap, tabActivityCairo)
-                }
-            }
-        })
-    }
 }

app/src/main/java/io/github/chsbuffer/revancedxposed/youtube/misc/PlayerType.kt

@@ -11,6 +11,7 @@ import io.github.chsbuffer.revancedxposed.opcodes
 import io.github.chsbuffer.revancedxposed.youtube.YoutubeHook
 import org.luckypray.dexkit.query.enums.StringMatchType
 import org.luckypray.dexkit.result.FieldUsingType
+import java.lang.reflect.Modifier
 
 @SuppressLint("NonUniqueDexKitData")
 fun YoutubeHook.PlayerTypeHook() {
@@ -22,16 +23,12 @@ fun YoutubeHook.PlayerTypeHook() {
             }
         }.findMethod {
             matcher {
+                modifiers = Modifier.PUBLIC
                 returnType = "void"
                 paramCount = 1
-                opcodes(
-                    Opcode.IF_NE,
-                    Opcode.RETURN_VOID,
-                )
             }
         }.single {
-            // enum class
-            it.paramTypes[0].descriptor.length > 1
+            it.paramTypes[0].superClass?.descriptor == "Ljava/lang/Enum;"
         }
     }.hookMethod(object : XC_MethodHook() {
         override fun beforeHookedMethod(param: MethodHookParam) {