feat(syncforreddit): add change-reddit-url patch

CHANGELOG.md

@@ -1,3 +1,80 @@
+# [2.179.0-dev.10](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.9...v2.179.0-dev.10) (2023-06-30)
+
+
+### Features
+
+* **redditisfun/change-oauth-client-id:** add compatibility for paid versions ([#2536](https://github.com/revanced/revanced-patches/issues/2536)) ([e739d2f](https://github.com/revanced/revanced-patches/commit/e739d2fa16bbd0125db82c0758928addbd9950c9))
+
+# [2.179.0-dev.9](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.8...v2.179.0-dev.9) (2023-06-30)
+
+
+### Features
+
+* **redditisfun:** add `change-oauth-client-id` patch ([14809cd](https://github.com/revanced/revanced-patches/commit/14809cd4510ad9514b4a4820187a81681669374c))
+
+# [2.179.0-dev.8](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.7...v2.179.0-dev.8) (2023-06-29)
+
+
+### Features
+
+* **reddit:** add `disable-screenshot-popup` patch ([#2387](https://github.com/revanced/revanced-patches/issues/2387)) ([473e051](https://github.com/revanced/revanced-patches/commit/473e0512314dfa9790cf83b4cfcc7505058d3a51))
+
+# [2.179.0-dev.7](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.6...v2.179.0-dev.7) (2023-06-28)
+
+
+### Bug Fixes
+
+* **youtube:** improve patching speed ([#2514](https://github.com/revanced/revanced-patches/issues/2514)) ([77bb761](https://github.com/revanced/revanced-patches/commit/77bb761b0bb38613ad9d5017c881396afa471558))
+
+# [2.179.0-dev.6](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.5...v2.179.0-dev.6) (2023-06-27)
+
+
+### Bug Fixes
+
+* **syncforreddit/change-oauth-client-id:** add dev edition ([#2516](https://github.com/revanced/revanced-patches/issues/2516)) ([7c7294b](https://github.com/revanced/revanced-patches/commit/7c7294b750f54390dd2308de63cc09545010b17f))
+
+# [2.179.0-dev.5](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.4...v2.179.0-dev.5) (2023-06-27)
+
+
+### Bug Fixes
+
+* **relayforreddit/change-oauth-client-id:** change client id instead of developer key ([#2508](https://github.com/revanced/revanced-patches/issues/2508)) ([4befb44](https://github.com/revanced/revanced-patches/commit/4befb4414638c5936f99d8d63d73c729efc773a5))
+
+# [2.179.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.3...v2.179.0-dev.4) (2023-06-27)
+
+# [2.179.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.2...v2.179.0-dev.3) (2023-06-26)
+
+
+### Bug Fixes
+
+* **enable-android-debugging:** remove json options ([#2497](https://github.com/revanced/revanced-patches/issues/2497)) ([3e25f5f](https://github.com/revanced/revanced-patches/commit/3e25f5f8df24a585dc1097aa16877841f0c6b74a))
+
+# [2.179.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.1...v2.179.0-dev.2) (2023-06-25)
+
+
+### Features
+
+* **relayforreddit:** add `change-oauth-client-id` patch ([#2491](https://github.com/revanced/revanced-patches/issues/2491)) ([fe66f40](https://github.com/revanced/revanced-patches/commit/fe66f4089d6365564c8097d3c7a1bc842c343194))
+
+# [2.179.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.178.1-dev.1...v2.179.0-dev.1) (2023-06-24)
+
+
+### Bug Fixes
+
+* **syncforreddit:** use correct overriding method signature ([#2483](https://github.com/revanced/revanced-patches/issues/2483)) ([f9770cf](https://github.com/revanced/revanced-patches/commit/f9770cf1babce61cd32f6ca9140103419d8d094d))
+
+
+### Features
+
+* **infinityforreddit:** add `change-oauth-client-id` patch ([#2452](https://github.com/revanced/revanced-patches/issues/2452)) ([9efd790](https://github.com/revanced/revanced-patches/commit/9efd7904acc6dc70f45c6c0f835c839473d9205f))
+
+## [2.178.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.178.0...v2.178.1-dev.1) (2023-06-23)
+
+
+### Bug Fixes
+
+* **youtube/client-spoof:** update settings text for known side effects of spoof signature ([#2476](https://github.com/revanced/revanced-patches/issues/2476)) ([6756f80](https://github.com/revanced/revanced-patches/commit/6756f80e3e0c09376a1fd613d28644bdaa24da57))
+
 # [2.178.0](https://github.com/revanced/revanced-patches/compare/v2.177.0...v2.178.0) (2023-06-21)
 
 

README.md

@@ -204,12 +204,36 @@ The official ReVanced Patches.
 | `spoof-signature` | Spoofs the signature of the app. | all |
 </details>
 
+### [📦 `ml.docilealligator.infinityforreddit`](https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforreddit)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `change-oauth-client-id` | Changes the OAuth client ID. | all |
+</details>
+
+### [📦 `free.reddit.news`](https://play.google.com/store/apps/details?id=free.reddit.news)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `change-oauth-client-id` | Changes the OAuth client ID. | all |
+</details>
+
+### [📦 `reddit.news`](https://play.google.com/store/apps/details?id=reddit.news)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `change-oauth-client-id` | Changes the OAuth client ID. | all |
+</details>
+
 ### [📦 `com.rubenmayayo.reddit`](https://play.google.com/store/apps/details?id=com.rubenmayayo.reddit)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `change-oauth-client-id` | Changes the OAuth client ID in Boost for Reddit. | all |
+| `change-oauth-client-id` | Changes the OAuth client ID. | all |
 </details>
 
 ### [📦 `com.laurencedawson.reddit_sync.pro`](https://play.google.com/store/apps/details?id=com.laurencedawson.reddit_sync.pro)
@@ -220,6 +244,14 @@ The official ReVanced Patches.
 | `change-oauth-client-id` | Changes the OAuth client ID. | all |
 </details>
 
+### [📦 `com.laurencedawson.reddit_sync.dev`](https://play.google.com/store/apps/details?id=com.laurencedawson.reddit_sync.dev)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `change-oauth-client-id` | Changes the OAuth client ID. | all |
+</details>
+
 ### [📦 `com.myprog.hexedit`](https://play.google.com/store/apps/details?id=com.myprog.hexedit)
 <details>
 

build.gradle.kts

@@ -27,7 +27,7 @@ repositories {
 }
 
 dependencies {
-    implementation("app.revanced:revanced-patcher:11.0.0")
+    implementation("app.revanced:revanced-patcher:11.0.2")
     implementation("app.revanced:multidexlib2:2.5.3-a3836654")
     // Required for meta
     implementation("com.google.code.gson:gson:2.10.1")

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.178.0
+version = 2.179.0-dev.10

src/main/kotlin/app/revanced/extensions/Extensions.kt

@@ -1,13 +1,17 @@
 package app.revanced.extensions
 
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.ClassDef
 import org.jf.dexlib2.iface.Method
 import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 import org.jf.dexlib2.util.MethodUtil
@@ -21,6 +25,24 @@ import org.w3c.dom.Node
  */
 internal fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $name")
 
+fun MethodFingerprint.resolveMany(context: BytecodeContext, classes: Iterable<ClassDef>) = sequence {
+    for (classDef in classes) // search through all classes for the fingerprint
+        yieldAll(this@resolveMany.resolveMany(context, classDef))
+
+}
+/**
+ * Resolve a [MethodFingerprint] against all methods of a [ClassDef].
+ *
+ * @param forClass The class on which to resolve the [MethodFingerprint] in.
+ * @param context The [BytecodeContext] to host proxies.
+ * @return A sequence of [MethodFingerprintResult].
+ */
+fun MethodFingerprint.resolveMany(context: BytecodeContext, forClass: ClassDef) = sequence {
+    for (method in forClass.methods)
+        if (this@resolveMany.resolve(context, method, forClass))
+            yield(this@resolveMany.result!!.also { this@resolveMany.result = null })
+}
+
 /**
  * Find the [MutableMethod] from a given [Method] in a [MutableClass].
  *
@@ -57,17 +79,28 @@ internal fun MutableMethod.injectHideViewCall(
     "invoke-static { v$viewRegister }, $classDescriptor->$targetMethod(Landroid/view/View;)V"
 )
 
-internal fun MutableMethod.findIndexForIdResource(resourceName: String): Int {
+internal fun Method.findIndexForIdResource(resourceName: String): Int {
     fun getIdResourceId(resourceName: String) = ResourceMappingPatch.resourceMappings.single {
         it.type == "id" && it.name == resourceName
     }.id
 
-    val resourceId = getIdResourceId(resourceName)
-    return implementation!!.instructions.indexOfFirst {
-        if (it.opcode != Opcode.CONST) return@indexOfFirst false
+    return indexOfFirstConstantInstructionValue(getIdResourceId(resourceName))
+}
 
-        val literal = (it as WideLiteralInstruction).wideLiteral
+/**
+ * @return the first constant instruction with the value, or -1 if not found.
+ */
+fun Method.indexOfFirstConstantInstructionValue(constantValue: Long): Int {
+    return implementation?.let {
+        it.instructions.indexOfFirst { instruction ->
+            instruction.opcode == Opcode.CONST && (instruction as WideLiteralInstruction).wideLiteral == constantValue
+        }
+    } ?: -1
+}
 
-        return@indexOfFirst resourceId == literal
-    }
-}
+/**
+ * @return if the method contains a constant with the given value.
+ */
+fun Method.containsConstantInstructionValue(constantValue: Long): Boolean {
+    return indexOfFirstConstantInstructionValue(constantValue) >= 0
+}

src/main/kotlin/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt

@@ -14,29 +14,17 @@ import org.w3c.dom.Element
 @Version("0.0.1")
 class EnableAndroidDebuggingPatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
-        if (debuggable == true) {
-            context.xmlEditor["AndroidManifest.xml"].use { dom ->
-                val applicationNode = dom
-                    .file
-                    .getElementsByTagName("application")
-                    .item(0) as Element
+        context.xmlEditor["AndroidManifest.xml"].use { dom ->
+            val applicationNode = dom
+                .file
+                .getElementsByTagName("application")
+                .item(0) as Element
 
-                // set application as debuggable
-                applicationNode.setAttribute("android:debuggable", "true")
-            }
+            // set application as debuggable
+            applicationNode.setAttribute("android:debuggable", "true")
         }
 
         return PatchResultSuccess()
     }
 
-    companion object : OptionsContainer() {
-        var debuggable: Boolean? by option(
-            PatchOption.BooleanOption(
-                key = "debuggable",
-                default = false,
-                title = "App debugging",
-                description = "Whether to make the app debuggable on Android.",
-            )
-        )
-    }
 }

src/main/kotlin/app/revanced/patches/music/misc/androidauto/fingerprints/CheckCertificateFingerprint.kt

@@ -1,10 +1,9 @@
 package app.revanced.patches.music.misc.androidauto.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.misc.androidauto.patch.BypassCertificateChecksPatch
-
 
 object CheckCertificateFingerprint : MethodFingerprint(
-    "Z",
-    strings = listOf("No match") // Unique in combination with boolean return type
+    returnType = "Z",
+    parameters = listOf("Ljava/lang/String;"),
+    strings = listOf("X509", "Failed to get public key.", "Failed to get certificate.")
 )

src/main/kotlin/app/revanced/patches/reddit/customclients/AbstractChangeOAuthClientIdPatch.kt

@@ -1,19 +1,21 @@
 package app.revanced.patches.reddit.customclients
 
 import android.os.Environment
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.*
 import java.io.File
 
 abstract class AbstractChangeOAuthClientIdPatch(
     private val redirectUri: String,
     private val options: ChangeOAuthClientIdOptionsContainer,
-    private val fingerprint: MethodFingerprint,
-) : BytecodePatch(listOf(fingerprint)) {
+    private val fingerprints: List<MethodFingerprint>
+) : BytecodePatch(fingerprints) {
     override fun execute(context: BytecodeContext): PatchResult {
         if (options.clientId == null) {
-            // Test if on Android
+            // Ensure device runs Android.
             try {
                 Class.forName("android.os.Environment")
             } catch (e: ClassNotFoundException) {
@@ -36,10 +38,10 @@ abstract class AbstractChangeOAuthClientIdPatch(
             }.let { options.clientId = it.readText().trim() }
         }
 
-        return fingerprint.patch(context)
+        return fingerprints.map { it.result ?: throw it.toErrorResult() }.patch(context)
     }
 
-    abstract fun MethodFingerprint.patch(context: BytecodeContext): PatchResult
+    abstract fun List<MethodFingerprintResult>.patch(context: BytecodeContext): PatchResult
 
     companion object Options {
         open class ChangeOAuthClientIdOptionsContainer : OptionsContainer() {

src/main/kotlin/app/revanced/patches/reddit/customclients/ChangeOAuthClientIdPatchAnnotation.kt

@@ -0,0 +1,11 @@
+package app.revanced.patches.reddit.customclients
+
+import app.revanced.patcher.annotation.Description
+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

src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/patch/ChangeOAuthClientIdPatch.kt

@@ -1,34 +1,29 @@
 package app.revanced.patches.reddit.customclients.boostforreddit.api.patch
 
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.*
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+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
-@Name("change-oauth-client-id")
-@Description("Changes the OAuth client ID in Boost for Reddit.")
+@ChangeOAuthClientIdPatchAnnotation
 @Compatibility([Package("com.rubenmayayo.reddit")])
-@Version("0.0.1")
 class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(
-    "http://rubenmayayo.com",
-    Options,
-    GetClientIdFingerprint
+    "http://rubenmayayo.com", Options, listOf(GetClientIdFingerprint)
 ) {
-    override fun MethodFingerprint.patch(context: BytecodeContext): PatchResult {
-        result?.mutableMethod?.addInstructions(
+    override fun List<MethodFingerprintResult>.patch(context: BytecodeContext): PatchResult {
+        first().mutableMethod.addInstructions(
             0,
-            """
+    """
                      const-string v0, "$clientId"
                      return-object v0
                 """
-        ) ?: return toErrorResult()
+        )
 
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/AbstractClientIdFingerprint.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+abstract class AbstractClientIdFingerprint(classTypeSuffix: String, methodName: String) : MethodFingerprint(
+    strings = listOf("NOe2iKrPPzwscA"),
+    customFingerprint = custom@{ methodDef, classDef ->
+        if (!classDef.type.endsWith(classTypeSuffix)) return@custom false
+
+        methodDef.name == methodName
+    }
+)