fix(relay/change-client-id): patch client id instead of developer key

ReVanced · Jun 27, 2023 · 7ef86ea · 7ef86ea
1 parent a62f9d7
commit 7ef86ea
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 11 deletions.
diff --git a/...in/kotlin/app/revanced/patches/reddit/customclients/ChangeOAuthClientIdPatchAnnotation.kt b/...in/kotlin/app/revanced/patches/reddit/customclients/ChangeOAuthClientIdPatchAnnotation.kt
@@ -5,7 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.patch.annotations.Patch
 
 @Target(AnnotationTarget.CLASS)
-@Patch
 @Name("change-oauth-client-id")
 @Description("Changes the OAuth client ID.")
 annotation class ChangeOAuthClientIdPatchAnnotation
diff --git a/...evanced/patches/reddit/customclients/boostforreddit/api/patch/ChangeOAuthClientIdPatch.kt b/...evanced/patches/reddit/customclients/boostforreddit/api/patch/ChangeOAuthClientIdPatch.kt
@@ -7,10 +7,12 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
 import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
 import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.GetClientIdFingerprint
 
+@Patch
 @ChangeOAuthClientIdPatchAnnotation
 @Compatibility([Package("com.rubenmayayo.reddit")])
 class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(

diff --git a/...nced/patches/reddit/customclients/infinityforreddit/api/patch/ChangeOAuthClientIdPatch.kt b/...nced/patches/reddit/customclients/infinityforreddit/api/patch/ChangeOAuthClientIdPatch.kt
@@ -8,12 +8,14 @@ import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
 import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
 import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.GetHTTPBasicAuthHeaderFingerprint
 import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.LoginActivityOnCreateFingerprint
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
+@Patch
 @ChangeOAuthClientIdPatchAnnotation
 @Compatibility([Package("ml.docilealligator.infinityforreddit")])
 class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(

diff --git a/...ed/patches/reddit/customclients/relayforreddit/api/fingerprints/GetClientIdFingerprint.kt b/...ed/patches/reddit/customclients/relayforreddit/api/fingerprints/GetClientIdFingerprint.kt
diff --git a/...evanced/patches/reddit/customclients/relayforreddit/api/patch/ChangeOAuthClientIdPatch.kt b/...evanced/patches/reddit/customclients/relayforreddit/api/patch/ChangeOAuthClientIdPatch.kt
@@ -1,23 +1,49 @@
 package app.revanced.patches.reddit.customclients.relayforreddit.api.patch
 
 import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
+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.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
 import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
-import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetClientIdFingerprint
+import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetLoggedInBearerTokenFingerprint
+import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetLoggedOutBearerTokenFingerprint
+import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.LoginActivityClientIdFingerprint
+import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetRefreshTokenFingerprint
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
+@Patch
 @ChangeOAuthClientIdPatchAnnotation
 @Compatibility([Package("free.reddit.news"), Package("reddit.news")])
 class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(
- "dbrady://relay", Options, listOf(GetClientIdFingerprint)
+ "dbrady://relay",
+ Options,
+ listOf(
+ LoginActivityClientIdFingerprint,
+ GetLoggedInBearerTokenFingerprint,
+ GetLoggedOutBearerTokenFingerprint,
+ GetRefreshTokenFingerprint
+ )
 ) {
  override fun List<MethodFingerprintResult>.patch(context: BytecodeContext): PatchResult {
- first().mutableMethod.replaceInstruction(0, "const-string v0, \"$clientId\"")
+ forEach {
+ val clientIdIndex = it.scanResult.stringsScanResult!!.matches.first().index
+ it.mutableMethod.apply {
+ val clientIdRegister = getInstruction<OneRegisterInstruction>(clientIdIndex).registerA
+
+ it.mutableMethod.replaceInstruction(
+ clientIdIndex,
+ "const-string v$clientIdRegister, \"$clientId\""
+ )
+ }
+ }
 
  return PatchResultSuccess()
  }

diff --git a/...revanced/patches/reddit/customclients/syncforreddit/api/patch/ChangeOAuthClientIdPatch.kt b/...revanced/patches/reddit/customclients/syncforreddit/api/patch/ChangeOAuthClientIdPatch.kt
@@ -11,6 +11,7 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
 import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
 import app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints.GetAuthorizationStringFingerprint
@@ -20,6 +21,7 @@ import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.reference.StringReference
 import java.util.*
 
+@Patch
 @ChangeOAuthClientIdPatchAnnotation
 @Compatibility([Package("com.laurencedawson.reddit_sync"), Package("com.laurencedawson.reddit_sync.pro")])
 class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(