YouTube: support 20.41.xx

Author: chsbuffer

app/src/main/java/io/github/chsbuffer/revancedxposed/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt

@@ -12,9 +12,10 @@ fun YoutubeHook.DisableResumingShortsOnStartup() {
     )
 
     ::userWasInShortsFingerprint.hookMethod(scopedHook(::userWasInShortsBuilderFingerprint.member) {
+        val arg = ::userWasInShortsBuilderFingerprint.dexMethod.paramTypeNames.indexOf("boolean")
         before {
-            it.args[0] =
-                DisableResumingStartupShortsPlayerPatch.disableResumingStartupShortsPlayer(it.args[0] as Boolean)
+            it.args[arg] =
+                DisableResumingStartupShortsPlayerPatch.disableResumingStartupShortsPlayer(it.args[arg] as Boolean)
         }
     })
 

app/src/main/java/io/github/chsbuffer/revancedxposed/youtube/layout/startupshortsreset/Fingerprints.kt

@@ -12,9 +12,10 @@ val userWasInShortsFingerprint = fingerprint {
 }
 
 val userWasInShortsBuilderFingerprint = findMethodDirect {
-    userWasInShortsFingerprint().invokes.findMethod {
-        matcher { paramTypes("boolean", "int") }
-    }.single()
+    val paramTypes = listOf("boolean", "int")
+    userWasInShortsFingerprint().invokes.single {
+        it.paramTypeNames.takeLast(2) == paramTypes
+    }
 }
 
 /**

app/src/main/java/io/github/chsbuffer/revancedxposed/youtube/shared/Fingerprints.kt

@@ -11,14 +11,7 @@ internal const val YOUTUBE_MAIN_ACTIVITY_CLASS_TYPE = "Lcom/google/android/apps/
 
 val conversionContextFingerprintToString = fingerprint {
     parameters()
-    strings(
-        "ConversionContext{containerInternal=",
-        ", widthConstraint=",
-        ", heightConstraint=",
-        ", templateLoggerFactory=",
-        ", rootDisposableContainer=",
-        ", identifierProperty="
-    )
+    strings("ConversionContext{")
 }
 
 val mainActivityConstructorFingerprint = fingerprint {