chore(release): 4.10.0-dev.10 [skip ci]

# [4.10.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v4.10.0-dev.9...v4.10.0-dev.10) (2024-06-18)

### Bug Fixes

* Correct invalid string name ([7fa7ef6](7fa7ef6c4f))

CHANGELOG.md

@@ -1,3 +1,59 @@
+# [4.10.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v4.10.0-dev.9...v4.10.0-dev.10) (2024-06-18)
+
+
+### Bug Fixes
+
+* Correct invalid string name ([b84494f](https://github.com/ReVanced/revanced-patches/commit/b84494f4e26e040ada69ed7a516f331f2d47da87))
+
+# [4.10.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v4.10.0-dev.8...v4.10.0-dev.9) (2024-06-17)
+
+
+### Bug Fixes
+
+* **YouTube - Hide description components:** Replace `Hide game section` and `Hide music section` with `Hide attributes section` ([#3327](https://github.com/ReVanced/revanced-patches/issues/3327)) ([0198a43](https://github.com/ReVanced/revanced-patches/commit/0198a436f97b127a2a5dd283644254f9a0ae3e43))
+
+# [4.10.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v4.10.0-dev.7...v4.10.0-dev.8) (2024-06-17)
+
+
+### Features
+
+* **YouTube - Comments:** Add `Hide 'Create a Short' button` option ([#3333](https://github.com/ReVanced/revanced-patches/issues/3333)) ([be9e244](https://github.com/ReVanced/revanced-patches/commit/be9e24420fda80903e44e2e2278ea4904ecac4e1))
+
+# [4.10.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v4.10.0-dev.6...v4.10.0-dev.7) (2024-06-15)
+
+
+### Features
+
+* Add `Change version code` patch ([#3338](https://github.com/ReVanced/revanced-patches/issues/3338)) ([685ef39](https://github.com/ReVanced/revanced-patches/commit/685ef39119daf1033a83262982519531c481c40f))
+
+# [4.10.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v4.10.0-dev.5...v4.10.0-dev.6) (2024-06-09)
+
+
+### Features
+
+* **YouTube - Comments:** Add `Hide Thanks button` and `Hide 'Comments by members' header` options ([#3317](https://github.com/ReVanced/revanced-patches/issues/3317)) ([9c4c4f0](https://github.com/ReVanced/revanced-patches/commit/9c4c4f05a762d745404101bbc3925ab4eba2deb8))
+
+# [4.10.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v4.10.0-dev.4...v4.10.0-dev.5) (2024-06-09)
+
+
+### Bug Fixes
+
+* **YouTube - Client spoof:** Correctly play more livestreams using Android VR ([#3316](https://github.com/ReVanced/revanced-patches/issues/3316)) ([c05264a](https://github.com/ReVanced/revanced-patches/commit/c05264af3944cbfe8d9aa34fb0e0fddb05a1d42f))
+
+# [4.10.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v4.10.0-dev.3...v4.10.0-dev.4) (2024-06-08)
+
+
+### Features
+
+* **Boost for Reddit:** Add `Fix audio missing in video downloads` patch ([#3287](https://github.com/ReVanced/revanced-patches/issues/3287)) ([a9258d4](https://github.com/ReVanced/revanced-patches/commit/a9258d48d3ddf8552ab56219677a3b31ee553666))
+
+# [4.10.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v4.10.0-dev.2...v4.10.0-dev.3) (2024-06-08)
+
+
+### Features
+
+* **Boost For Reddit:** Add `Fix /s/ links` patch ([#3154](https://github.com/ReVanced/revanced-patches/issues/3154)) ([5fa9fd2](https://github.com/ReVanced/revanced-patches/commit/5fa9fd2dfef43838d7311a967a3e805256a5d116))
+
 # [4.10.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.10.0-dev.1...v4.10.0-dev.2) (2024-06-08)
 
 

api/revanced-patches.api

@@ -105,6 +105,12 @@ public final class app/revanced/patches/all/misc/transformation/IMethodCall$Defa
 	public static fun replaceInvokeVirtualWithIntegrations (Lapp/revanced/patches/all/misc/transformation/IMethodCall;Ljava/lang/String;Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Lcom/android/tools/smali/dexlib2/iface/instruction/formats/Instruction35c;I)V
 }
 
+public final class app/revanced/patches/all/misc/versioncode/ChangeVersionCodePatch : app/revanced/patcher/patch/ResourcePatch {
+	public static final field INSTANCE Lapp/revanced/patches/all/misc/versioncode/ChangeVersionCodePatch;
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
+}
+
 public final class app/revanced/patches/all/screencapture/removerestriction/RemoveCaptureRestrictionPatch : app/revanced/patches/all/misc/transformation/BaseTransformInstructionsPatch {
 	public static final field INSTANCE Lapp/revanced/patches/all/screencapture/removerestriction/RemoveCaptureRestrictionPatch;
 	public synthetic fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Ljava/lang/Object;
@@ -535,6 +541,18 @@ public final class app/revanced/patches/reddit/ad/general/HideAdsPatch : app/rev
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public abstract class app/revanced/patches/reddit/customclients/BaseFixSLinksPatch : app/revanced/patcher/patch/BytecodePatch {
+	public fun <init> (Lapp/revanced/patcher/fingerprint/MethodFingerprint;Lapp/revanced/patcher/fingerprint/MethodFingerprint;Ljava/util/Set;Ljava/util/Set;)V
+	public synthetic fun <init> (Lapp/revanced/patcher/fingerprint/MethodFingerprint;Lapp/revanced/patcher/fingerprint/MethodFingerprint;Ljava/util/Set;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+	protected abstract fun getIntegrationsClassDescriptor ()Ljava/lang/String;
+	protected final fun getResolveSLinkMethod ()Ljava/lang/String;
+	protected final fun getSetAccessTokenMethod ()Ljava/lang/String;
+	protected abstract fun patchNavigationHandler (Lapp/revanced/patcher/fingerprint/MethodFingerprintResult;Lapp/revanced/patcher/data/BytecodeContext;)V
+	protected abstract fun patchSetAccessToken (Lapp/revanced/patcher/fingerprint/MethodFingerprintResult;Lapp/revanced/patcher/data/BytecodeContext;)V
+}
+
 public abstract class app/revanced/patches/reddit/customclients/BaseSpoofClientPatch : app/revanced/patcher/patch/BytecodePatch {
 	public fun <init> (Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)V
 	public synthetic fun <init> (Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -570,6 +588,20 @@ public final class app/revanced/patches/reddit/customclients/boostforreddit/api/
 	public fun patchUserAgent (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
 }
 
+public final class app/revanced/patches/reddit/customclients/boostforreddit/fix/downloads/FixAudioMissingInDownloadsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/boostforreddit/fix/downloads/FixAudioMissingInDownloadsPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
+public final class app/revanced/patches/reddit/customclients/boostforreddit/fix/slink/FixSLinksPatch : app/revanced/patches/reddit/customclients/BaseFixSLinksPatch {
+	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/boostforreddit/fix/slink/FixSLinksPatch;
+}
+
+public final class app/revanced/patches/reddit/customclients/boostforreddit/misc/integrations/IntegrationsPatch : app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch {
+	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/boostforreddit/misc/integrations/IntegrationsPatch;
+}
+
 public final class app/revanced/patches/reddit/customclients/infinityforreddit/api/SpoofClientPatch : app/revanced/patches/reddit/customclients/BaseSpoofClientPatch {
 	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/infinityforreddit/api/SpoofClientPatch;
 	public fun patchClientId (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -648,10 +680,12 @@ public final class app/revanced/patches/reddit/customclients/syncforreddit/detec
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
-public final class app/revanced/patches/reddit/customclients/syncforreddit/fix/slink/FixSLinksPatch : app/revanced/patcher/patch/BytecodePatch {
+public final class app/revanced/patches/reddit/customclients/syncforreddit/fix/slink/FixSLinksPatch : app/revanced/patches/reddit/customclients/BaseFixSLinksPatch {
 	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/syncforreddit/fix/slink/FixSLinksPatch;
-	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+}
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+
+public final class app/revanced/patches/reddit/customclients/syncforreddit/misc/integrations/IntegrationsPatch : app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch {
+	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/syncforreddit/misc/integrations/IntegrationsPatch;
 }
 
 public final class app/revanced/patches/reddit/layout/disablescreenshotpopup/DisableScreenshotPopupPatch : app/revanced/patcher/patch/BytecodePatch {

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.10.0-dev.2
+version = 4.10.0-dev.10

src/main/kotlin/app/revanced/patches/all/misc/versioncode/ChangeVersionCodePatch.kt

@@ -0,0 +1,39 @@
+package app.revanced.patches.all.misc.versioncode
+
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.intPatchOption
+import app.revanced.util.getNode
+import org.w3c.dom.Element
+
+@Patch(
+    name = "Change version code",
+    description = "Changes the version code of the app. By default the highest version code is set. " +
+        "This allows older versions of an app to be installed " +
+        "if their version code is set to the same or a higher value and can stop app stores to update the app.",
+    use = false,
+)
+@Suppress("unused")
+object ChangeVersionCodePatch : ResourcePatch() {
+    private val versionCode by intPatchOption(
+        key = "versionCode",
+        default = Int.MAX_VALUE,
+        values = mapOf(
+            "Lowest" to 1,
+            "Highest" to Int.MAX_VALUE,
+        ),
+        title = "Version code",
+        description = "The version code to use",
+        required = true,
+    ) {
+        it!! >= 1
+    }
+
+    override fun execute(context: ResourceContext) {
+        context.document["AndroidManifest.xml"].use { document ->
+            val manifestElement = document.getNode("manifest") as Element
+            manifestElement.setAttribute("android:versionCode", "$versionCode")
+        }
+    }
+}

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

@@ -0,0 +1,49 @@
+package app.revanced.patches.reddit.customclients
+
+import app.revanced.patcher.PatchClass
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprintResult
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.util.resultOrThrow
+
+abstract class BaseFixSLinksPatch(
+    private val handleNavigationFingerprint: MethodFingerprint,
+    private val setAccessTokenFingerprint: MethodFingerprint,
+    compatiblePackages: Set<CompatiblePackage>,
+    dependencies: Set<PatchClass> = emptySet(),
+) : BytecodePatch(
+    name = "Fix /s/ links",
+    fingerprints = setOf(handleNavigationFingerprint, setAccessTokenFingerprint),
+    compatiblePackages = compatiblePackages,
+    dependencies = dependencies,
+) {
+    protected abstract val integrationsClassDescriptor: String
+
+    protected val resolveSLinkMethod =
+        "patchResolveSLink(Ljava/lang/String;)Z"
+
+    protected val setAccessTokenMethod =
+        "patchSetAccessToken(Ljava/lang/String;)V"
+
+    override fun execute(context: BytecodeContext) {
+        handleNavigationFingerprint.resultOrThrow().patchNavigationHandler(context)
+        setAccessTokenFingerprint.resultOrThrow().patchSetAccessToken(context)
+    }
+
+    /**
+     * Patch app's navigation handler to resolve /s/ links.
+     *
+     * @param context The current [BytecodeContext].
+     *
+     */
+    protected abstract fun MethodFingerprintResult.patchNavigationHandler(context: BytecodeContext)
+
+    /**
+     * Patch access token setup in app to resolve /s/ links with an access token
+     * in order to bypass API bans when making unauthorized requests.
+     *
+     * @param context The current [BytecodeContext].
+     */
+    protected abstract fun MethodFingerprintResult.patchSetAccessToken(context: BytecodeContext)
+}

src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/fix/downloads/FixAudioMissingInDownloadsPatch.kt

@@ -0,0 +1,38 @@
+package app.revanced.patches.reddit.customclients.boostforreddit.fix.downloads
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.reddit.customclients.boostforreddit.fix.downloads.fingerprints.DownloadAudioFingerprint
+import app.revanced.util.resultOrThrow
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch(
+    name = "Fix missing audio in video downloads",
+    description = "Fixes audio missing in videos downloaded from v.redd.it.",
+    compatiblePackages = [CompatiblePackage("com.rubenmayayo.reddit")],
+)
+@Suppress("unused")
+object FixAudioMissingInDownloadsPatch : BytecodePatch(
+    setOf(DownloadAudioFingerprint),
+) {
+    private val endpointReplacements = mapOf(
+        "/DASH_audio.mp4" to "/DASH_AUDIO_128.mp4",
+        "/audio" to "/DASH_AUDIO_64.mp4",
+    )
+    override fun execute(context: BytecodeContext) {
+        DownloadAudioFingerprint.resultOrThrow().let { result ->
+            result.scanResult.stringsScanResult!!.matches.take(2).forEach { match ->
+                result.mutableMethod.apply {
+                    val replacement = endpointReplacements[match.string]
+                    val register = getInstruction<OneRegisterInstruction>(match.index).registerA
+
+                    replaceInstruction(match.index, "const-string v$register, \"$replacement\"")
+                }
+            }
+        }
+    }
+}

src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/fix/downloads/fingerprints/DownloadAudioFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.reddit.customclients.boostforreddit.fix.downloads.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object DownloadAudioFingerprint : MethodFingerprint(
+    strings = setOf("/DASH_audio.mp4", "/audio", "v.redd.it", "/"),
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/fix/slink/FixSLinksPatch.kt

@@ -0,0 +1,44 @@
+package app.revanced.patches.reddit.customclients.boostforreddit.fix.slink
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.fingerprint.MethodFingerprintResult
+import app.revanced.patcher.util.smali.ExternalLabel
+import app.revanced.patches.reddit.customclients.BaseFixSLinksPatch
+import app.revanced.patches.reddit.customclients.boostforreddit.fix.slink.fingerprints.GetOAuthAccessTokenFingerprint
+import app.revanced.patches.reddit.customclients.boostforreddit.fix.slink.fingerprints.HandleNavigationFingerprint
+import app.revanced.patches.reddit.customclients.boostforreddit.misc.integrations.IntegrationsPatch
+
+@Suppress("unused")
+object FixSLinksPatch : BaseFixSLinksPatch(
+    handleNavigationFingerprint = HandleNavigationFingerprint,
+    setAccessTokenFingerprint = GetOAuthAccessTokenFingerprint,
+    compatiblePackages = setOf(CompatiblePackage("com.rubenmayayo.reddit")),
+    dependencies = setOf(IntegrationsPatch::class),
+) {
+    override val integrationsClassDescriptor = "Lapp/revanced/integrations/boostforreddit/FixSLinksPatch;"
+
+    override fun MethodFingerprintResult.patchNavigationHandler(context: BytecodeContext) {
+        mutableMethod.apply {
+            val urlRegister = "p1"
+            val tempRegister = "v1"
+            addInstructionsWithLabels(
+                0,
+                """
+                    invoke-static { $urlRegister }, $integrationsClassDescriptor->$resolveSLinkMethod
+                    move-result $tempRegister
+                    if-eqz $tempRegister, :continue
+                    return $tempRegister
+                """,
+                ExternalLabel("continue", getInstruction(0)),
+            )
+        }
+    }
+
+    override fun MethodFingerprintResult.patchSetAccessToken(context: BytecodeContext) = mutableMethod.addInstruction(
+        3,
+        "invoke-static { v0 }, $integrationsClassDescriptor->$setAccessTokenMethod",
+    )
+}

src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/fix/slink/fingerprints/GetOAuthAccessTokenFingerprint.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.reddit.customclients.boostforreddit.fix.slink.fingerprints
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object GetOAuthAccessTokenFingerprint : MethodFingerprint(
+    strings = listOf("access_token"),
+    accessFlags = AccessFlags.PUBLIC.value,
+    returnType = "Ljava/lang/String",
+    customFingerprint = { _, classDef -> classDef.type == "Lnet/dean/jraw/http/oauth/OAuthData;" },
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/fix/slink/fingerprints/HandleNavigationFingerprint.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.reddit.customclients.boostforreddit.fix.slink.fingerprints
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object HandleNavigationFingerprint : MethodFingerprint(
+    strings = listOf(
+        "android.intent.action.SEARCH",
+        "subscription",
+        "sort",
+        "period",
+        "boostforreddit.com/themes",
+    ),
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/misc/integrations/IntegrationsPatch.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.reddit.customclients.boostforreddit.misc.integrations
+
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch
+import app.revanced.patches.reddit.customclients.boostforreddit.misc.integrations.fingerprints.InitFingerprint
+
+@Patch(requiresIntegrations = true)
+object IntegrationsPatch : BaseIntegrationsPatch(
+    setOf(InitFingerprint)
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/misc/integrations/fingerprints/InitFingerprint.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.reddit.customclients.boostforreddit.misc.integrations.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch.IntegrationsFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object InitFingerprint : IntegrationsFingerprint(
+    customFingerprint = { methodDef, _ -> methodDef.definingClass == "Lcom/rubenmayayo/reddit/MyApplication;" && methodDef.name == "onCreate" },
+    insertIndexResolver = { 1 } // Insert after call to super class.
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/slink/FixSLinksPatch.kt

@@ -1,32 +1,49 @@
 package app.revanced.patches.reddit.customclients.syncforreddit.fix.slink
 
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.fingerprint.MethodFingerprintResult
+import app.revanced.patcher.util.smali.ExternalLabel
+import app.revanced.patches.reddit.customclients.BaseFixSLinksPatch
 import app.revanced.patches.reddit.customclients.syncforreddit.fix.slink.fingerprints.LinkHelperOpenLinkFingerprint
-import app.revanced.util.exception
+import app.revanced.patches.reddit.customclients.syncforreddit.fix.slink.fingerprints.SetAuthorizationHeaderFingerprint
+import app.revanced.patches.reddit.customclients.syncforreddit.misc.integrations.IntegrationsPatch
 
-@Patch(
+@Suppress("unused")
-    name = "Fix /s/ links",
+object FixSLinksPatch : BaseFixSLinksPatch(
-    description = "Fixes the issue where /s/ links do not work.",
+    handleNavigationFingerprint = LinkHelperOpenLinkFingerprint,
-    compatiblePackages = [
+    setAccessTokenFingerprint = SetAuthorizationHeaderFingerprint,
+    compatiblePackages = setOf(
         CompatiblePackage("com.laurencedawson.reddit_sync"),
         CompatiblePackage("com.laurencedawson.reddit_sync.pro"),
-        CompatiblePackage("com.laurencedawson.reddit_sync.dev")
+        CompatiblePackage("com.laurencedawson.reddit_sync.dev"),
-    ],
+    ),
-    requiresIntegrations = true
+    dependencies = setOf(IntegrationsPatch::class),
-)
-object FixSLinksPatch : BytecodePatch(
-    setOf(LinkHelperOpenLinkFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) =
+    override val integrationsClassDescriptor = "Lapp/revanced/integrations/syncforreddit/FixSLinksPatch;"
-        LinkHelperOpenLinkFingerprint.result?.mutableMethod?.addInstructions(
+
-            1,
+    override fun MethodFingerprintResult.patchNavigationHandler(context: BytecodeContext) {
-            """
+        mutableMethod.apply {
-                invoke-static { p3 }, Lapp/revanced/integrations/syncforreddit/FixSLinksPatch;->resolveSLink(Ljava/lang/String;)Ljava/lang/String;
+            val urlRegister = "p3"
-                move-result-object p3
+            val tempRegister = "v2"
-            """
+
-        ) ?: throw LinkHelperOpenLinkFingerprint.exception
+            addInstructionsWithLabels(
+                0,
+                """
+                    invoke-static { $urlRegister }, $integrationsClassDescriptor->$resolveSLinkMethod
+                    move-result $tempRegister
+                    if-eqz $tempRegister, :continue
+                    return $tempRegister
+                """,
+                ExternalLabel("continue", getInstruction(0)),
+            )
+        }
+    }
+
+    override fun MethodFingerprintResult.patchSetAccessToken(context: BytecodeContext) = mutableMethod.addInstruction(
+        0,
+        "invoke-static { p0 }, $integrationsClassDescriptor->$setAccessTokenMethod",
+    )
 }

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/slink/fingerprints/SetAuthorizationHeaderFingerprint.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.fix.slink.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object SetAuthorizationHeaderFingerprint : MethodFingerprint(
+    strings = listOf("Authorization", "bearer "),
+    returnType = "Ljava/util/HashMap;",
+    customFingerprint = { methodDef, _ -> methodDef.definingClass == "Lcom/laurencedawson/reddit_sync/singleton/a;" },
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/misc.integrations/IntegrationsPatch.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.misc.integrations
+
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch
+import app.revanced.patches.reddit.customclients.syncforreddit.misc.integrations.fingerprints.InitFingerprint
+
+@Patch(requiresIntegrations = true)
+object IntegrationsPatch : BaseIntegrationsPatch(
+    setOf(InitFingerprint)
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/misc.integrations/fingerprints/InitFingerprint.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.misc.integrations.fingerprints
+
+import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch.IntegrationsFingerprint
+
+internal object InitFingerprint : IntegrationsFingerprint(
+    customFingerprint = { methodDef, classDef ->
+        methodDef.name == "onCreate" && classDef.type == "Lcom/laurencedawson/reddit_sync/RedditApplication;"
+    },
+    insertIndexResolver = { 1 }, // Insert after call to super class.
+)

src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt

@@ -62,9 +62,12 @@ object CommentsPatch : ResourcePatch() {
             PreferenceScreen(
                 "revanced_comments_screen",
                 preferences = setOf(
-                    SwitchPreference("revanced_hide_preview_comment"),
+                    SwitchPreference("revanced_hide_comments_by_members_header"),
                     SwitchPreference("revanced_hide_comments_section"),
-                    SwitchPreference("revanced_hide_comment_timestamp_and_emoji_buttons")
+                    SwitchPreference("revanced_hide_comments_create_a_short_button"),
+                    SwitchPreference("revanced_hide_comments_preview_comment"),
+                    SwitchPreference("revanced_hide_comments_thanks_button"),
+                    SwitchPreference("revanced_hide_comments_timestamp_and_emoji_buttons")
                 ),
                 sorting = PreferenceScreen.Sorting.UNSORTED
             )

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

@@ -94,10 +94,9 @@ object HideLayoutComponentsPatch : BytecodePatch(
             PreferenceScreen(
                 key = "revanced_hide_description_components_screen",
                 preferences = setOf(
-                    SwitchPreference("revanced_hide_chapters"),
+                    SwitchPreference("revanced_hide_attributes_section"),
+                    SwitchPreference("revanced_hide_chapters_section"),
                     SwitchPreference("revanced_hide_info_cards_section"),
-                    SwitchPreference("revanced_hide_game_section"),
-                    SwitchPreference("revanced_hide_music_section"),
                     SwitchPreference("revanced_hide_podcast_section"),
                     SwitchPreference("revanced_hide_transcript_section"),
                 ),

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/UserAgentClientSpoofPatch.kt

@@ -8,11 +8,14 @@ import app.revanced.patches.all.misc.transformation.IMethodCall
 import app.revanced.patches.all.misc.transformation.Instruction35cInfo
 import app.revanced.patches.all.misc.transformation.filterMapInstruction35c
 import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstruction
+import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.ClassDef
 import com.android.tools.smali.dexlib2.iface.Method
 import com.android.tools.smali.dexlib2.iface.instruction.Instruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.iface.reference.StringReference
 
 object UserAgentClientSpoofPatch : BaseTransformInstructionsPatch<Instruction35cInfo>() {
     private const val ORIGINAL_PACKAGE_NAME = "com.google.android.youtube"
@@ -42,20 +45,31 @@ object UserAgentClientSpoofPatch : BaseTransformInstructionsPatch<Instruction35c
                     as? OneRegisterInstruction ?: return
                 ).registerA
 
-            // IndexOutOfBoundsException is not possible here,
+            // IndexOutOfBoundsException is possible here,
             // but no such occurrences are present in the app.
             val referee = getInstruction(instructionIndex + 2).getReference<MethodReference>()?.toString()
 
-            // This can technically also match non-user agent string builder append methods,
+            // Only replace string builder usage.
-            // but no such occurrences are present in the app.
             if (referee != USER_AGENT_STRING_BUILDER_APPEND_METHOD_REFERENCE) {
                 return
             }
 
+            // Do not change the package name in methods that use resources, or for methods that use GmsCore.
+            // Changing these package names will result in playback limitations,
+            // particularly Android VR background audio only playback.
+            val resourceOrGmsStringInstructionIndex = indexOfFirstInstruction {
+                val reference = getReference<StringReference>()
+                opcode == Opcode.CONST_STRING &&
+                        (reference?.string == "android.resource://" || reference?.string == "gcore_")
+            }
+            if (resourceOrGmsStringInstructionIndex >= 0) {
+                return
+            }
+
             // Overwrite the result of context.getPackageName() with the original package name.
             replaceInstruction(
                 instructionIndex + 1,
-                "const-string v$targetRegister, \"${ORIGINAL_PACKAGE_NAME}\"",
+                "const-string v$targetRegister, \"$ORIGINAL_PACKAGE_NAME\"",
             )
         }
     }

src/main/resources/addresources/values/strings.xml

@@ -198,22 +198,19 @@
             <string name="revanced_hide_chips_shelf_title">Hide chips shelf</string>
             <string name="revanced_hide_chips_shelf_summary_on">Chips shelf is hidden</string>
             <string name="revanced_hide_chips_shelf_summary_off">Chips shelf is shown</string>
+            <string name="revanced_hide_attributes_section_title">Hide attributes section</string>
+            <string name="revanced_hide_attributes_section_summary_on">\'Featured places\', Games and Music sections are hidden</string>
+            <string name="revanced_hide_attributes_section_summary_off">\'Featured places\', Games and Music sections are shown</string>
+            <string name="revanced_hide_chapters_section_title">Hide Chapters section</string>
+            <string name="revanced_hide_chapters_section_summary_on">Chapters section is hidden</string>
+            <string name="revanced_hide_chapters_section_summary_off">Chapters section is shown</string>
+            <string name="revanced_hide_podcast_section_title">Hide \'Explore the podcast\' section</string>
+            <string name="revanced_hide_podcast_section_summary_on">\'Explore the podcast\' section is hidden</string>
+            <string name="revanced_hide_podcast_section_summary_off">\'Explore the podcast\' section is shown</string>
             <string name="revanced_hide_info_cards_section_title">Hide info cards section</string>
             <string name="revanced_hide_info_cards_section_summary_on">Info cards section is hidden</string>
             <string name="revanced_hide_info_cards_section_summary_off">Info cards section is shown</string>
-            <string name="revanced_hide_chapters_title">Hide chapters</string>
+            <string name="revanced_hide_transcript_section_title">Hide Transcript section</string>
-            <string name="revanced_hide_chapters_summary_on">Chapters are hidden</string>
-            <string name="revanced_hide_chapters_summary_off">Chapters are shown</string>
-            <string name="revanced_hide_game_section_title">Hide game section</string>
-            <string name="revanced_hide_game_section_summary_on">Game section is hidden</string>
-            <string name="revanced_hide_game_section_summary_off">Game section is shown</string>
-            <string name="revanced_hide_music_section_title">Hide music section</string>
-            <string name="revanced_hide_music_section_summary_on">Music section is hidden</string>
-            <string name="revanced_hide_music_section_summary_off">Music section is shown</string>
-            <string name="revanced_hide_podcast_section_title">Hide podcast section</string>
-            <string name="revanced_hide_podcast_section_summary_on">Podcast section is hidden</string>
-            <string name="revanced_hide_podcast_section_summary_off">Podcast section is shown</string>
-            <string name="revanced_hide_transcript_section_title">Hide transcript section</string>
             <string name="revanced_hide_transcript_section_summary_on">Transcript section is hidden</string>
             <string name="revanced_hide_transcript_section_summary_off">Transcript section is shown</string>
             <string name="revanced_hide_description_components_screen_title">Video description</string>
@@ -502,15 +499,24 @@
         <patch id="layout.hide.comments.CommentsPatch">
             <string name="revanced_comments_screen_title">Comments</string>
             <string name="revanced_comments_screen_summary">Hide or show comments section components</string>
-            <string name="revanced_hide_preview_comment_title">Hide preview comment</string>
+            <string name="revanced_hide_comments_by_members_header_title">Hide \'Comments by members\' header</string>
-            <string name="revanced_hide_preview_comment_summary_on">Preview comment is hidden</string>
+            <string name="revanced_hide_comments_by_members_header_summary_on">\'Comments by members\' header is hidden</string>
-            <string name="revanced_hide_preview_comment_summary_off">Preview comment is shown</string>
+            <string name="revanced_hide_comments_by_members_header_summary_off">\'Comments by members\' header is shown</string>
             <string name="revanced_hide_comments_section_title">Hide comments section</string>
-            <string name="revanced_hide_comments_section_summary_on">Comment section is hidden</string>
+            <string name="revanced_hide_comments_section_summary_on">Comments section is hidden</string>
-            <string name="revanced_hide_comments_section_summary_off">Comment section is shown</string>
+            <string name="revanced_hide_comments_section_summary_off">Comments section is shown</string>
-            <string name="revanced_hide_comment_timestamp_and_emoji_buttons_title">Hide timestamp and emoji buttons</string>
+            <string name="revanced_hide_comments_create_a_short_button_title">Hide \'Create a Short\' button</string>
-            <string name="revanced_hide_comment_timestamp_and_emoji_buttons_summary_on">Comment timestamp and emoji buttons are hidden</string>
+            <string name="revanced_hide_comments_create_a_short_button_summary_on">\'Create a Short\' button is hidden</string>
-            <string name="revanced_hide_comment_timestamp_and_emoji_buttons_summary_off">Comment timestamp and emoji buttons are shown</string>
+            <string name="revanced_hide_comments_create_a_short_button_summary_off">\'Create a Short\' button is shown</string>
+            <string name="revanced_hide_comments_preview_comment_title">Hide preview comment</string>
+            <string name="revanced_hide_comments_preview_comment_summary_on">Preview comment is hidden</string>
+            <string name="revanced_hide_comments_preview_comment_summary_off">Preview comment is shown</string>
+            <string name="revanced_hide_comments_thanks_button_title">Hide thanks button</string>
+            <string name="revanced_hide_comments_thanks_button_summary_on">Thanks button is hidden</string>
+            <string name="revanced_hide_comments_thanks_button_summary_off">Thanks button is shown</string>
+            <string name="revanced_hide_comments_timestamp_and_emoji_buttons_title">Hide timestamp and emoji buttons</string>
+            <string name="revanced_hide_comments_timestamp_and_emoji_buttons_summary_on">Timestamp and emoji buttons are hidden</string>
+            <string name="revanced_hide_comments_timestamp_and_emoji_buttons_summary_off">Timestamp and emoji buttons are shown</string>
         </patch>
         <patch id="layout.hide.crowdfundingbox.CrowdfundingBoxResourcePatch">
             <string name="revanced_hide_crowdfunding_box_title">Hide crowdfunding box</string>