chore(release): 2.187.0-dev.8 [skip ci]

# [2.187.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v2.187.0-dev.7...v2.187.0-dev.8) (2023-07-30)

### Bug Fixes

* **Sync for Reddit - Change OAuth client id:** Disable piracy detection ([d442aca](d442acaac8))

### Features

* **Joey for Reddit:** Add `Change OAuth client id` patch ([a00eab6](a00eab6744))
* **Joey for Reddit:** Add `Disable ads` patch ([e7b2bfb](e7b2bfbde3))

CHANGELOG.md

@@ -1,3 +1,23 @@
+# [2.187.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v2.187.0-dev.7...v2.187.0-dev.8) (2023-07-30)
+
+
+### Bug Fixes
+
+* **Sync for Reddit - Change OAuth client id:** Disable piracy detection ([cd103dd](https://github.com/ReVanced/revanced-patches/commit/cd103dd9b8ff2667246d4abaf75577f28bf1a11b))
+
+
+### Features
+
+* **Joey for Reddit:** Add `Change OAuth client id` patch ([1bac47d](https://github.com/ReVanced/revanced-patches/commit/1bac47df889b5221bef1c03e652f894be8d39385))
+* **Joey for Reddit:** Add `Disable ads` patch ([ad7e147](https://github.com/ReVanced/revanced-patches/commit/ad7e14771208dcab08fd6dc29403b1a4cf602111))
+
+# [2.187.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v2.187.0-dev.6...v2.187.0-dev.7) (2023-07-30)
+
+
+### Features
+
+* **YouTube:** add `Player Flyout Menu` patch ([#2295](https://github.com/ReVanced/revanced-patches/issues/2295)) ([aea0af0](https://github.com/ReVanced/revanced-patches/commit/aea0af059784ae4820a0e73ff91f97bbc3ebc4c7))
+
 # [2.187.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v2.187.0-dev.5...v2.187.0-dev.6) (2023-07-30)
 
 # [2.187.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v2.187.0-dev.4...v2.187.0-dev.5) (2023-07-28)

gradle.properties

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

src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/ads/fingerprints/IsAdFreeUserFingerprint.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.reddit.customclients.joeyforreddit.ads.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object IsAdFreeUserFingerprint : MethodFingerprint(
+    returnType = "Z",
+    accessFlags = AccessFlags.PUBLIC.value,
+    strings = listOf("AD_FREE_USER")
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/ads/patch/DisableAdsPatch.kt

@@ -0,0 +1,33 @@
+package app.revanced.patches.reddit.customclients.joeyforreddit.ads.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Package
+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.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.reddit.customclients.joeyforreddit.ads.fingerprints.IsAdFreeUserFingerprint
+import app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.patch.DisablePiracyDetectionPatch
+
+@Patch
+@Name("Disable ads")
+@DependsOn([DisablePiracyDetectionPatch::class])
+@Compatibility([Package("o.o.joey")])
+class DisableAdsPatch : BytecodePatch(listOf(IsAdFreeUserFingerprint)) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        IsAdFreeUserFingerprint.result?.mutableMethod?.addInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        ) ?: return IsAdFreeUserFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
+    }
+}

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

@@ -0,0 +1,20 @@
+package app.revanced.patches.reddit.customclients.joeyforreddit.api.fingerprints
+
+import app.revanced.patcher.extensions.or
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object GetClientIdFingerprint : MethodFingerprint(
+    returnType = "L",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    opcodes = listOf(
+        Opcode.CONST,               // R.string.valuable_cid
+        Opcode.INVOKE_STATIC,       // StringMaster.decrypt
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.RETURN_OBJECT
+    ),
+    customFingerprint = custom@{ _, classDef ->
+        classDef.sourceFile == "AuthUtility.java"
+    }
+)

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

@@ -0,0 +1,47 @@
+package app.revanced.patches.reddit.customclients.joeyforreddit.api.patch
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Package
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
+import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
+import app.revanced.patches.reddit.customclients.joeyforreddit.api.fingerprints.GetClientIdFingerprint
+import app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.patch.DisablePiracyDetectionPatch
+
+@ChangeOAuthClientIdPatchAnnotation
+@Description(
+    "Changes the OAuth client ID. " +
+            "The OAuth application type has to be \"Installed app\" " +
+            "and the redirect URI has to be set to \"https://127.0.0.1:65023/authorize_callback\"."
+)
+@Compatibility(
+    [
+        Package("o.o.joey"),
+        Package("o.o.joey.pro"),
+        Package("o.o.joey.dev")
+    ]
+)
+@DependsOn([DisablePiracyDetectionPatch::class])
+class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(
+    "https://127.0.0.1:65023/authorize_callback", Options, listOf(GetClientIdFingerprint)
+) {
+    override fun List<MethodFingerprintResult>.patch(context: BytecodeContext): PatchResult {
+        first().mutableMethod.addInstructions(
+            0,
+            """
+                const-string v0, "$clientId"
+                return-object v0
+            """
+        )
+
+        return PatchResultSuccess()
+    }
+
+    companion object Options : AbstractChangeOAuthClientIdPatch.Options.ChangeOAuthClientIdOptionsContainer()
+}

src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/fingerprints/PiracyDetectionFingerprint.kt

@@ -0,0 +1,22 @@
+package app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object PiracyDetectionFingerprint : MethodFingerprint(
+    returnType = "V",
+    accessFlags = AccessFlags.PRIVATE or AccessFlags.STATIC,
+    opcodes = listOf(
+        Opcode.NEW_INSTANCE,    // new PiracyDetectionRunnable()
+        Opcode.CONST_16,
+        Opcode.CONST_WIDE_16,
+        Opcode.INVOKE_DIRECT,   // <init>(..)
+        Opcode.INVOKE_VIRTUAL,  // run()
+        Opcode.RETURN_VOID
+    ),
+    customFingerprint = custom@{ _, classDef ->
+        classDef.type.endsWith("ProcessLifeCyleListener;")
+    }
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt

@@ -0,0 +1,22 @@
+package app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.patch
+
+import app.revanced.extensions.toErrorResult
+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.patches.reddit.customclients.joeyforreddit.detection.piracy.fingerprints.PiracyDetectionFingerprint
+
+class DisablePiracyDetectionPatch : BytecodePatch(listOf(PiracyDetectionFingerprint)) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        PiracyDetectionFingerprint.result?.mutableMethod?.addInstruction(
+            0,
+            """
+                return-void
+            """
+        ) ?: return PiracyDetectionFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
+    }
+}

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

@@ -15,7 +15,6 @@ import app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.
 @Patch
 @Name("Disable ads")
 @DependsOn([DisablePiracyDetectionPatch::class])
-@Description("Disables ads.")
 @Compatibility([Package("com.laurencedawson.reddit_sync")])
 class DisableAdsPatch : BytecodePatch(listOf(IsAdsEnabledFingerprint)) {
     override fun execute(context: BytecodeContext): PatchResult {

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

@@ -12,10 +12,12 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
 import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
 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.detection.piracy.patch.DisablePiracyDetectionPatch
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.reference.StringReference
@@ -32,6 +34,7 @@ import java.util.*
         Package("com.laurencedawson.reddit_sync.dev")
     ]
 )
+@DependsOn([DisablePiracyDetectionPatch::class])
 class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(
     "http://redditsync/auth", Options, listOf(GetAuthorizationStringFingerprint)
 ) {

src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/annotations/HidePlayerFlyoutMenuItemsCompatibility.kt

@@ -1,8 +1,8 @@
-package app.revanced.patches.youtube.layout.hide.watchinvr.annotations
+package app.revanced.patches.youtube.layout.hide.player.flyoutmenupanel.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
 @Target(AnnotationTarget.CLASS)
-internal annotation class WatchInVRCompatibility
+internal annotation class HidePlayerFlyoutMenuItemsCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/patch/HidePlayerFlyoutMenuPatch.kt

@@ -0,0 +1,106 @@
+package app.revanced.patches.youtube.layout.hide.player.flyoutmenupanel.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+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.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+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.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.hide.player.flyoutmenupanel.annotations.HidePlayerFlyoutMenuItemsCompatibility
+import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+
+@Patch
+@Name("Player flyout menu")
+@Description("Hides player flyout menu items.")
+@DependsOn([LithoFilterPatch::class, SettingsPatch::class])
+@HidePlayerFlyoutMenuItemsCompatibility
+class HidePlayerFlyoutMenuPatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            PreferenceScreen(
+                KEY,
+                StringResource("${KEY}_title", "Player flyout menu items"),
+                listOf(
+                    SwitchPreference(
+                        "${KEY}_quality",
+                        StringResource("${KEY}_quality_title", "Hide Quality menu"),
+                        StringResource("${KEY}_quality_on", "Quality menu item is hidden"),
+                        StringResource("${KEY}_quality_off", "Quality menu item is shown")
+                    ),
+                    SwitchPreference(
+                        "${KEY}_captions",
+                        StringResource("${KEY}_captions_title", "Hide Captions menu"),
+                        StringResource("${KEY}_captions_on", "Captions menu item is hidden"),
+                        StringResource("${KEY}_captions_off", "Captions menu item is shown")
+                    ),
+                    SwitchPreference(
+                        "${KEY}_loop_video",
+                        StringResource("${KEY}_loop_video_title", "Hide Loop video menu"),
+                        StringResource("${KEY}_loop_video_on", "Loop video menu item is hidden"),
+                        StringResource("${KEY}_loop_video_off", "Loop video menu item is shown")
+                    ),
+                    SwitchPreference(
+                        "${KEY}_ambient_mode",
+                        StringResource("${KEY}_ambient_mode_title", "Hide Ambient mode menu"),
+                        StringResource("${KEY}_ambient_mode_on", "Ambient mode menu item is hidden"),
+                        StringResource("${KEY}_ambient_mode_off", "Ambient mode menu item is shown")
+                    ),
+                    SwitchPreference(
+                        "${KEY}_report",
+                        StringResource("${KEY}_report_title", "Hide Report menu"),
+                        StringResource("${KEY}_report_on", "Report menu item is hidden"),
+                        StringResource("${KEY}_report_off", "Report menu item is shown")
+                    ),
+                    SwitchPreference(
+                        "${KEY}_help",
+                        StringResource("${KEY}_help_title", "Hide Help menu"),
+                        StringResource("${KEY}_help_on", "Help menu item is hidden"),
+                        StringResource("${KEY}_help_off", "Help menu item is shown")
+                    ),
+                    SwitchPreference(
+                        "${KEY}_speed",
+                        StringResource("${KEY}_speed_title", "Hide Speed menu"),
+                        StringResource("${KEY}_speed_on", "Speed menu item is hidden"),
+                        StringResource("${KEY}_speed_off", "Speed menu item is shown")
+                    ),
+                    SwitchPreference(
+                        "${KEY}_more_info",
+                        StringResource("${KEY}_more_info_title", "Hide More info menu"),
+                        StringResource("${KEY}_more_info_on", "More info menu item is hidden"),
+                        StringResource("${KEY}_more_info_off", "More info menu item is shown")
+                    ),
+                    SwitchPreference(
+                        "${KEY}_audio_track",
+                        StringResource("${KEY}_audio_track_title", "Hide Audio track menu"),
+                        StringResource("${KEY}_audio_track_on", "Audio track menu item is hidden"),
+                        StringResource("${KEY}_audio_track_off", "Audio track menu item is shown")
+                    ),
+                    SwitchPreference(
+                        "${KEY}_watch_in_vr",
+                        StringResource("${KEY}_watch_in_vr_title", "Hide Watch in VR menu"),
+                        StringResource("${KEY}_watch_in_vr_on", "Watch in VR menu item is hidden"),
+                        StringResource("${KEY}_watch_in_vr_off", "Watch in VR menu item is shown")
+                    ),
+                ),
+                StringResource("${KEY}_summary", "Manage the visibility of player flyout menu items")
+            )
+        )
+
+        LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
+
+        return PatchResultSuccess()
+    }
+
+    private companion object {
+        const val KEY = "revanced_hide_player_flyout"
+
+        const val FILTER_CLASS_DESCRIPTOR =
+            "Lapp/revanced/integrations/patches/components/PlayerFlyoutMenuItemsFilter;"
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/hide/watchinvr/fingerprints/WatchInVRFingerprint.kt

@@ -1,10 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.watchinvr.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object WatchInVRFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"),
-    strings = listOf("menu_item_cardboard_vr")
-)

src/main/kotlin/app/revanced/patches/youtube/layout/hide/watchinvr/patch/WatchInVRPatch.kt

@@ -1,53 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.watchinvr.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-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.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.hide.watchinvr.annotations.WatchInVRCompatibility
-import app.revanced.patches.youtube.layout.hide.watchinvr.fingerprints.WatchInVRFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Hide watch in VR")
-@Description("Hides the option to watch in VR from the player settings flyout panel.")
-@WatchInVRCompatibility
-class WatchInVRPatch : BytecodePatch(
-    listOf(
-        WatchInVRFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_watch_in_vr",
-                StringResource("revanced_hide_watch_in_vr_title", "Hide VR setting"),
-                StringResource("revanced_hide_watch_in_vr_summary_on", "VR setting is hidden"),
-                StringResource("revanced_hide_watch_in_vr_summary_off", "VR setting is shown")
-            )
-        )
-
-        WatchInVRFingerprint.result!!.mutableMethod.addInstructionsWithLabels(
-            0,
-            """
-                    invoke-static {}, Lapp/revanced/integrations/patches/HideWatchInVRPatch;->hideWatchInVR()Z
-                    move-result v0
-                    if-eqz v0, :shown
-                    return-void
-                    :shown
-                    nop
-                """
-        )
-
-        return PatchResultSuccess()
-    }
-}