everything works

Slenderman00 · Aug 31, 2023 · 2537c04 · 2537c04
1 parent e5a061e
commit 2537c04
Show file tree

Hide file tree

Showing 26 changed files with 14 additions and 46 deletions.
diff --git a/src/main/kotlin/app/revanced/patches/grindr/ConfigFingerprint.kt b/src/main/kotlin/app/revanced/patches/grindr/ConfigFingerprint.kt
@@ -5,4 +5,7 @@ import org.jf.dexlib2.Opcode
 
 object ConfigFingerprint : MethodFingerprint(
     strings = listOf("com.grindrapp.android"),
+    customFingerprint = { methodDef, _ ->
+        !methodDef.name.contains("zzb")
+    }
 )
diff --git a/...g/annotations/MicroGPatchCompatibility.kt → ...e/annotations/MicroGPatchCompatibility.kt b/...g/annotations/MicroGPatchCompatibility.kt → ...e/annotations/MicroGPatchCompatibility.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.grindr.microg.annotations
+package app.revanced.patches.grindr.firebase.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

diff --git a/...vanced/patches/grindr/microg/constants.kt → ...nced/patches/grindr/firebase/constants.kt b/...vanced/patches/grindr/microg/constants.kt → ...nced/patches/grindr/firebase/constants.kt
diff --git a/...ngerprints/CastContextFetchFingerprint.kt → ...ngerprints/CastContextFetchFingerprint.kt b/...ngerprints/CastContextFetchFingerprint.kt → ...ngerprints/CastContextFetchFingerprint.kt
diff --git a/...erprints/CastDynamiteModuleFingerprint.kt → ...erprints/CastDynamiteModuleFingerprint.kt b/...erprints/CastDynamiteModuleFingerprint.kt → ...erprints/CastDynamiteModuleFingerprint.kt
diff --git a/...prints/CastDynamiteModuleV2Fingerprint.kt → ...prints/CastDynamiteModuleV2Fingerprint.kt b/...prints/CastDynamiteModuleV2Fingerprint.kt → ...prints/CastDynamiteModuleV2Fingerprint.kt
diff --git a/...rprints/GetCertRegistrationFIngerprint.kt → ...rprints/GetCertRegistrationFIngerprint.kt b/...rprints/GetCertRegistrationFIngerprint.kt → ...rprints/GetCertRegistrationFIngerprint.kt
diff --git a/...ngerprints/GetMessagingCertFingerprint.kt → ...ngerprints/GetMessagingCertFingerprint.kt b/...ngerprints/GetMessagingCertFingerprint.kt → ...ngerprints/GetMessagingCertFingerprint.kt
diff --git a/...fingerprints/GetPackageNameFingerprint.kt → ...fingerprints/GetPackageNameFingerprint.kt b/...fingerprints/GetPackageNameFingerprint.kt → ...fingerprints/GetPackageNameFingerprint.kt
diff --git a/...rints/GoogleApiAvailabilityFingerprint.kt → ...rints/GoogleApiAvailabilityFingerprint.kt b/...rints/GoogleApiAvailabilityFingerprint.kt → ...rints/GoogleApiAvailabilityFingerprint.kt
diff --git a/...vicesManifestValueExceptionFingerprint.kt → ...vicesManifestValueExceptionFingerprint.kt b/...vicesManifestValueExceptionFingerprint.kt → ...vicesManifestValueExceptionFingerprint.kt
diff --git a/...gerprints/GooglePlayUtilityFingerprint.kt → ...gerprints/GooglePlayUtilityFingerprint.kt b/...gerprints/GooglePlayUtilityFingerprint.kt → ...gerprints/GooglePlayUtilityFingerprint.kt
diff --git a/...crog/fingerprints/OnChangedFingerprint.kt → ...base/fingerprints/OnChangedFingerprint.kt b/...crog/fingerprints/OnChangedFingerprint.kt → ...base/fingerprints/OnChangedFingerprint.kt
diff --git a/...rints/OpenHttpURLConnectionFingerprint.kt → ...rints/OpenHttpURLConnectionFingerprint.kt b/...rints/OpenHttpURLConnectionFingerprint.kt → ...rints/OpenHttpURLConnectionFingerprint.kt
diff --git a/...r/microg/fingerprints/PrimeFingerprint.kt → ...firebase/fingerprints/PrimeFingerprint.kt b/...r/microg/fingerprints/PrimeFingerprint.kt → ...firebase/fingerprints/PrimeFingerprint.kt
@@ -6,6 +6,6 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 object PrimeFingerprint : MethodFingerprint(
     strings = listOf("com.android.vending", "com.google.android.gms"),
     customFingerprint = { methodDef, _ ->
-        methodDef.name.contains("startConnection")
+        methodDef.name.contains("startConnection") && !methodDef.name.contains("zzb")
     }
 )
diff --git a/...g/fingerprints/ServiceCheckFingerprint.kt → ...e/fingerprints/ServiceCheckFingerprint.kt b/...g/fingerprints/ServiceCheckFingerprint.kt → ...e/fingerprints/ServiceCheckFingerprint.kt
diff --git a/...crog/fingerprints/lyimgAuthFingerprint.kt → ...base/fingerprints/lyimgAuthFingerprint.kt b/...crog/fingerprints/lyimgAuthFingerprint.kt → ...base/fingerprints/lyimgAuthFingerprint.kt
diff --git a/...og/patch/bytecode/FirebaseGetCertPatch.kt → ...se/patch/bytecode/FirebaseGetCertPatch.kt b/...og/patch/bytecode/FirebaseGetCertPatch.kt → ...se/patch/bytecode/FirebaseGetCertPatch.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.grindr.microg.patch.bytecode
+package app.revanced.patches.grindr.firebase.patch.bytecode
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -7,9 +7,9 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.grindr.microg.fingerprints.GetMessagingCertFingerprint
-import app.revanced.patches.grindr.microg.fingerprints.GetReqistrationCertFingerprint
-import app.revanced.patches.grindr.microg.Constants.SPOOFED_PACKAGE_SIGNATURE
+import app.revanced.patches.grindr.firebase.fingerprints.GetMessagingCertFingerprint
+import app.revanced.patches.grindr.firebase.fingerprints.GetReqistrationCertFingerprint
+import app.revanced.patches.grindr.firebase.Constants.SPOOFED_PACKAGE_SIGNATURE
 
 class FirebaseGetCertPatch : BytecodePatch(
     listOf(

diff --git a/...rog/patch/bytecode/GetPackageNamePatch.kt → ...ase/patch/bytecode/GetPackageNamePatch.kt b/...rog/patch/bytecode/GetPackageNamePatch.kt → ...ase/patch/bytecode/GetPackageNamePatch.kt
diff --git a/...layServicesManifestValueExceptionPatch.kt → ...layServicesManifestValueExceptionPatch.kt b/...layServicesManifestValueExceptionPatch.kt → ...layServicesManifestValueExceptionPatch.kt
diff --git a/...rog/patch/bytecode/MicroGBytecodePatch.kt → ...ase/patch/bytecode/MicroGBytecodePatch.kt b/...rog/patch/bytecode/MicroGBytecodePatch.kt → ...ase/patch/bytecode/MicroGBytecodePatch.kt
@@ -27,44 +27,9 @@ import app.revanced.patches.grindr.ConfigFingerprint
 import app.revanced.util.microg.MicroGBytecodeHelper
 
 @Patch
-@DependsOn([MicroGResourcePatch::class, lyImgPatch::class, GooglePlayServicesManifestResourcePatch::class, GooglePlayServicesManifestValueExceptionPatch::class, FirebaseGetCertPatch::class, GetPackageNamePatch::class, OpenHttpURLConnectionPatch::class])
-@Name("Vanced MicroG support")
+//@DependsOn([MicroGResourcePatch::class, lyImgPatch::class, GooglePlayServicesManifestResourcePatch::class, GooglePlayServicesManifestValueExceptionPatch::class, FirebaseGetCertPatch::class, GetPackageNamePatch::class, OpenHttpURLConnectionPatch::class])
+//@DependsOn([FirebaseGetCertPatch::class, GetPackageNamePatch::class, OpenHttpURLConnectionPatch::class])
+@DependsOn([FirebaseGetCertPatch::class])
+@Name("Firebase patch")
 @Description("Allows Grindr ReVanced to run without root and under a different package name with Vanced MicroG.")
-@MicroGPatchCompatibility
-class MicroGBytecodePatch : BytecodePatch(
-    listOf(
-        ServiceCheckFingerprint,
-        ConfigFingerprint,
-        GooglePlayUtilityFingerprint,
-        OnChangedFingerprint,
-        GoogleApiAvailabilityFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        println(PACKAGE_NAME)
-
-        println("patching microg bytecode")
-
-        // apply common microG patch
-        MicroGBytecodeHelper.patchBytecode(
-            context, arrayOf(
-                MicroGBytecodeHelper.packageNameTransform(
-                    PACKAGE_NAME,
-                    REVANCED_PACKAGE_NAME
-                )
-            ),  
-            MicroGBytecodeHelper.PrimeMethodTransformationData(
-                ConfigFingerprint,
-                PACKAGE_NAME,
-                REVANCED_PACKAGE_NAME
-            ),
-            listOf(
-                ServiceCheckFingerprint,
-                GooglePlayUtilityFingerprint,
-                OnChangedFingerprint,
-            )
-        )
-
-        return PatchResultSuccess()
-    }
-}
+@MicroGPatchCompatibility
diff --git a/...r/microg/patch/bytecode/OnChangedPatch.kt → ...firebase/patch/bytecode/OnChangedPatch.kt b/...r/microg/patch/bytecode/OnChangedPatch.kt → ...firebase/patch/bytecode/OnChangedPatch.kt
diff --git a/...ch/bytecode/OpenHttpURLConnectionPatch.kt → ...ch/bytecode/OpenHttpURLConnectionPatch.kt b/...ch/bytecode/OpenHttpURLConnectionPatch.kt → ...ch/bytecode/OpenHttpURLConnectionPatch.kt
diff --git a/...rindr/microg/patch/bytecode/lyImgPatch.kt → ...ndr/firebase/patch/bytecode/lyImgPatch.kt b/...rindr/microg/patch/bytecode/lyImgPatch.kt → ...ndr/firebase/patch/bytecode/lyImgPatch.kt
diff --git a/...ooglePlayServicesManifestResourcePatch.kt → ...ooglePlayServicesManifestResourcePatch.kt b/...ooglePlayServicesManifestResourcePatch.kt → ...ooglePlayServicesManifestResourcePatch.kt
diff --git a/...rog/patch/resource/MicroGResourcePatch.kt → ...ase/patch/resource/MicroGResourcePatch.kt b/...rog/patch/resource/MicroGResourcePatch.kt → ...ase/patch/resource/MicroGResourcePatch.kt