chore: merge branch dev to main (ReVanced#2400)

everything-gripe · Jun 12, 2023 · 420d6cf · 420d6cf
2 parents e099ae9 + baf8ba4
commit 420d6cf
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,31 @@
+# [2.177.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.177.0-dev.1...v2.177.0-dev.2) (2023-06-12)
+
+
+### Bug Fixes
+
+* **reddit/hide-ads:** search for correct reference class descriptor ([ad2a858](https://github.com/revanced/revanced-patches/commit/ad2a8585b2a5ecbc5eb92dd23b0ab124aa8a2541))
+
+# [2.177.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.176.2-dev.2...v2.177.0-dev.1) (2023-06-12)
+
+
+### Features
+
+* **syncforreddit/change-oauth-client-id:** support pro version ([d34288b](https://github.com/revanced/revanced-patches/commit/d34288b6e8c7f5bb944622a3c741fcc693868033))
+
+## [2.176.2-dev.2](https://github.com/revanced/revanced-patches/compare/v2.176.2-dev.1...v2.176.2-dev.2) (2023-06-12)
+
+
+### Bug Fixes
+
+* **syncforreddit/change-oauth-client-id:** trim whitespace from OAuth string ([#2402](https://github.com/revanced/revanced-patches/issues/2402)) ([2afea71](https://github.com/revanced/revanced-patches/commit/2afea71557cfe4eb64d7c7ebf5a07dfd24a11824))
+
+## [2.176.2-dev.1](https://github.com/revanced/revanced-patches/compare/v2.176.1...v2.176.2-dev.1) (2023-06-12)
+
+
+### Bug Fixes
+
+* **syncforreddit/change-oauth-client-id:** use downloads directory ([9b5af77](https://github.com/revanced/revanced-patches/commit/9b5af77a229a22466cfe8ed41a21d081beeae960))
+
 ## [2.176.1](https://github.com/revanced/revanced-patches/compare/v2.176.0...v2.176.1) (2023-06-12)
 
 

diff --git a/README.md b/README.md
@@ -205,6 +205,14 @@ The official ReVanced Patches.
 | `spoof-signature` | Spoofs the signature of the app. | all |
 </details>
 
+### [📦 `com.laurencedawson.reddit_sync.pro`](https://play.google.com/store/apps/details?id=com.laurencedawson.reddit_sync.pro)
+<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>
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.176.1
+version = 2.177.0-dev.2
diff --git a/patches.json b/patches.json
diff --git a/src/main/kotlin/app/revanced/patches/reddit/ad/general/patch/HideAdsPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/ad/general/patch/HideAdsPatch.kt
@@ -73,7 +73,7 @@ class HideAdsPatch : BytecodePatch(
 
                 val reference = (it as ReferenceInstruction).reference as MethodReference
 
-                reference.name == "add" && reference.definingClass == "Lava/util/ArrayList;"
+                reference.name == "add" && reference.definingClass == "Ljava/util/ArrayList;"
             }
 
             result.mutableMethod.removeInstruction(index)

diff --git a/src/main/kotlin/app/revanced/patches/syncforreddit/api/patch/ChangeOAuthClientIdPatch.kt b/src/main/kotlin/app/revanced/patches/syncforreddit/api/patch/ChangeOAuthClientIdPatch.kt
@@ -20,7 +20,12 @@ import java.util.*
 @Patch
 @Name("change-oauth-client-id")
 @Description("Changes the OAuth client ID.")
-@Compatibility([Package("com.laurencedawson.reddit_sync")])
+@Compatibility(
+    [
+        Package("com.laurencedawson.reddit_sync"),
+        Package("com.laurencedawson.reddit_sync.pro")
+    ]
+)
 @Version("0.0.1")
 class ChangeOAuthClientIdPatch : BytecodePatch(
     listOf(GetAuthorizationStringFingerprint)
@@ -47,7 +52,7 @@ class ChangeOAuthClientIdPatch : BytecodePatch(
                 """.trimIndent()
 
                 return PatchResultError(error)
-            }.let { clientId = it.readText() }
+            }.let { clientId = it.readText().trim() }
         }
 
         GetAuthorizationStringFingerprint.result?.also { result ->
@@ -93,4 +98,4 @@ class ChangeOAuthClientIdPatch : BytecodePatch(
             )
         )
     }
-}
+}