fix(Infinity for Reddit - Spoof client): Set user-agent for OAuth req…

…uests to fix login
ReVanced · Oct 8, 2023 · a710f05 · a710f05
1 parent 2223951
commit a710f05
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/...otlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/SpoofClientPatch.kt b/...otlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/SpoofClientPatch.kt
@@ -1,14 +1,17 @@
 package app.revanced.patches.reddit.customclients.infinityforreddit.api
 
 import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
+import app.revanced.patches.reddit.customclients.Constants.OAUTH_USER_AGENT
 import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.GetHttpBasicAuthHeaderFingerprint
 import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.LoginActivityOnCreateFingerprint
+import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.SetWebViewSettingsFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch(
@@ -32,7 +35,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Suppress("unused")
 object SpoofClientPatch : AbstractSpoofClientPatch(
     "infinity://localhost",
-    listOf(GetHttpBasicAuthHeaderFingerprint, LoginActivityOnCreateFingerprint)
+    clientIdFingerprints = listOf(GetHttpBasicAuthHeaderFingerprint, LoginActivityOnCreateFingerprint),
+    userAgentFingerprints = listOf(SetWebViewSettingsFingerprint)
 ) {
     override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
         forEach {
@@ -48,4 +52,18 @@ object SpoofClientPatch : AbstractSpoofClientPatch(
             }
         }
     }
+
+    override fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {
+        first().let { result ->
+            val insertIndex = result.scanResult.stringsScanResult!!.matches.first().index
+
+            result.mutableMethod.addInstructions(
+                insertIndex,
+                """
+                    const-string v0, "$OAUTH_USER_AGENT"
+                    invoke-virtual {p1, v0}, Landroid/webkit/WebSettings;->setUserAgentString(Ljava/lang/String;)V
+                """
+            )
+        }
+    }
 }
diff --git a/.../reddit/customclients/infinityforreddit/api/fingerprints/SetWebViewSettingsFingerprint.kt b/.../reddit/customclients/infinityforreddit/api/fingerprints/SetWebViewSettingsFingerprint.kt
@@ -0,0 +1,7 @@
+package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object SetWebViewSettingsFingerprint : MethodFingerprint(
+    strings= listOf("https://www.reddit.com/api/v1/authorize.compact")
+)