chore(release): 2.79.2 [skip ci]

## [2.79.2](https://github.com/revanced/revanced-patches/compare/v2.79.1...v2.79.2) (2022-10-04) ### Bug Fixes * **youtube/disable-startup-shorts-player:** don't affect functionality of navigation bar ([#716](https://github.com/revanced/revanced-patches/issues/716)) ([f344603](9381508678))
fix(youtube/disable-startup-shorts-player): don't affect functionality of navigation bar (#716 )
2026-01-12 22:17:41 +00:00 · 2022-10-04 05:44:44 +00:00 · 2022-10-04 07:43:01 +02:00 · 2022-10-03 23:42:37 +00:00 · 2022-10-04 01:40:11 +02:00 · 2022-10-03 11:42:13 +00:00
13 changed files with 238 additions and 270 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,52 @@
+## [2.79.2](https://github.com/revanced/revanced-patches/compare/v2.79.1...v2.79.2) (2022-10-04)
+
+
+### Bug Fixes
+
+* **youtube/disable-startup-shorts-player:** don't affect functionality of navigation bar  ([#716](https://github.com/revanced/revanced-patches/issues/716)) ([05f5cc1](https://github.com/revanced/revanced-patches/commit/05f5cc17e3fcbf255c6fe5b503c9fd20c218f5a1))
+
+## [2.79.1](https://github.com/revanced/revanced-patches/compare/v2.79.0...v2.79.1) (2022-10-03)
+
+
+### Bug Fixes
+
+* **youtube/disable-startup-shorts-player:** do not prevent playing videos on startup ([#714](https://github.com/revanced/revanced-patches/issues/714)) ([9a0d379](https://github.com/revanced/revanced-patches/commit/9a0d3798afd75bba5c63e1b8803dc25814586be9))
+
+# [2.79.0](https://github.com/revanced/revanced-patches/compare/v2.78.0...v2.79.0) (2022-10-03)
+
+
+### Features
+
+* `hide-video-buttons` patch ([584803a](https://github.com/revanced/revanced-patches/commit/584803aa900f94de1b2b2a0c41fb0884fa9270d3))
+
+# [2.78.0](https://github.com/revanced/revanced-patches/compare/v2.77.1...v2.78.0) (2022-10-02)
+
+
+### Features
+
+* **youtube/general-ads:** check for ad in identifier ([fd0506e](https://github.com/revanced/revanced-patches/commit/fd0506eb95dbf398eb7d6bfa8732f517b9867545))
+
+## [2.77.1](https://github.com/revanced/revanced-patches/compare/v2.77.0...v2.77.1) (2022-10-01)
+
+
+### Bug Fixes
+
+* **tiktok/tiktok-downloads:** add missing patch dependencies ([#686](https://github.com/revanced/revanced-patches/issues/686)) ([5c3b4ed](https://github.com/revanced/revanced-patches/commit/5c3b4ed0530e89d50db3b5bb9893e1ef4b463bae))
+
+# [2.77.0](https://github.com/revanced/revanced-patches/compare/v2.76.3...v2.77.0) (2022-10-01)
+
+
+### Features
+
+* **youtube/hdr-auto-brightness:** increase strength of fingerprint ([2379b58](https://github.com/revanced/revanced-patches/commit/2379b5892b3505c8780f475bbc56f520613fa31d))
+
+## [2.76.3](https://github.com/revanced/revanced-patches/compare/v2.76.2...v2.76.3) (2022-10-01)
+
+
+### Performance Improvements
+
+* **general-ads:** hook pathBuilder ([b9bad0b](https://github.com/revanced/revanced-patches/commit/b9bad0bb922bbd44ddf2acbfae87243beb28851a))
+
 ## [2.76.2](https://github.com/revanced/revanced-patches/compare/v2.76.1...v2.76.2) (2022-09-30)


--- a/README.md
+++ b/README.md
@@ -125,6 +125,7 @@ The official Patch bundle provided by ReVanced and the community.
 | `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
 | `hide-create-button` | Hides the create button in the navigation bar. | 17.36.37 |
 | `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.36.37 |
+| `hide-video-buttons` | Adds options to hide action buttons under a video. | 17.36.37 |
 | `theme` | Applies a custom theme. | all |
 | `hide-email-address` | Hides the email address in the account switcher. | 17.36.37 |
 | `sponsorblock` | Integrate SponsorBlock. | 17.36.37 |
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.76.2
+version = 2.79.2
--- a/patches.json
+++ b/patches.json
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt
@@ -12,6 +12,7 @@ import app.revanced.patcher.extensions.replaceInstructions
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -20,13 +21,16 @@ import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonS
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint2
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint3
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.DownloadPathParentFingerprint
+import app.revanced.patches.tiktok.misc.integrations.patch.TikTokIntegrationsPatch
 import app.revanced.patches.tiktok.misc.settings.fingerprints.SettingsStatusLoadFingerprint
+import app.revanced.patches.tiktok.misc.settings.patch.TikTokSettingsPatch
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.reference.StringReference

@Patch
+@DependsOn([TikTokIntegrationsPatch::class, TikTokSettingsPatch::class])
@Name("tiktok-download")
@Description("Removes download restrictions and changes the default path to download to.")
@DownloadsCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/extensions/MethodExtensions.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/extensions/MethodExtensions.kt
@@ -1,12 +1,8 @@
 package app.revanced.patches.youtube.ad.general.bytecode.extensions

-import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.softCompareTo
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import org.jf.dexlib2.builder.BuilderInstruction
-import org.jf.dexlib2.builder.MutableMethodImplementation
 import org.jf.dexlib2.iface.Method
 import org.jf.dexlib2.iface.instruction.Instruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
@@ -16,21 +12,6 @@ import org.jf.dexlib2.iface.reference.Reference
 import org.jf.dexlib2.immutable.reference.ImmutableMethodReference

 internal object MethodExtensions {
-    internal fun MutableMethodImplementation.insertBlocks(
-        startIndex: Int,
-        vararg blocks: List<BuilderInstruction>,
-    ) {
-        blocks.reversed().forEach {
-            this.addInstructions(
-                startIndex, it
-            )
-        }
-    }
-
-    internal fun MutableClass.addMethod(mutableMethod: MutableMethod) {
-        this.methods.add(mutableMethod)
-    }
-
    internal fun MutableClass.findMutableMethodOf(
        method: Method
    ) = this.methods.first {
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralBytecodeAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralBytecodeAdsPatch.kt
@@ -6,6 +6,9 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -14,23 +17,18 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patcher.util.smali.toInstructions
+import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
-import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.addMethod
 import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.findMutableMethodOf
-import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.insertBlocks
 import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.toDescriptor
-import app.revanced.patches.youtube.ad.general.bytecode.utils.MethodUtils.createMutableMethod
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
 import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.MutableMethodImplementation
-import org.jf.dexlib2.builder.instruction.*
-import org.jf.dexlib2.iface.MethodImplementation
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.builder.instruction.BuilderInstruction10x
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.formats.Instruction21c
 import org.jf.dexlib2.iface.instruction.formats.Instruction22c
 import org.jf.dexlib2.iface.instruction.formats.Instruction31i
@@ -38,7 +36,6 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 import org.jf.dexlib2.iface.reference.FieldReference
 import org.jf.dexlib2.iface.reference.MethodReference
 import org.jf.dexlib2.iface.reference.StringReference
-import org.jf.dexlib2.immutable.reference.ImmutableMethodReference

@Patch
@DependsOn([ResourceMappingResourcePatch::class, IntegrationsPatch::class, SettingsPatch::class])
@@ -170,13 +167,6 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                StringResource("revanced_adremover_paid_content_enabled_summary_on", "Paid content is hidden"),
                StringResource("revanced_adremover_paid_content_enabled_summary_off", "Paid content is shown")
            ),
-            SwitchPreference(
-                "revanced_adremover_suggested",
-                StringResource("revanced_adremover_suggested_enabled_title", "Remove personal suggestions"),
-                true,
-                StringResource("revanced_adremover_suggested_enabled_summary_on", "Personal suggestions are hidden"),
-                StringResource("revanced_adremover_suggested_enabled_summary_off", "Personal suggestions are shown")
-            ),
            SwitchPreference(
                "revanced_adremover_hide_suggestions",
                StringResource("revanced_adremover_hide_suggestions_enabled_title", "Hide suggestions"),
@@ -329,72 +319,54 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                                }

                                stringReferences[2] -> { // Litho ads
-                                    // create proxied method.
                                    val proxy = data.proxy(classDef)
                                    val proxiedClass = proxy.resolve()

-                                    // add getIsEmpty method
-                                    proxiedClass.addGetIsEmptyMethod()
-
-                                    // get required method to patch and get references from
                                    val lithoMethod = getLithoMethod(proxiedClass)
-                                        ?: return PatchResultError("Could not find required litho method to patch.")
-                                    val lithoMethodImplementation = lithoMethod.implementation!!
+                                        ?: return PatchResultError("Could not find required Litho method to patch.")

-                                    // create and add getTemplateName method
-                                    val getTemplateMethod =
-                                        proxiedClass.createGetTemplateNameMethod(lithoMethodImplementation)
-                                    proxiedClass.addMethod(getTemplateMethod)
+                                    val instructionWithNeededDescriptor =
+                                        lithoMethod.implementation!!.instructions.indexOfFirst {
+                                            it.opcode == Opcode.INVOKE_STATIC_RANGE
+                                        }

-                                    val lithoInstructions = lithoMethodImplementation.instructions
-                                    val thisType = proxiedClass.type
-                                    val templateNameParameterType = getTemplateMethod.parameterTypes.first()
+                                    // get required descriptors
+                                    val createEmptyComponentDescriptor =
+                                        lithoMethod.instruction(instructionWithNeededDescriptor)
+                                            .toDescriptor<MethodReference>()
+                                    val emptyComponentFieldDescriptor =
+                                        lithoMethod.instruction(instructionWithNeededDescriptor + 2)
+                                            .toDescriptor<FieldReference>()

-                                    // get reference descriptors
-                                    val indexOfReference1 = lithoInstructions.indexOfFirst {
-                                        it.opcode == Opcode.INVOKE_STATIC_RANGE
-                                    }
-                                    val descriptor1 =
-                                        lithoInstructions.elementAt(indexOfReference1).toDescriptor<MethodReference>()
-                                    val descriptor2 = lithoInstructions.elementAt(indexOfReference1 + 2)
-                                        .toDescriptor<FieldReference>()
+                                    val pathBuilderAnchorFingerprint = object : MethodFingerprint(
+                                        opcodes = listOf(
+                                            Opcode.CONST_16,
+                                            Opcode.INVOKE_VIRTUAL,
+                                            Opcode.IPUT_OBJECT
+                                        )
+                                    ) {}

-                                    // create label
-                                    val lithoRemoveLabel = lithoMethodImplementation.newLabelForIndex(0)
+                                    val pathBuilderScanResult = pathBuilderAnchorFingerprint.also {
+                                        it.resolve(data, lithoMethod, classDef)
+                                    }.result!!.scanResult.patternScanResult!!

-                                    // create branch instructions
-                                    val ifEqzFirstInstruction =
-                                        BuilderInstruction21t(Opcode.IF_EQZ, 0, lithoRemoveLabel)
-                                    val ifEqzSecondInstruction =
-                                        BuilderInstruction21t(Opcode.IF_EQZ, 1, lithoRemoveLabel)
+                                    val clobberedRegister =
+                                        (lithoMethod.instruction(pathBuilderScanResult.startIndex) as OneRegisterInstruction).registerA

-                                    // create blocks
-                                    val block1 = """
-                                        invoke-static/range {p3}, $thisType->getTemplateName($templateNameParameterType)Ljava/lang/String;
-                                        move-result-object v0
-                                    """.toInstructions(lithoMethod)
-                                    val block2 = """
-                                        move-object/from16 v1, p3
-                                        iget-object v2, v1, $templateNameParameterType->b:Ljava/nio/ByteBuffer;
-                                        invoke-static {v0, v2}, Lapp/revanced/integrations/patches/GeneralBytecodeAdsPatch;->containsAd(Ljava/lang/String;Ljava/nio/ByteBuffer;)Z
-                                        move-result v1
-                                    """.toInstructions(lithoMethod)
-                                    val block3 = """
-                                        move-object/from16 v2, p1
-                                        invoke-static {v2}, $descriptor1
-                                        move-result-object v0
-                                        iget-object v0, v0, $descriptor2
-                                        return-object v0
-                                    """.toInstructions(lithoMethod)
-
-                                    // insert blocks and branch instructions
-                                    lithoMethodImplementation.insertBlocks(
-                                        0,
-                                        block1,
-                                        listOf(ifEqzFirstInstruction),
-                                        block2,
-                                        listOf(ifEqzSecondInstruction),
-                                        block3,
+                                    val insertIndex = pathBuilderScanResult.endIndex + 1
+                                    lithoMethod.addInstructions(
+                                        insertIndex, // right after setting the component.pathBuilder field,
+                                        """
+                                                invoke-static {v5, v2}, Lapp/revanced/integrations/patches/LithoFilterPatch;->filter(Ljava/lang/StringBuilder;Ljava/lang/String;)Z
+                                                move-result v$clobberedRegister
+                                                if-eqz v$clobberedRegister, :not_an_ad
+                                                move-object/from16 v2, p1
+                                                invoke-static {v2}, $createEmptyComponentDescriptor
+                                                move-result-object v0
+                                                iget-object v0, v0, $emptyComponentFieldDescriptor
+                                                return-object v0
+                                            """,
+                                        listOf(ExternalLabel("not_an_ad", lithoMethod.instruction(insertIndex)))
                                    )
                                }
                            }
@@ -414,142 +386,4 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
            instruction.opcode == Opcode.CONST && (instruction as Instruction31i).narrowLiteral == lithoConstant
        } ?: false
    }
-
-    private fun MutableClass.addGetIsEmptyMethod() {
-        val getIsEmptyImplementation = MutableMethodImplementation(1)
-
-        // create target instructions
-        val firstTargetInstruction = BuilderInstruction11n(Opcode.CONST_4, 0, 1)
-        val secondTargetInstruction = BuilderInstruction11n(Opcode.CONST_4, 0, 0)
-
-        // add instructions to the instruction list
-        getIsEmptyImplementation.addInstructions(
-            0, listOf(
-                // BuilderInstruction21t(Opcode.IF_EQZ, 0, first),
-                BuilderInstruction35c(
-                    Opcode.INVOKE_VIRTUAL,
-                    1,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    ImmutableMethodReference("Ljava/lang/String;", "isEmpty", null, "Z")
-                ),
-                BuilderInstruction11x(Opcode.MOVE_RESULT, 0),
-                // BuilderInstruction21t(Opcode.IF_EQZ, 0, second),
-                // BuilderInstruction10t(Opcode.GOTO, first),
-                secondTargetInstruction,
-                BuilderInstruction11x(Opcode.RETURN, 0),
-                firstTargetInstruction,
-                BuilderInstruction11x(Opcode.RETURN, 0),
-            )
-        )
-
-        val getIsEmptyInstructions = getIsEmptyImplementation.instructions
-
-        // create labels for the target instructions
-        val firstLabel =
-            getIsEmptyImplementation.newLabelForIndex(getIsEmptyInstructions.indexOf(firstTargetInstruction))
-        val secondLabel =
-            getIsEmptyImplementation.newLabelForIndex(getIsEmptyInstructions.indexOf(secondTargetInstruction))
-
-        // create branch instructions to the labels
-        val ifEqzFirstInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 0, firstLabel)
-        val ifEqzSecondInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 0, secondLabel)
-        val gotoInstruction = BuilderInstruction10t(Opcode.GOTO, firstLabel)
-
-        // insert remaining branch instructions, order of adding those instructions is important
-        getIsEmptyImplementation.addInstructions(
-            2, listOf(
-                ifEqzSecondInstruction, gotoInstruction
-            )
-        )
-        getIsEmptyImplementation.addInstruction(
-            0, ifEqzFirstInstruction
-        )
-
-        this.addMethod(
-            createMutableMethod(
-                this.type, "getIsEmpty", "Z", "Ljava/lang/String;", getIsEmptyImplementation
-            )
-        )
-    }
-
-    private fun MutableClass.createGetTemplateNameMethod(lithoMethodImplementation: MethodImplementation): MutableMethod {
-        var counter = 1
-        val descriptors = buildList {
-            for (instruction in lithoMethodImplementation.instructions) {
-                if (instruction !is ReferenceInstruction) continue
-                if (counter++ > 4) break
-
-                add(instruction.toDescriptor<MethodReference>())
-            }
-        }
-
-        val getTemplateNameImplementation = MutableMethodImplementation(2)
-
-        // create code blocks
-        val block1 = """
-            invoke-virtual {p0}, ${descriptors[0]}
-            move-result-object p0
-            const v0, $lithoConstant
-            invoke-static {p0, v0}, ${descriptors[1]}
-            move-result-object p0
-        """.toInstructions()
-        val block2 = """
-              invoke-static {p0}, ${descriptors[2]}
-              move-result-object p0
-              invoke-virtual {p0}, ${descriptors[3]}
-              move-result-object v0
-              invoke-static {v0}, ${this.type}->getIsEmpty(Ljava/lang/String;)Z
-              move-result v0
-        """.toInstructions()
-        val block3 = """
-              invoke-virtual {p0}, ${descriptors[3]}
-              move-result-object p0
-              return-object p0
-        """.toInstructions()
-
-        // create target instruction
-        val targetInstruction = BuilderInstruction11n(Opcode.CONST_4, 1, 0)
-        // and remaining instruction
-        val returnInstruction = BuilderInstruction11x(Opcode.RETURN_OBJECT, 1)
-
-        // insert blocks and instructions
-        getTemplateNameImplementation.insertBlocks(
-            0,
-            block1,
-            block2,
-            block3,
-            listOf(
-                targetInstruction, returnInstruction
-            ),
-        )
-
-        // create label for target instruction
-        val targetInstructionLabel =
-            getTemplateNameImplementation.newLabelForIndex(getTemplateNameImplementation.instructions.size - 2)
-
-        // create branch instructions to the label
-        val ifEqzInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 1, targetInstructionLabel)
-        val ifNezInstruction = BuilderInstruction21t(Opcode.IF_NEZ, 0, targetInstructionLabel)
-
-        // insert branch instructions
-        getTemplateNameImplementation.addInstruction(
-            block1.size, ifEqzInstruction
-        )
-        getTemplateNameImplementation.addInstruction(
-            block1.size + block2.size + 1, ifNezInstruction
-        )
-
-        // create the method
-        return createMutableMethod(
-            this.type,
-            "getTemplateName",
-            "Ljava/lang/String;",
-            descriptors[0].split("->")[0], // a bit weird to get the type this way,
-            getTemplateNameImplementation
-        )
-    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/annotations/HideButtonsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/annotations/HideButtonsCompatibility.kt
@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.buttons.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class HideButtonsCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/patch/HideButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/patch/HideButtonsPatch.kt
@@ -0,0 +1,81 @@
+package app.revanced.patches.youtube.layout.buttons.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.ResourceData
+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.patcher.patch.impl.ResourcePatch
+import app.revanced.patches.youtube.ad.general.bytecode.patch.GeneralBytecodeAdsPatch
+import app.revanced.patches.youtube.layout.buttons.annotations.HideButtonsCompatibility
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.PreferenceScreen
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+
+@Patch
+@DependsOn([ResourceMappingResourcePatch::class, GeneralBytecodeAdsPatch::class])
+@Name("hide-video-buttons")
+@Description("Adds options to hide action buttons under a video.")
+@HideButtonsCompatibility
+@Version("0.0.1")
+class HideButtonsPatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            PreferenceScreen(
+                "revanced_hide_buttons",
+                StringResource("revanced_hide_buttons_title", "Hide action buttons"),
+                listOf(
+                    SwitchPreference(
+                        "revanced_like_button",
+                        StringResource("revanced_like_button_title", "Hide like button"),
+                        false,
+                        StringResource("revanced_like_button_on", "Like button is hidden"),
+                        StringResource("revanced_like_button_off", "Like button is shown")
+                    ),
+                    SwitchPreference(
+                        "revanced_dislike_button",
+                        StringResource("revanced_dislike_button_title", "Hide dislike button"),
+                        false,
+                        StringResource("revanced_dislike_button_on", "Dislike button is hidden"),
+                        StringResource("revanced_dislike_button_off", "Dislike button is shown")
+                    ),
+                    SwitchPreference(
+                        "revanced_download_button",
+                        StringResource("revanced_download_button_title", "Hide download button"),
+                        false,
+                        StringResource("revanced_download_button_on", "Download button is hidden"),
+                        StringResource("revanced_download_button_off", "Download button is shown")
+                    ),
+                    SwitchPreference(
+                        "revanced_playlist_button",
+                        StringResource("revanced_playlist_button_title", "Hide playlist button"),
+                        false,
+                        StringResource("revanced_playlist_button_on", "Playlist button is hidden"),
+                        StringResource("revanced_playlist_button_off", "Playlist button is shown")
+                    ),
+                    SwitchPreference(
+                        "revanced_action_button",
+                        StringResource("revanced_action_button_title", "Hide create, clip and thanks buttons"),
+                        true,
+                        StringResource("revanced_action_button_on", "Buttons are hidden"),
+                        StringResource("revanced_action_button_off", "Buttons are shown")
+                    ),
+                    SwitchPreference(
+                        "revanced_share_button",
+                        StringResource("revanced_share_button_title", "Hide share button"),
+                        false,
+                        StringResource("revanced_share_button_on", "Share button is hidden"),
+                        StringResource("revanced_share_button_off", "Share button is shown")
+                    ),
+                ),
+                StringResource("revanced_hide_buttons_summary", "Hide or show buttons under videos")
+            )
+        )
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/fingerprints/ActionOpenShortsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/fingerprints/ActionOpenShortsFingerprint.kt
@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.layout.startupshortsreset.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.startupshortsreset.annotations.StartupShortsResetCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("action-open-shorts-fingerprint")
-@MatchingMethod("Lkyt;", "l")
-@StartupShortsResetCompatibility
-@Version("0.0.1")
-object ActionOpenShortsFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"),
-    strings = listOf("com.google.android.youtube.action.open.shorts"),
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/fingerprints/UserWasInShortsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/fingerprints/UserWasInShortsFingerprint.kt
@@ -0,0 +1,31 @@
+package app.revanced.patches.youtube.layout.startupshortsreset.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.startupshortsreset.annotations.StartupShortsResetCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("user-was-in-shorts-fingerprint")
+@MatchingMethod("Lkzb;", "e")
+@FuzzyPatternScanMethod(3)
+@StartupShortsResetCompatibility
+@Version("0.0.1")
+object UserWasInShortsFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"),
+    opcodes = listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT,
+    ),
+    strings = listOf("Failed to read user_was_in_shorts proto after successful warmup"),
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/patch/DisableShortsOnStartupPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/patch/DisableShortsOnStartupPatch.kt
@@ -11,14 +11,12 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.layout.startupshortsreset.annotations.StartupShortsResetCompatibility
-import app.revanced.patches.youtube.layout.startupshortsreset.fingerprints.ActionOpenShortsFingerprint
+import app.revanced.patches.youtube.layout.startupshortsreset.fingerprints.UserWasInShortsFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
-import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction

@Patch
@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
@@ -28,7 +26,7 @@ import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
@Version("0.0.1")
 class DisableShortsOnStartupPatch : BytecodePatch(
    listOf(
-        ActionOpenShortsFingerprint
+        UserWasInShortsFingerprint
    )
 ) {
    override fun execute(data: BytecodeData): PatchResult {
@@ -42,23 +40,17 @@ class DisableShortsOnStartupPatch : BytecodePatch(
            )
        )

-        val actionOpenShortsResult = ActionOpenShortsFingerprint.result
-        val actionOpenShortsMethod = actionOpenShortsResult!!.mutableMethod
-        val actionOpenShortsInstructions = actionOpenShortsMethod.implementation!!.instructions
+        val userWasInShortsResult = UserWasInShortsFingerprint.result!!
+        val userWasInShortsMethod = userWasInShortsResult.mutableMethod
+        val moveResultIndex = userWasInShortsResult.scanResult.patternScanResult!!.endIndex

-        val moveResultIndex = actionOpenShortsResult.scanResult.stringsScanResult!!.matches.first().index + 4
-        val iPutBooleanIndex = moveResultIndex + 2
-
-        val moveResultRegister = (actionOpenShortsInstructions[moveResultIndex] as OneRegisterInstruction).registerA
-        val iPutBooleanRegister = (actionOpenShortsInstructions[iPutBooleanIndex] as TwoRegisterInstruction).registerA
-
-        actionOpenShortsMethod.addInstructions(
+        userWasInShortsMethod.addInstructions(
            moveResultIndex + 1, """
            invoke-static { }, Lapp/revanced/integrations/patches/DisableStartupShortsPlayerPatch;->disableStartupShortsPlayer()Z
-            move-result v$moveResultRegister
-            if-eqz v$moveResultRegister, :cond_startup_shorts_reset
-            const/4 v$iPutBooleanRegister, 0x0
-            :cond_startup_shorts_reset
+            move-result v5
+            if-eqz v5, :disable_shorts_player
+            return-void
+            :disable_shorts_player
            nop
        """
        )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprint.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.hdrbrightness.annotations.HDRBrightnessCompatibility
-import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

@Name("hdr-brightness-fingerprint")
@MatchingMethod(
@@ -14,6 +14,7 @@ import org.jf.dexlib2.AccessFlags
@HDRBrightnessCompatibility
@Version("0.0.1")
 object HDRBrightnessFingerprint : MethodFingerprint(
-    "V", AccessFlags.FINAL.value,
+    "V",
+    opcodes = listOf(Opcode.CMPL_FLOAT),
    strings = listOf("c.SettingNotFound;", "screen_brightness", "android.mediaview"),
 )
Author	SHA1	Message	Date
semantic-release-bot	c26de68a27	chore(release): 2.79.2 [skip ci] ## [2.79.2](https://github.com/revanced/revanced-patches/compare/v2.79.1...v2.79.2) (2022-10-04) ### Bug Fixes * youtube/disable-startup-shorts-player: don't affect functionality of navigation bar ([#716](https://github.com/revanced/revanced-patches/issues/716)) ([`f344603`](`9381508678`))	2022-10-04 05:44:44 +00:00
OxrxL	9381508678	fix(youtube/disable-startup-shorts-player): don't affect functionality of navigation bar (#716 )	2022-10-04 07:43:01 +02:00
semantic-release-bot	6d9c743618	chore(release): 2.79.1 [skip ci] ## [2.79.1](https://github.com/revanced/revanced-patches/compare/v2.79.0...v2.79.1) (2022-10-03) ### Bug Fixes * youtube/disable-startup-shorts-player: do not prevent playing videos on startup ([#714](https://github.com/revanced/revanced-patches/issues/714)) ([`5711cd8`](`6c9986290b`))	2022-10-03 23:42:37 +00:00
OxrxL	6c9986290b	fix(youtube/disable-startup-shorts-player): do not prevent playing videos on startup (#714 )	2022-10-04 01:40:11 +02:00
semantic-release-bot	adc7f670d1	chore(release): 2.79.0 [skip ci] # [2.79.0](https://github.com/revanced/revanced-patches/compare/v2.78.0...v2.79.0) (2022-10-03) ### Features * `hide-video-buttons` patch ([`39da5b7`](`1e54bc457f`))	2022-10-03 11:42:13 +00:00
oSumAtrIX	fdc34023fc	refactor(youtube/general-ads): abstract integrations code	2022-10-03 13:38:07 +02:00
oSumAtrIX	1e54bc457f	feat: `hide-video-buttons` patch	2022-10-03 13:37:30 +02:00
semantic-release-bot	9552100878	chore(release): 2.78.0 [skip ci] # [2.78.0](https://github.com/revanced/revanced-patches/compare/v2.77.1...v2.78.0) (2022-10-02) ### Features * youtube/general-ads: check for ad in identifier ([`fe6f3bd`](`9166024b01`))	2022-10-02 23:26:59 +00:00
oSumAtrIX	9166024b01	feat(youtube/general-ads): check for ad in identifier	2022-10-03 01:25:08 +02:00
semantic-release-bot	acc0f5018c	chore(release): 2.77.1 [skip ci] ## [2.77.1](https://github.com/revanced/revanced-patches/compare/v2.77.0...v2.77.1) (2022-10-01) ### Bug Fixes * tiktok/tiktok-downloads: add missing patch dependencies ([#686](https://github.com/revanced/revanced-patches/issues/686)) ([`2b6bbba`](`05c043ada3`))	2022-10-01 04:30:50 +00:00
d4rkk3y	05c043ada3	fix(tiktok/tiktok-downloads): add missing patch dependencies (#686 )	2022-10-01 06:28:40 +02:00
semantic-release-bot	e30967bedd	chore(release): 2.77.0 [skip ci] # [2.77.0](https://github.com/revanced/revanced-patches/compare/v2.76.3...v2.77.0) (2022-10-01) ### Features * youtube/hdr-auto-brightness: increase strength of fingerprint ([`91e2f88`](`40d56f6e59`))	2022-10-01 03:22:03 +00:00
oSumAtrIX	40d56f6e59	feat(youtube/hdr-auto-brightness): increase strength of fingerprint	2022-10-01 05:19:00 +02:00
semantic-release-bot	8bdfe8b74f	chore(release): 2.76.3 [skip ci] ## [2.76.3](https://github.com/revanced/revanced-patches/compare/v2.76.2...v2.76.3) (2022-10-01) ### Performance Improvements * general-ads: hook pathBuilder ([`ebe922d`](`c7c9440a60`))	2022-10-01 02:01:13 +00:00
oSumAtrIX	c7c9440a60	perf(general-ads): hook pathBuilder	2022-10-01 03:58:19 +02:00