chore(release): 2.179.0-dev.12 [skip ci]

# [2.179.0-dev.12](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.11...v2.179.0-dev.12) (2023-07-01)

### Features

* **baconreader:** add `change-oauth-client-id` patch ([#2535](https://github.com/revanced/revanced-patches/issues/2535)) ([b15002e](b15002e318))

.idea/misc.xml

@@ -4,5 +4,5 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="azul-17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="azul-17" project-jdk-type="JavaSDK" />
 </project>

CHANGELOG.md

@@ -1,3 +1,33 @@
+# [2.179.0-dev.12](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.11...v2.179.0-dev.12) (2023-07-01)
+
+
+### Features
+
+* **baconreader:** add `change-oauth-client-id` patch ([#2535](https://github.com/revanced/revanced-patches/issues/2535)) ([6f5e007](https://github.com/revanced/revanced-patches/commit/6f5e007a78dc5e1ed3935a3436ac1de7eb719ea1))
+
+# [2.179.0-dev.11](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.10...v2.179.0-dev.11) (2023-07-01)
+
+# [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)
 
 

README.md

@@ -128,6 +128,17 @@ The official ReVanced Patches.
 | `show-deleted-messages` | Shows deleted chat messages behind a clickable spoiler. | 15.4.1 |
 </details>
 
+### [📦 `com.reddit.frontpage`](https://play.google.com/store/apps/details?id=com.reddit.frontpage)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `disable-screenshot-popup` | Disables the popup that shows up when taking a screenshot. | all |
+| `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.twitter.android`](https://play.google.com/store/apps/details?id=com.twitter.android)
 <details>
 
@@ -149,16 +160,6 @@ 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>
 
@@ -228,6 +229,14 @@ The official ReVanced Patches.
 | `change-oauth-client-id` | Changes the OAuth client ID. | all |
 </details>
 
+### [📦 `com.onelouder.baconreader`](https://play.google.com/store/apps/details?id=com.onelouder.baconreader)
+<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>
 
@@ -236,6 +245,22 @@ The official ReVanced Patches.
 | `change-oauth-client-id` | Changes the OAuth client ID. | all |
 </details>
 
+### [📦 `com.andrewshu.android.reddit`](https://play.google.com/store/apps/details?id=com.andrewshu.android.reddit)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `change-oauth-client-id` | Changes the OAuth client ID. | all |
+</details>
+
+### [📦 `com.andrewshu.android.redditdonation`](https://play.google.com/store/apps/details?id=com.andrewshu.android.redditdonation)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `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)
 <details>
 
@@ -268,14 +293,6 @@ The official ReVanced Patches.
 | `enable-on-demand` | Enables listening to songs on-demand, allowing to play any song from playlists, albums or artists without limitations. This does not remove ads. | all |
 </details>
 
-### [📦 `com.vanced.android.youtube`](https://play.google.com/store/apps/details?id=com.vanced.android.youtube)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `hide-ads` | Removes general ads. | all |
-</details>
-
 ### [📦 `com.nis.app`](https://play.google.com/store/apps/details?id=com.nis.app)
 <details>
 
@@ -284,6 +301,14 @@ The official ReVanced Patches.
 | `hide-ads` | Removes ads from Inshorts. | all |
 </details>
 
+### [📦 `com.vanced.android.youtube`](https://play.google.com/store/apps/details?id=com.vanced.android.youtube)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `hide-ads` | Removes general ads. | all |
+</details>
+
 ### [📦 `com.instagram.android`](https://play.google.com/store/apps/details?id=com.instagram.android)
 <details>
 
@@ -372,12 +397,20 @@ The official ReVanced Patches.
 | `unlock-prime` | Unlocks Nova Prime and all functions of the app. | all |
 </details>
 
-### [📦 `com.candylink.openvpn`](https://play.google.com/store/apps/details?id=com.candylink.openvpn)
+### [📦 `org.totschnig.myexpenses`](https://play.google.com/store/apps/details?id=org.totschnig.myexpenses)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks premium features. | all |
+| `unlock-pro` | Unlocks all professional features. | 3.4.9 |
+</details>
+
+### [📦 `ginlemon.iconpackstudio`](https://play.google.com/store/apps/details?id=ginlemon.iconpackstudio)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all pro features. | all |
 </details>
 
 ### [📦 `com.zombodroid.MemeGenerator`](https://play.google.com/store/apps/details?id=com.zombodroid.MemeGenerator)
@@ -388,7 +421,7 @@ The official ReVanced Patches.
 | `unlock-pro` | Unlocks pro features. | 4.6377 |
 </details>
 
-### [📦 `com.wakdev.apps.nfctools.se`](https://play.google.com/store/apps/details?id=com.wakdev.apps.nfctools.se)
+### [📦 `co.windyapp.android`](https://play.google.com/store/apps/details?id=co.windyapp.android)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
@@ -396,7 +429,15 @@ The official ReVanced Patches.
 | `unlock-pro` | Unlocks all pro features. | all |
 </details>
 
-### [📦 `ginlemon.iconpackstudio`](https://play.google.com/store/apps/details?id=ginlemon.iconpackstudio)
+### [📦 `com.vsco.cam`](https://play.google.com/store/apps/details?id=com.vsco.cam)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks pro features. | all |
+</details>
+
+### [📦 `com.wakdev.apps.nfctools.se`](https://play.google.com/store/apps/details?id=com.wakdev.apps.nfctools.se)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
@@ -412,28 +453,12 @@ The official ReVanced Patches.
 | `unlock-pro` | Unlocks pro features. | all |
 </details>
 
-### [📦 `com.vsco.cam`](https://play.google.com/store/apps/details?id=com.vsco.cam)
+### [📦 `com.candylink.openvpn`](https://play.google.com/store/apps/details?id=com.candylink.openvpn)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks pro features. | all |
-</details>
-
-### [📦 `org.totschnig.myexpenses`](https://play.google.com/store/apps/details?id=org.totschnig.myexpenses)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all professional features. | 3.4.9 |
-</details>
-
-### [📦 `com.awedea.nyx`](https://play.google.com/store/apps/details?id=com.awedea.nyx)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all pro features. | all |
+| `unlock-pro` | Unlocks premium features. | all |
 </details>
 
 ### [📦 `tv.trakt.trakt`](https://play.google.com/store/apps/details?id=tv.trakt.trakt)
@@ -444,7 +469,7 @@ The official ReVanced Patches.
 | `unlock-pro` | Unlocks pro features. | all |
 </details>
 
-### [📦 `co.windyapp.android`](https://play.google.com/store/apps/details?id=co.windyapp.android)
+### [📦 `com.awedea.nyx`](https://play.google.com/store/apps/details?id=com.awedea.nyx)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |

build.gradle.kts

@@ -27,7 +27,7 @@ repositories {
 }
 
 dependencies {
-    implementation("app.revanced:revanced-patcher:11.0.2")
+    implementation("app.revanced:revanced-patcher:11.0.3")
     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.179.0-dev.7
+version = 2.179.0-dev.12

src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/api/fingerprints/GetAuthorizationUrlFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.reddit.customclients.baconreader.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object GetAuthorizationUrlFingerprint: MethodFingerprint(
+    strings = listOf("client_id=zACVn0dSFGdWqQ"),
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/api/fingerprints/GetClientIdFingerprint.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.reddit.customclients.baconreader.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object GetClientIdFingerprint : MethodFingerprint(
+    strings = listOf("client_id=zACVn0dSFGdWqQ"),
+    customFingerprint = custom@{ methodDef, classDef ->
+        if (!classDef.type.endsWith("RedditOAuth;")) return@custom false
+
+        methodDef.name == "getAuthorizeUrl"
+    }
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/api/fingerprints/RequestTokenFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.reddit.customclients.baconreader.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object RequestTokenFingerprint : MethodFingerprint(
+    strings = listOf("zACVn0dSFGdWqQ", "kDm2tYpu9DqyWFFyPlNcXGEni4k"), // App ID and secret.
+)

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

@@ -0,0 +1,47 @@
+package app.revanced.patches.reddit.customclients.baconreader.api.patch
+
+import app.revanced.patcher.annotation.Compatibility
+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.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
+import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
+import app.revanced.patches.reddit.customclients.baconreader.api.fingerprints.GetAuthorizationUrlFingerprint
+import app.revanced.patches.reddit.customclients.baconreader.api.fingerprints.RequestTokenFingerprint
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+
+@ChangeOAuthClientIdPatchAnnotation
+@Compatibility([Package("com.onelouder.baconreader")])
+class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(
+    "http://baconreader.com/auth", Options, listOf(GetAuthorizationUrlFingerprint, RequestTokenFingerprint)
+) {
+
+    override fun List<MethodFingerprintResult>.patch(context: BytecodeContext): PatchResult {
+        fun MethodFingerprintResult.patch(replacementString: String) {
+            val clientIdIndex = scanResult.stringsScanResult!!.matches.first().index
+
+            mutableMethod.apply {
+                val clientIdRegister = getInstruction<OneRegisterInstruction>(clientIdIndex).registerA
+                replaceInstruction(
+                    clientIdIndex,
+                    "const-string v$clientIdRegister, \"$replacementString\""
+                )
+            }
+        }
+
+        // Patch client id in authorization url.
+        first().patch("client_id=$clientId")
+
+        // Patch client id for access token request.
+        last().patch(clientId!!)
+
+        return PatchResultSuccess()
+    }
+
+    companion object Options : AbstractChangeOAuthClientIdPatch.Options.ChangeOAuthClientIdOptionsContainer()
+}

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

@@ -0,0 +1,7 @@
+package app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+abstract class AbstractClientIdFingerprint(string: String) : MethodFingerprint(
+    strings = listOfNotNull("yyOCBp.RHJhDKd", string),
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/BasicAuthorizationFingerprint.kt

@@ -0,0 +1,5 @@
+package app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints
+
+object BasicAuthorizationFingerprint : AbstractClientIdFingerprint(
+    string = "fJOxVwBUyo*=f:<OoejWs:AqmIJ", // Encrypted basic authorization string.
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/BuildAuthorizationStringFingerprint.kt

@@ -0,0 +1,5 @@
+package app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints
+
+object BuildAuthorizationStringFingerprint : AbstractClientIdFingerprint(
+    string = "client_id"
+)

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

@@ -0,0 +1,57 @@
+package app.revanced.patches.reddit.customclients.redditisfun.api.patch
+
+import app.revanced.patcher.annotation.Compatibility
+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.fingerprint.method.impl.MethodFingerprintResult.MethodFingerprintScanResult.StringsScanResult.StringMatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
+import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
+import app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints.BasicAuthorizationFingerprint
+import app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints.BuildAuthorizationStringFingerprint
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@ChangeOAuthClientIdPatchAnnotation
+@Compatibility([Package("com.andrewshu.android.reddit"), Package("com.andrewshu.android.redditdonation")])
+class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(
+    "redditisfun://auth",
+    Options,
+    listOf(
+        BuildAuthorizationStringFingerprint,
+        BasicAuthorizationFingerprint,
+    )
+) {
+    override fun List<MethodFingerprintResult>.patch(context: BytecodeContext): PatchResult {
+        /**
+         * Replaces a one register instruction with a const-string instruction
+         * at the index returned by [getReplacementIndex].
+         *
+         * @param string The string to replace the instruction with.
+         * @param getReplacementIndex A function that returns the index of the instruction to replace
+         * using the [StringMatch] list from the [MethodFingerprintResult].
+         */
+        fun MethodFingerprintResult.replaceWith(
+            string: String,
+            getReplacementIndex: List<StringMatch>.() -> Int,
+        ) = mutableMethod.apply {
+            val replacementIndex = scanResult.stringsScanResult!!.matches.getReplacementIndex()
+            val clientIdRegister = getInstruction<OneRegisterInstruction>(replacementIndex).registerA
+
+            replaceInstruction(replacementIndex, "const-string v$clientIdRegister, \"$string\"")
+        }
+
+        // Patch OAuth authorization.
+        first().replaceWith(clientId!!) { first().index + 4 }
+
+        // Path basic authorization.
+        last().replaceWith("$clientId:") { last().index + 7 }
+
+        return PatchResultSuccess()
+    }
+
+    companion object Options : AbstractChangeOAuthClientIdPatch.Options.ChangeOAuthClientIdOptionsContainer()
+}

src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/annotations/DisableScreenshotPopupCompatibility.kt

@@ -0,0 +1,8 @@
+package app.revanced.patches.reddit.layout.disablescreenshotpopup.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.reddit.frontpage")])
+@Target(AnnotationTarget.CLASS)
+internal annotation class DisableScreenshotPopupCompatibility

src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/fingerprints/DisableScreenshotPopupFingerprint.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.reddit.layout.disablescreenshotpopup.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object DisableScreenshotPopupFingerprint : MethodFingerprint(
+    "V",
+    parameters = listOf("Landroidx/compose/runtime/", "I"),
+    customFingerprint = custom@{ methodDef, classDef ->
+        if (!classDef.type.endsWith("\$ScreenshotTakenBannerKt\$lambda-1\$1;"))
+                return@custom false
+
+        methodDef.name == "invoke"
+    }
+)

src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/patch/DisableScreenshotPopupPatch.kt

@@ -0,0 +1,30 @@
+package app.revanced.patches.reddit.layout.disablescreenshotpopup.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.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.reddit.layout.disablescreenshotpopup.annotations.DisableScreenshotPopupCompatibility
+import app.revanced.patches.reddit.layout.disablescreenshotpopup.fingerprints.DisableScreenshotPopupFingerprint
+
+@Patch
+@Name("disable-screenshot-popup")
+@Description("Disables the popup that shows up when taking a screenshot.")
+@DisableScreenshotPopupCompatibility
+@Version("0.0.1")
+class DisableScreenshotPopupPatch : BytecodePatch(
+    listOf(DisableScreenshotPopupFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        DisableScreenshotPopupFingerprint.result?.mutableMethod?.addInstruction(0, "return-void")
+            ?: return DisableScreenshotPopupFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
+    }
+}