chore(release): 2.193.0-dev.6 [skip ci]

# [2.193.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v2.193.0-dev.5...v2.193.0-dev.6) (2023-10-08)

### Bug Fixes

* **YouTube:** Sort settings alphabetically despite punctuation ([#3097](https://github.com/ReVanced/revanced-patches/issues/3097)) ([debb07a](debb07ae21))

CHANGELOG.md

@@ -1,3 +1,26 @@
+# [2.193.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v2.193.0-dev.5...v2.193.0-dev.6) (2023-10-08)
+
+
+### Bug Fixes
+
+* **YouTube:** Sort settings alphabetically despite punctuation ([#3097](https://github.com/ReVanced/revanced-patches/issues/3097)) ([46e3c97](https://github.com/ReVanced/revanced-patches/commit/46e3c97d24e282e4d7d444603af4fb475ae03315))
+
+# [2.193.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v2.193.0-dev.4...v2.193.0-dev.5) (2023-10-08)
+
+
+### Bug Fixes
+
+* Consolidate patches ([#3098](https://github.com/ReVanced/revanced-patches/issues/3098)) ([02f767d](https://github.com/ReVanced/revanced-patches/commit/02f767df3cd1b2d0155e7360d2b26fa5d1cfcace))
+
+# [2.193.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v2.193.0-dev.3...v2.193.0-dev.4) (2023-10-08)
+
+
+### Bug Fixes
+
+* **Boost for Reddit - Spoof client:** Set user-agent for OAuth requests to fix login ([2223951](https://github.com/ReVanced/revanced-patches/commit/2223951fa16011d735ef4c4cda11eba13403f62d))
+* **Infinity for Reddit - Spoof client:** Set user-agent for OAuth requests to fix login ([a710f05](https://github.com/ReVanced/revanced-patches/commit/a710f05bb46156e66ca56aa4731e1028f459c414))
+* **Sync for Reddit - Spoof client:** Set user-agent for OAuth requests to fix login ([a48c4a7](https://github.com/ReVanced/revanced-patches/commit/a48c4a7cc1dbb3ecfce2e345240bca8142740b77))
+
 # [2.193.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v2.193.0-dev.2...v2.193.0-dev.3) (2023-10-07)
 
 

CONTRIBUTING.md

@@ -28,12 +28,15 @@
    <a href="https://t.me/app_revanced">
        <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
    </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://twitter.com/revancedapp">
+   <a href="https://x.com/revancedapp">
-       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032018-6da37214-7474-4641-a1da-7af7db3a31cd.png" />
+      <picture>
+         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+       <picture/>
    </a>&nbsp;&nbsp;&nbsp;
    <a href="https://www.youtube.com/@ReVanced">
        <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-   </a>&nbsp;&nbsp;&nbsp;
+   </a>
    <br>
    <br>
    Continuing the legacy of Vanced

README.md

@@ -28,18 +28,20 @@
    <a href="https://t.me/app_revanced">
        <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
    </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://twitter.com/revancedapp">
+   <a href="https://x.com/revancedapp">
-       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032018-6da37214-7474-4641-a1da-7af7db3a31cd.png" />
+      <picture>
+         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+       <picture/>
    </a>&nbsp;&nbsp;&nbsp;
    <a href="https://www.youtube.com/@ReVanced">
        <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-   </a>&nbsp;&nbsp;&nbsp;
+   </a>
    <br>
    <br>
    Continuing the legacy of Vanced
 </p>
 
-
 # 🧩 ReVanced Patches
 
 ![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/ReVanced/revanced-patches/release.yml)

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 2.193.0-dev.3
+version = 2.193.0-dev.6

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

@@ -0,0 +1,6 @@
+package app.revanced.patches.reddit.customclients
+
+object Constants {
+    const val OAUTH_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) " +
+            "Chrome/117.0.0.0 Safari/537.36 Edg/117.0.2045.60"
+}

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

@@ -6,7 +6,9 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
+import app.revanced.patches.reddit.customclients.Constants.OAUTH_USER_AGENT
 import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.GetClientIdFingerprint
+import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.LoginActivityOnCreateFingerprint
 
 @Patch(
     name = "Spoof client",
@@ -15,7 +17,9 @@ import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints
 )
 @Suppress("unused")
 object SpoofClientPatch : AbstractSpoofClientPatch(
-    "http://rubenmayayo.com", listOf(GetClientIdFingerprint)
+    "http://rubenmayayo.com",
+    clientIdFingerprints = listOf(GetClientIdFingerprint),
+    userAgentFingerprints = listOf(LoginActivityOnCreateFingerprint)
 ) {
     override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
         first().mutableMethod.addInstructions(
@@ -26,4 +30,20 @@ object SpoofClientPatch : AbstractSpoofClientPatch(
             """
         )
     }
+
+    override fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {
+        first().let { result ->
+            result.mutableMethod.apply {
+                val insertIndex = result.scanResult.patternScanResult!!.endIndex
+
+                addInstructions(
+                    insertIndex,
+                    """
+                        const-string v7, "$OAUTH_USER_AGENT"
+                        invoke-virtual {v4, v7}, Landroid/webkit/WebSettings;->setUserAgentString(Ljava/lang/String;)V
+                    """
+                )
+            }
+        }
+    }
 }

src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/fingerprints/LoginActivityOnCreateFingerprint.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+object LoginActivityOnCreateFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CONST_4
+    ),
+    customFingerprint = { method, classDef ->
+        method.name == "onCreate" && classDef.type.endsWith("LoginActivity;")
+    }
+)

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

@@ -1,14 +1,17 @@
 package app.revanced.patches.reddit.customclients.infinityforreddit.api
 
 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.MethodFingerprintResult
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
+import app.revanced.patches.reddit.customclients.Constants.OAUTH_USER_AGENT
 import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.GetHttpBasicAuthHeaderFingerprint
 import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.LoginActivityOnCreateFingerprint
+import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.SetWebViewSettingsFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch(
@@ -32,7 +35,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Suppress("unused")
 object SpoofClientPatch : AbstractSpoofClientPatch(
     "infinity://localhost",
-    listOf(GetHttpBasicAuthHeaderFingerprint, LoginActivityOnCreateFingerprint)
+    clientIdFingerprints = listOf(GetHttpBasicAuthHeaderFingerprint, LoginActivityOnCreateFingerprint),
+    userAgentFingerprints = listOf(SetWebViewSettingsFingerprint)
 ) {
     override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
         forEach {
@@ -48,4 +52,18 @@ object SpoofClientPatch : AbstractSpoofClientPatch(
             }
         }
     }
+
+    override fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {
+        first().let { result ->
+            val insertIndex = result.scanResult.stringsScanResult!!.matches.first().index
+
+            result.mutableMethod.addInstructions(
+                insertIndex,
+                """
+                    const-string v0, "$OAUTH_USER_AGENT"
+                    invoke-virtual {p1, v0}, Landroid/webkit/WebSettings;->setUserAgentString(Ljava/lang/String;)V
+                """
+            )
+        }
+    }
 }

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

@@ -0,0 +1,7 @@
+package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object SetWebViewSettingsFingerprint : MethodFingerprint(
+    strings= listOf("https://www.reddit.com/api/v1/authorize.compact")
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/api/SpoofClientPatch.kt

@@ -10,9 +10,11 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
+import app.revanced.patches.reddit.customclients.Constants.OAUTH_USER_AGENT
 import app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints.GetAuthorizationStringFingerprint
 import app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints.GetBearerTokenFingerprint
 import app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints.ImgurImageAPIFingerprint
+import app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints.LoadBrowserURLFingerprint
 import app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.DisablePiracyDetectionPatch
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
@@ -33,6 +35,7 @@ import java.util.*
 object SpoofClientPatch : AbstractSpoofClientPatch(
     "http://redditsync/auth",
     clientIdFingerprints = listOf(GetAuthorizationStringFingerprint),
+    userAgentFingerprints = listOf(LoadBrowserURLFingerprint),
     miscellaneousFingerprints = listOf(ImgurImageAPIFingerprint)
 ) {
     override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
@@ -79,4 +82,18 @@ object SpoofClientPatch : AbstractSpoofClientPatch(
             "const-string v1, \"https://api.imgur.com/3/image\""
         )
     }
+
+    override fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {
+        first().let { result ->
+            val insertIndex = result.scanResult.patternScanResult!!.startIndex
+
+            result.mutableMethod.addInstructions(
+                insertIndex,
+                """
+                    const-string v0, "$OAUTH_USER_AGENT"
+                    invoke-virtual {p1, v0}, Landroid/webkit/WebSettings;->setUserAgentString(Ljava/lang/String;)V
+                """
+            )
+        }
+    }
 }

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/api/fingerprints/LoadBrowserURLFingerprint.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+object LoadBrowserURLFingerprint : MethodFingerprint(
+    parameters = listOf("Landroid/view/View;", "Landroid/os/Bundle;"),
+    opcodes = listOf(Opcode.CONST_4),
+    strings = listOf("CustomInterface")
+)

src/main/kotlin/app/revanced/patches/shared/settings/preference/ComponentsExtensions.kt

@@ -40,4 +40,9 @@ internal fun <T> Element.addDefault(default: T) {
             }
         )
     }
+}
+
+internal fun CharSequence.removePunctuation(): String {
+    val punctuation = "\\p{P}+".toRegex()
+    return this.replace(punctuation, "")
 }

src/main/kotlin/app/revanced/patches/shared/settings/util/AbstractPreferenceScreen.kt

@@ -4,6 +4,7 @@ import app.revanced.patches.shared.settings.preference.BasePreference
 import app.revanced.patches.shared.settings.preference.impl.PreferenceCategory
 import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
 import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.removePunctuation
 import java.io.Closeable
 
 abstract class AbstractPreferenceScreen(
@@ -35,8 +36,8 @@ abstract class AbstractPreferenceScreen(
             return PreferenceScreen(
                 key,
                 StringResource("${key}_title", title),
-                 preferences.sortedBy { it.title.value.lowercase() } +
+                 preferences.sortedBy { it.title.value.removePunctuation().lowercase() } +
-                         categories.sortedBy { it.title.lowercase() }.map { it.transform() },
+                         categories.sortedBy { it.title.removePunctuation().lowercase() }.map { it.transform() },
                 summary?.let { summary ->
                     StringResource("${key}_summary", summary)
                 }
@@ -63,7 +64,7 @@ abstract class AbstractPreferenceScreen(
                 return PreferenceCategory(
                     key,
                     StringResource("${key}_title", title),
-                    preferences.sortedBy { it.title.value.lowercase() }
+                    preferences.sortedBy { it.title.value.removePunctuation().lowercase() }
                 )
             }
 

src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt

@@ -15,8 +15,7 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 
 @Patch(
-    name = "Hide \"Get YouTube Premium\" advertisements",
+    description = "Hides YouTube Premium signup promotions under the video player.",
-    description = "Hides YouTube Premium advertisements under video player.",
     dependencies = [IntegrationsPatch::class, SettingsPatch::class],
     compatiblePackages = [
         CompatiblePackage(
@@ -42,15 +41,15 @@ object HideGetPremiumPatch : BytecodePatch(setOf(GetPremiumViewFingerprint)) {
                 "revanced_hide_get_premium",
                 StringResource(
                     "revanced_hide_get_premium_title",
-                    "Hide \"Get YouTube Premium\" advertisements"
+                    "Hide YouTube Premium promotions"
                 ),
                 StringResource(
                     "revanced_hide_get_premium_summary_on",
-                    "YouTube Premium advertisements under video player are hidden"
+                    "YouTube Premium promotions under video player is hidden"
                 ),
                 StringResource(
                     "revanced_hide_get_premium_summary_off",
-                    "YouTube Premium advertisements under video player are shown"
+                    "YouTube Premium promotions under video player is shown"
                 )
             )
         )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt

@@ -53,14 +53,14 @@ object HideLayoutComponentsPatch : BytecodePatch(
             ),
             SwitchPreference(
                 "revanced_hide_join_membership_button",
-                StringResource("revanced_hide_join_membership_button_title", "Hide \"Join\" button"),
+                StringResource("revanced_hide_join_membership_button_title", "Hide \\\'Join\\\' button"),
                 StringResource("revanced_hide_join_membership_button_summary_on", "Button is hidden"),
                 StringResource("revanced_hide_join_membership_button_summary_off", "Button is shown")
             ),
 
             SwitchPreference(
                 "revanced_hide_notify_me_button",
-                StringResource("revanced_hide_notify_me_button_title", "Hide \"Notify me\" button"),
+                StringResource("revanced_hide_notify_me_button_title", "Hide \\\'Notify me\\\' button"),
                 StringResource("revanced_hide_notify_me_button_summary_on", "Button is hidden"),
                 StringResource("revanced_hide_notify_me_button_summary_off", "Button is shown")
             ),

src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch.kt

@@ -11,7 +11,7 @@ import app.revanced.patches.youtube.layout.hide.loadmorebutton.fingerprints.Hide
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch(
-    name = "Hide \"Load more\" button",
+    name = "Hide \'Load more\' button",
     description = "Hides the button under videos that loads similar videos.",
     dependencies = [HideLoadMoreButtonResourcePatch::class],
     compatiblePackages = [

src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonResourcePatch.kt

@@ -21,7 +21,7 @@ object HideLoadMoreButtonResourcePatch : ResourcePatch() {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_load_more_button",
-                StringResource("revanced_hide_load_more_button_title", "Hide \"Load More\" button"),
+                StringResource("revanced_hide_load_more_button_title", "Hide \\\'Load More\\\' button"),
                 StringResource("revanced_hide_load_more_button_summary_on", "Button is hidden"),
                 StringResource("revanced_hide_load_more_button_summary_off", "Button is shown")
             )