chore(release): 2.176.1-dev.1 [skip ci]

## [2.176.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.176.0...v2.176.1-dev.1) (2023-06-12)

### Bug Fixes

* **syncforreddit/change-oauth-client-id:** use correct signature for Android API ([3cd52cb](3cd52cbffa))

.github/workflows/release.yml

@@ -23,23 +23,16 @@ jobs:
           # https://github.com/cycjimmy/semantic-release-action#private-packages
           persist-credentials: false
           fetch-depth: 0
-      - name: Setup JDK
-        uses: actions/setup-java@v3
+      - name: Cache
+        uses: actions/cache@v3
         with:
-          java-version: '17'
-          distribution: 'zulu'
-          cache: gradle
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-          cache: 'npm'
-      - name: Setup Android SDK
-        uses: amyu/setup-android@v2
-        with:
-          cache-disabled: false
-          sdk-version: '33'
-          build-tools-version: '33.0.1'
+          path: |
+            ${{ runner.home }}/.gradle/caches
+            ${{ runner.home }}/.gradle/wrapper
+            .gradle
+            build
+            node_modules
+          key: ${{ runner.os }}-gradle-npm-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'package-lock.json') }}
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,3 +1,55 @@
+## [2.176.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.176.0...v2.176.1-dev.1) (2023-06-12)
+
+
+### Bug Fixes
+
+* **syncforreddit/change-oauth-client-id:** use correct signature for Android API ([4db2eba](https://github.com/revanced/revanced-patches/commit/4db2eba6d66f094f1d2400bfa8b9c15a175f796e))
+
+# [2.176.0](https://github.com/revanced/revanced-patches/compare/v2.175.0...v2.176.0) (2023-06-12)
+
+
+### Bug Fixes
+
+* **instagram/hide-timeline-ads:** constrain to version `275.0.0.27.98` ([#2377](https://github.com/revanced/revanced-patches/issues/2377)) ([6ee836c](https://github.com/revanced/revanced-patches/commit/6ee836c587676ba53c2e4748ec1828e193f1c071))
+* **songpal:** make patches more resilient ([#2386](https://github.com/revanced/revanced-patches/issues/2386)) ([947bf42](https://github.com/revanced/revanced-patches/commit/947bf42b7c8d029b8a26a5c306869e02a69b62fd))
+* use correct import ([9b6e730](https://github.com/revanced/revanced-patches/commit/9b6e730395e56e60cf08372dbbc3a10e92ba8e95))
+* **youtube/hide-get-premium:** shorten descriptions ([f5224c4](https://github.com/revanced/revanced-patches/commit/f5224c4980285ef1e29d17887f02b5b397785245))
+* **youtube/theme:** use custom light/dark colors for launch splash screen ([#2337](https://github.com/revanced/revanced-patches/issues/2337)) ([8adc05a](https://github.com/revanced/revanced-patches/commit/8adc05a17445dede5f35ee27426d20b750a2a1d3))
+
+
+### Features
+
+* **citra:** remove patches ([#2384](https://github.com/revanced/revanced-patches/issues/2384)) ([d182329](https://github.com/revanced/revanced-patches/commit/d1823297ce27fc6f3246123c91d9463080afb7ee))
+* **finanzonline:** support any version ([#2347](https://github.com/revanced/revanced-patches/issues/2347)) ([cc66b1f](https://github.com/revanced/revanced-patches/commit/cc66b1fc6200bbdcc2697ddd7085d46447775be2))
+* **reddit:** add `hide-promoted` patch ([#2350](https://github.com/revanced/revanced-patches/issues/2350)) ([c3fd36c](https://github.com/revanced/revanced-patches/commit/c3fd36cfba7fb8246f8b3a29d9310bd88f01c3e7))
+* **songpal:** add `remove-badge-tab` patch ([bde9053](https://github.com/revanced/revanced-patches/commit/bde9053f04e202a7b394a1dad335470d5495e5fc))
+* **songpal:** add `remove-notification-badge` patch ([1b77f96](https://github.com/revanced/revanced-patches/commit/1b77f9633cf7e72d653f1d37483b7399e1ad797d))
+* **syncforreddit/change-oauth-client-id:** improve error message ([a39b2fd](https://github.com/revanced/revanced-patches/commit/a39b2fd9828b514670135918e69ee736cb4615e5))
+* **syncforreddit:** add `change-oauth-client-id` patch ([#2393](https://github.com/revanced/revanced-patches/issues/2393)) ([c93f0c6](https://github.com/revanced/revanced-patches/commit/c93f0c6a99fb2365747371f0f38eff8e0b77aee1))
+* **youtube/hide-ads:** hide mix playlists ([dbb38ed](https://github.com/revanced/revanced-patches/commit/dbb38eddfd33db685b8e8be2f2a641a1199e7361))
+* **youtube/swipe-controls:** add option to save and restore brightness ([3d03471](https://github.com/revanced/revanced-patches/commit/3d03471b1c2f18d22f17167db78764520064353a))
+
+# [2.176.0-dev.7](https://github.com/revanced/revanced-patches/compare/v2.176.0-dev.6...v2.176.0-dev.7) (2023-06-12)
+
+
+### Features
+
+* **syncforreddit/change-oauth-client-id:** improve error message ([a39b2fd](https://github.com/revanced/revanced-patches/commit/a39b2fd9828b514670135918e69ee736cb4615e5))
+
+# [2.176.0-dev.6](https://github.com/revanced/revanced-patches/compare/v2.176.0-dev.5...v2.176.0-dev.6) (2023-06-12)
+
+
+### Features
+
+* **reddit:** add `hide-promoted` patch ([#2350](https://github.com/revanced/revanced-patches/issues/2350)) ([c3fd36c](https://github.com/revanced/revanced-patches/commit/c3fd36cfba7fb8246f8b3a29d9310bd88f01c3e7))
+
+# [2.176.0-dev.5](https://github.com/revanced/revanced-patches/compare/v2.176.0-dev.4...v2.176.0-dev.5) (2023-06-11)
+
+
+### Features
+
+* **syncforreddit:** add `change-oauth-client-id` patch ([#2393](https://github.com/revanced/revanced-patches/issues/2393)) ([c93f0c6](https://github.com/revanced/revanced-patches/commit/c93f0c6a99fb2365747371f0f38eff8e0b77aee1))
+
 # [2.176.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.176.0-dev.3...v2.176.0-dev.4) (2023-06-11)
 
 

README.md

@@ -140,17 +140,6 @@ The official ReVanced Patches.
 | `hide-views-stats` | Hides the view stats under tweets. | 9.71.0-release.0 |
 </details>
 
-### [📦 `com.reddit.frontpage`](https://play.google.com/store/apps/details?id=com.reddit.frontpage)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `hide-ads` | Removes general ads from the Reddit frontpage and subreddits. | all |
-| `hide-subreddit-banner` | Hides banner ads from comments on subreddits. | all |
-| `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
-| `sanitize-sharing-links` | Removes (tracking) query parameters from the URLs when sharing links. | all |
-</details>
-
 ### [📦 `com.facebook.orca`](https://play.google.com/store/apps/details?id=com.facebook.orca)
 <details>
 
@@ -161,6 +150,25 @@ The official ReVanced Patches.
 | `hide-inbox-ads` | Hides ads in inbox. | all |
 </details>
 
+### [📦 `com.reddit.frontpage`](https://play.google.com/store/apps/details?id=com.reddit.frontpage)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `hide-ads` | Removes ads from the Reddit. | all |
+| `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
+| `sanitize-sharing-links` | Removes (tracking) query parameters from the URLs when sharing links. | all |
+</details>
+
+### [📦 `com.laurencedawson.reddit_sync`](https://play.google.com/store/apps/details?id=com.laurencedawson.reddit_sync)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `change-oauth-client-id` | Changes the OAuth client ID. | all |
+| `disable-ads` | Disables ads. | all |
+</details>
+
 ### [📦 `com.spotify.music`](https://play.google.com/store/apps/details?id=com.spotify.music)
 <details>
 
@@ -205,14 +213,6 @@ The official ReVanced Patches.
 | `disable-ads` | Disables ads in HexEditor. | all |
 </details>
 
-### [📦 `com.laurencedawson.reddit_sync`](https://play.google.com/store/apps/details?id=com.laurencedawson.reddit_sync)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `disable-ads` | Disables ads. | all |
-</details>
-
 ### [📦 `com.spotify.lite`](https://play.google.com/store/apps/details?id=com.spotify.lite)
 <details>
 

build.gradle.kts

@@ -33,6 +33,10 @@ dependencies {
     implementation("com.google.code.gson:gson:2.10.1")
     // Required for FlexVer-Java
     implementation("com.unascribed:flexver-java:1.0.2")
+
+    // A dependency to the Android library unfortunately fails the build,
+    // which is why this is required for the patch change-oauth-client-id
+    compileOnly(project("dummy"))
 }
 
 kotlin {

dummy/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    id("java")
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}

dummy/src/main/java/android/os/Environment.java

@@ -0,0 +1,9 @@
+package android.os;
+
+import java.io.File;
+
+public final class Environment {
+    public static File getExternalStorageDirectory() {
+        throw new UnsupportedOperationException("Stub");
+    }
+}

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.176.0-dev.4
+version = 2.176.1-dev.1

settings.gradle.kts

@@ -1 +1,3 @@
+include("dummy")
+
 rootProject.name = "revanced-patches"

src/main/kotlin/app/revanced/patches/reddit/ad/banner/annotations/HideBannerCompatibility.kt

@@ -1,12 +0,0 @@
-package app.revanced.patches.reddit.ad.banner.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.reddit.frontpage"
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideBannerCompatibility

src/main/kotlin/app/revanced/patches/reddit/ad/banner/patch/HideBannerPatch.kt

@@ -7,17 +7,12 @@ import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.reddit.ad.banner.annotations.HideBannerCompatibility
 
-@Patch
 @Name("hide-subreddit-banner")
 @Description("Hides banner ads from comments on subreddits.")
-@HideBannerCompatibility
 @Version("0.0.1")
 class HideBannerPatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
-
         context.xmlEditor[RESOURCE_FILE_PATH].use {
             it.file.getElementsByTagName("merge").item(0).childNodes.apply {
                 val attributes = arrayOf("height", "width")

src/main/kotlin/app/revanced/patches/reddit/ad/comments/fingerprints/HideCommentAdsFingerprint.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.reddit.ad.comments.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object HideCommentAdsFingerprint : MethodFingerprint(
+    strings = listOf(
+        "link",
+        // CommentPageRepository is not returning a link object
+        "is not returning a link object"
+    ),
+    customFingerprint = { _, classDef ->
+        classDef.sourceFile == "PostDetailPresenter.kt"
+    },
+)

src/main/kotlin/app/revanced/patches/reddit/ad/comments/patch/HideCommentAdsPatch.kt

@@ -0,0 +1,34 @@
+package app.revanced.patches.reddit.ad.comments.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+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.patcher.patch.annotations.RequiresIntegrations
+import app.revanced.patches.reddit.ad.comments.fingerprints.HideCommentAdsFingerprint
+
+@Name("hide-comment-ads")
+@Description("Removes all comment ads.")
+@RequiresIntegrations
+@Version("0.0.1")
+class HideCommentAdsPatch : BytecodePatch(
+    listOf(HideCommentAdsFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val method = HideCommentAdsFingerprint.result!!.mutableMethod
+        // Returns a blank object instead of the comment ad.
+        method.addInstructions(
+            0,
+            """
+            new-instance v0, Ljava/lang/Object;
+            invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+            return-object v0
+            """
+        )
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/HideAdsCompatibility.kt

@@ -3,10 +3,6 @@ package app.revanced.patches.reddit.ad.general.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility(
-    [Package(
-        "com.reddit.frontpage"
-    )]
-)
+@Compatibility([Package("com.reddit.frontpage")])
 @Target(AnnotationTarget.CLASS)
 internal annotation class HideAdsCompatibility

src/main/kotlin/app/revanced/patches/reddit/ad/general/fingerprints/AdPostFingerprint.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.reddit.ad.general.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object AdPostFingerprint : MethodFingerprint(
+    "V",
+    // "children" are present throughout multiple versions
+    strings = listOf("children"),
+    customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("Listing;") },
+)

src/main/kotlin/app/revanced/patches/reddit/ad/general/fingerprints/NewAdPostFingerprint.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.reddit.ad.general.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object NewAdPostFingerprint : MethodFingerprint(
+    opcodes = listOf(Opcode.INVOKE_VIRTUAL),
+    strings = listOf("chain", "feedElement"),
+    customFingerprint = { _, classDef -> classDef.sourceFile == "AdElementConverter.kt" },
+)

src/main/kotlin/app/revanced/patches/reddit/ad/general/patch/HideAdsPatch.kt

@@ -4,51 +4,89 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotations.RequiresIntegrations
+import app.revanced.patches.reddit.ad.banner.patch.HideBannerPatch
+import app.revanced.patches.reddit.ad.comments.patch.HideCommentAdsPatch
 import app.revanced.patches.reddit.ad.general.annotations.HideAdsCompatibility
+import app.revanced.patches.reddit.ad.general.fingerprints.AdPostFingerprint
+import app.revanced.patches.reddit.ad.general.fingerprints.NewAdPostFingerprint
 import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.StringReference
-import org.jf.dexlib2.immutable.reference.ImmutableStringReference
+import org.jf.dexlib2.iface.instruction.formats.Instruction22c
+import org.jf.dexlib2.iface.reference.FieldReference
+import org.jf.dexlib2.iface.reference.MethodReference
 
 @Patch
 @Name("hide-ads")
-@Description("Removes general ads from the Reddit frontpage and subreddits.")
+@Description("Removes ads from the Reddit.")
+@DependsOn([HideBannerPatch::class, HideCommentAdsPatch::class])
 @HideAdsCompatibility
-@Version("0.0.1")
-class HideAdsPatch : BytecodePatch() {
+@RequiresIntegrations
+@Version("0.0.2")
+class HideAdsPatch : BytecodePatch(
+    listOf(AdPostFingerprint, NewAdPostFingerprint)
+) {
     override fun execute(context: BytecodeContext): PatchResult {
-        context.classes.forEach { classDef ->
-            classDef.methods.forEach methodLoop@{ method ->
-                val implementation = method.implementation ?: return@methodLoop
+        // region Filter promoted ads (does not work in popular or latest feed)
 
-                implementation.instructions.forEachIndexed { i, instruction ->
-                    if (instruction.opcode != Opcode.CONST_STRING) return@forEachIndexed
-                    if (((instruction as ReferenceInstruction).reference as StringReference).string != "AdPost") return@forEachIndexed
+        AdPostFingerprint.result?.mutableMethod?.apply {
+            val setPostsListChildren = implementation!!.instructions.first { instruction ->
+                if (instruction.opcode != Opcode.IPUT_OBJECT) return@first false
 
-                    val proxiedClass = context.proxy(classDef).mutableClass
-
-                    val proxiedImplementation = proxiedClass.methods.first {
-                        it.name == method.name && it.parameterTypes.containsAll(method.parameterTypes)
-                    }.implementation!!
-
-                    var newString = "AdPost1"
-                    if (proxiedImplementation.instructions[i - 1].opcode == Opcode.CONST_STRING) {
-                        newString = "SubredditPost"
-                    }
-                    proxiedImplementation.replaceInstruction(
-                        i, BuilderInstruction21c(
-                            Opcode.CONST_STRING, (proxiedImplementation.instructions[i] as BuilderInstruction21c).registerA, ImmutableStringReference(newString)
-                        )
-                    )
-                }
+                val reference = (instruction as ReferenceInstruction).reference as FieldReference
+                reference.name == "children"
             }
+
+            val castedInstruction = setPostsListChildren as Instruction22c
+            val itemsRegister = castedInstruction.registerA
+            val listInstanceRegister = castedInstruction.registerB
+
+            // postsList.children = filterChildren(postListItems)
+            removeInstruction(setPostsListChildren.location.index)
+            addInstructions(
+                setPostsListChildren.location.index,
+                """
+                    invoke-static {v$itemsRegister}, $FILTER_METHOD_DESCRIPTOR
+                    move-result-object v0
+                    iput-object v0, v$listInstanceRegister, ${castedInstruction.reference}
+                """
+            )
         }
 
+        // endregion
+
+        // region Remove ads from popular and latest feed
+
+        NewAdPostFingerprint.result?.let { result ->
+            // The new feeds work by inserting posts into lists.
+            // AdElementConverter is conveniently responsible for inserting all feed ads.
+            // By removing the appending instruction no ad posts gets appended to the feed.
+            val index = result.method.implementation!!.instructions.indexOfFirst {
+                if (it.opcode != Opcode.INVOKE_VIRTUAL) return@indexOfFirst false
+
+                val reference = (it as ReferenceInstruction).reference as MethodReference
+
+                reference.name == "add" && reference.definingClass == "Lava/util/ArrayList;"
+            }
+
+            result.mutableMethod.removeInstruction(index)
+        }
+
+        // endregion
+
         return PatchResultSuccess()
     }
+
+    private companion object {
+        private const val FILTER_METHOD_DESCRIPTOR =
+            "Lapp/revanced/reddit/patches/FilterPromotedLinksPatch;" +
+                    "->filterChildren(Ljava/lang/Iterable;)Ljava/util/List;"
+    }
 }

src/main/kotlin/app/revanced/patches/syncforreddit/ads/annotations/DisableAdsCompatibility.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.syncforreddit.ads.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.laurencedawson.reddit_sync")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class DisableAdsCompatibility

src/main/kotlin/app/revanced/patches/syncforreddit/ads/patch/DisableAdsPatch.kt

@@ -1,9 +1,7 @@
 package app.revanced.patches.syncforreddit.ads.patch
 
 import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.annotation.*
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
@@ -11,7 +9,6 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.syncforreddit.ads.annotations.DisableAdsCompatibility
 import app.revanced.patches.syncforreddit.ads.fingerprints.IsAdsEnabledFingerprint
 import app.revanced.patches.syncforreddit.detection.piracy.patch.DisablePiracyDetectionPatch
 
@@ -19,8 +16,8 @@ import app.revanced.patches.syncforreddit.detection.piracy.patch.DisablePiracyDe
 @Name("disable-ads")
 @DependsOn([DisablePiracyDetectionPatch::class])
 @Description("Disables ads.")
+@Compatibility([Package("com.laurencedawson.reddit_sync")])
 @Version("0.0.1")
-@DisableAdsCompatibility
 class DisableAdsPatch : BytecodePatch(listOf(IsAdsEnabledFingerprint)) {
     override fun execute(context: BytecodeContext): PatchResult {
         IsAdsEnabledFingerprint.result?.mutableMethod?.apply {

src/main/kotlin/app/revanced/patches/syncforreddit/api/fingerprints/GetAuthorizationStringFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.syncforreddit.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object GetAuthorizationStringFingerprint : MethodFingerprint(
+    strings = listOf("authorize.compact?client_id")
+)

src/main/kotlin/app/revanced/patches/syncforreddit/api/fingerprints/GetBearerTokenFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.syncforreddit.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object GetBearerTokenFingerprint : MethodFingerprint(
+    strings = listOf("Basic")
+)

src/main/kotlin/app/revanced/patches/syncforreddit/api/patch/ChangeOAuthClientIdPatch.kt

@@ -0,0 +1,96 @@
+package app.revanced.patches.syncforreddit.api.patch
+
+import android.os.Environment
+import app.revanced.patcher.annotation.*
+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.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.syncforreddit.api.fingerprints.GetAuthorizationStringFingerprint
+import app.revanced.patches.syncforreddit.api.fingerprints.GetBearerTokenFingerprint
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.StringReference
+import java.io.File
+import java.util.*
+
+@Patch
+@Name("change-oauth-client-id")
+@Description("Changes the OAuth client ID.")
+@Compatibility([Package("com.laurencedawson.reddit_sync")])
+@Version("0.0.1")
+class ChangeOAuthClientIdPatch : BytecodePatch(
+    listOf(GetAuthorizationStringFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        if (clientId == null) {
+            // Test if on Android
+            try {
+                Class.forName("android.os.Environment")
+            } catch (e: ClassNotFoundException) {
+                return PatchResultError("No client ID provided")
+            }
+
+            File(Environment.getExternalStorageDirectory(), "reddit_client_id_revanced.txt").also {
+                if (it.exists()) return@also
+
+                val error = """
+                    In order to use this patch, you need to provide a client ID.
+                    You can do this by creating a file at ${it.absolutePath} with the client ID as its content.
+                    Alternatively, you can provide the client ID using patch options.
+                    
+                    You can get your client ID from https://www.reddit.com/prefs/apps.
+                    The application type has to be "installed app" and the redirect URI has to be set to "http://redditsync/auth"
+                """.trimIndent()
+
+                return PatchResultError(error)
+            }.let { clientId = it.readText() }
+        }
+
+        GetAuthorizationStringFingerprint.result?.also { result ->
+            GetBearerTokenFingerprint.also { it.resolve(context, result.classDef) }.result?.mutableMethod?.apply {
+                val auth = Base64.getEncoder().encodeToString("$clientId:".toByteArray(Charsets.UTF_8))
+                addInstructions(
+                    0,
+                    """
+                         const-string v0, "Basic $auth"
+                         return-object v0
+                    """
+                )
+            } ?: return PatchResultError("Could not find required method to patch.")
+        }?.let {
+            val occurrenceIndex = it.scanResult.stringsScanResult!!.matches.first().index
+
+            it.mutableMethod.apply {
+                val authorizationStringInstruction = getInstruction<ReferenceInstruction>(occurrenceIndex)
+                val targetRegister = (authorizationStringInstruction as OneRegisterInstruction).registerA
+                val reference = authorizationStringInstruction.reference as StringReference
+
+                val newAuthorizationUrl = reference.string.replace(
+                    "client_id=.*?&".toRegex(),
+                    "client_id=${clientId!!}&"
+                )
+
+                replaceInstruction(
+                    occurrenceIndex,
+                    "const-string v$targetRegister, \"$newAuthorizationUrl\""
+                )
+            }
+        } ?: return PatchResultError("Could not find required method to patch.")
+        return PatchResultSuccess()
+    }
+
+    companion object : OptionsContainer() {
+        var clientId by option(
+            PatchOption.StringOption(
+                "client-id",
+                null,
+                "OAuth client ID",
+                "The client ID to use for OAuth."
+            )
+        )
+    }
+}