fix(GmsCore support): Firebase installations error

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

Hide file tree

Showing 3 changed files with 139 additions and 228 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
@@ -10,6 +10,7 @@ import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.shared.extension.Constants.PATCHES_PATH
+import app.revanced.util.fingerprint.matchOrThrow
 import app.revanced.util.fingerprint.methodOrThrow
 import app.revanced.util.getReference
 import app.revanced.util.getWalkerMethod
@@ -32,15 +33,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 {
@@ -61,6 +67,21 @@ fun baseAdsPatch(
                 )
         }
 
+        advertisingIdFingerprint.matchOrThrow().let {
+            it.method.apply {
+                val insertIndex = it.stringMatches!!.first().index
+                val insertRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
+                addInstructionsWithLabels(
+                    insertIndex, """
+                        invoke-static {}, $classDescriptor->$methodDescriptor()Z
+                        move-result v$insertRegister
+                        if-nez v$insertRegister, :enable_id
+                        return-void
+                        """, ExternalLabel("enable_id", getInstruction(insertIndex))
+                )
+            }
+        }
+
     }
 }
 

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
@@ -4,6 +4,24 @@ import app.revanced.util.fingerprint.legacyFingerprint
 import app.revanced.util.or
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.util.MethodUtil
+
+internal val advertisingIdFingerprint = legacyFingerprint(
+    name = "advertisingIdFingerprint",
+    returnType = "V",
+    strings = listOf("a."),
+    customFingerprint = { method, classDef ->
+        MethodUtil.isConstructor(method) &&
+                classDef.fields.find { it.type == "Ljava/util/Random;" } != null
+    }
+)
+
+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",