feat(Photomath): Support version 8.37.0 (ReVanced#3109)

n-34 · May 12, 2024 · fb02b48 · fb02b48
1 parent 2e41ce2
commit fb02b48
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/src/main/kotlin/app/revanced/patches/photomath/detection/deviceid/SpoofDeviceIdPatch.kt b/src/main/kotlin/app/revanced/patches/photomath/detection/deviceid/SpoofDeviceIdPatch.kt
@@ -14,7 +14,7 @@ import kotlin.random.Random
     name = "Spoof device ID",
     description = "Spoofs device ID to mitigate manual bans by developers.",
     dependencies = [SignatureDetectionPatch::class],
-    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.32.0"])]
+    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.37.0"])]
 )
 @Suppress("unused")
 object SpoofDeviceIdPatch : BytecodePatch(

diff --git a/.../app/revanced/patches/photomath/detection/deviceid/fingerprints/GetDeviceIdFingerprint.kt b/.../app/revanced/patches/photomath/detection/deviceid/fingerprints/GetDeviceIdFingerprint.kt
@@ -1,9 +1,21 @@
 package app.revanced.patches.photomath.detection.deviceid.fingerprints
 
 import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode
 
 internal object GetDeviceIdFingerprint : MethodFingerprint(
     returnType = "Ljava/lang/String;",
-    strings = listOf("androidId", "android_id"),
+    opcodes = listOf(
+        Opcode.SGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+    ),
     parameters = listOf()
 )
diff --git a/.../revanced/patches/photomath/detection/signature/fingerprints/CheckSignatureFingerprint.kt b/.../revanced/patches/photomath/detection/signature/fingerprints/CheckSignatureFingerprint.kt
@@ -5,11 +5,9 @@ import com.android.tools.smali.dexlib2.Opcode
 
 internal object CheckSignatureFingerprint : MethodFingerprint(
     strings = listOf(
-        "packageInfo.signatures",
-        "currentSignature"
+        "signatures",
     ),
     opcodes = listOf(
-        Opcode.CONST_STRING,
         Opcode.CONST_STRING,
         Opcode.INVOKE_STATIC,
         Opcode.INVOKE_STATIC,

diff --git a/src/main/kotlin/app/revanced/patches/photomath/misc/annoyances/HideUpdatePopupPatch.kt b/src/main/kotlin/app/revanced/patches/photomath/misc/annoyances/HideUpdatePopupPatch.kt
@@ -13,7 +13,7 @@ import app.revanced.util.exception
     name = "Hide update popup",
     description = "Prevents the update popup from showing up.",
     dependencies = [SignatureDetectionPatch::class],
-    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.32.0"])]
+    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.37.0"])]
 )
 @Suppress("unused")
 object HideUpdatePopupPatch : BytecodePatch(

diff --git a/src/main/kotlin/app/revanced/patches/photomath/misc/unlock/plus/UnlockPlusPatch.kt b/src/main/kotlin/app/revanced/patches/photomath/misc/unlock/plus/UnlockPlusPatch.kt
@@ -13,7 +13,7 @@ import app.revanced.patches.photomath.misc.unlock.plus.fingerprints.IsPlusUnlock
 @Patch(
     name = "Unlock plus",
     dependencies = [SignatureDetectionPatch::class, EnableBookpointPatch::class],
-    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.32.0"])]
+    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.37.0"])]
 )
 @Suppress("unused")
 object UnlockPlusPatch : BytecodePatch(