fix(GmsCore support): Firebase installations error

YT-Advanced · Jan 10, 2025 · 18cd39b · 18cd39b
1 parent 8bdf785
commit 18cd39b
Show file tree

Hide file tree

Showing 3 changed files with 112 additions and 229 deletions.
diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/ads/BaseAdsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/shared/ads/BaseAdsPatch.kt
@@ -32,15 +32,20 @@ fun baseAdsPatch(
 ) {
     execute {
 
-        videoAdsFingerprint.methodOrThrow().apply {
-            addInstructionsWithLabels(
-                0, """
-                    invoke-static {}, $classDescriptor->$methodDescriptor()Z
-                    move-result v0
-                    if-nez v0, :show_ads
-                    return-void
-                    """, ExternalLabel("show_ads", getInstruction(0))
-            )
+        setOf(
+            sslGuardFingerprint,
+            videoAdsFingerprint,
+        ).forEach { fingerprint ->
+            fingerprint.methodOrThrow().apply {
+                addInstructionsWithLabels(
+                    0, """
+                        invoke-static {}, $classDescriptor->$methodDescriptor()Z
+                        move-result v0
+                        if-nez v0, :show_ads
+                        return-void
+                        """, ExternalLabel("show_ads", getInstruction(0))
+                )
+            }
         }
 
         musicAdsFingerprint.methodOrThrow().apply {
@@ -60,7 +65,6 @@ fun baseAdsPatch(
                         """
                 )
         }
-
     }
 }
 

diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/ads/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/shared/ads/Fingerprints.kt
@@ -5,6 +5,13 @@ import app.revanced.util.or
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
+internal val sslGuardFingerprint = legacyFingerprint(
+    name = "sslGuardFingerprint",
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    strings = listOf("Cannot initialize SslGuardSocketFactory will null"),
+)
+
 internal val musicAdsFingerprint = legacyFingerprint(
     name = "musicAdsFingerprint",
     returnType = "V",