chore: Release v4.17.0-dev.7 [skip ci]

# [4.17.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.6...v4.17.0-dev.7) (2024-10-17)

### Bug Fixes

* **Twitter - Unlock downloads:** Make it work with latest versions ([#3782](https://github.com/ReVanced/revanced-patches/issues/3782)) ([773fd81](773fd81dfd))
* **YouTube - Spoof video streams:** Fix playback for Android VR by removing invalid body as well ([#3769](https://github.com/ReVanced/revanced-patches/issues/3769)) ([68b61b4](68b61b4725))

CHANGELOG.md

@@ -1,3 +1,46 @@
+# [4.17.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.6...v4.17.0-dev.7) (2024-10-17)
+
+
+### Bug Fixes
+
+* **Twitter - Unlock downloads:** Make it work with latest versions ([#3782](https://github.com/ReVanced/revanced-patches/issues/3782)) ([5189122](https://github.com/ReVanced/revanced-patches/commit/5189122006b0f72d5bfb50422021c3b0f3a9ae4a))
+* **YouTube - Spoof video streams:** Fix playback for Android VR by removing invalid body as well ([#3769](https://github.com/ReVanced/revanced-patches/issues/3769)) ([5150a15](https://github.com/ReVanced/revanced-patches/commit/5150a15ad4ca73a747f0a89f933db7f2d686ec2d))
+
+# [4.17.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.5...v4.17.0-dev.6) (2024-10-14)
+
+
+### Features
+
+* **YouTube - Hide Shorts components:** Add option to hide `Use template`, `Upcoming`, `Green screen` buttons ([#3752](https://github.com/ReVanced/revanced-patches/issues/3752)) ([f71c406](https://github.com/ReVanced/revanced-patches/commit/f71c4068bc646d02954b59fac4756f1419c55dbe))
+
+# [4.17.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.4...v4.17.0-dev.5) (2024-10-07)
+
+
+### Features
+
+* **Backdrops - Pro unlock:** Support latest versions by removing version constraint ([a62b506](https://github.com/ReVanced/revanced-patches/commit/a62b50691c49d1ce529a7c9c4e49da0d0dd46df2))
+
+# [4.17.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.3...v4.17.0-dev.4) (2024-10-06)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Adjust settings text ([#3745](https://github.com/ReVanced/revanced-patches/issues/3745)) ([13998bb](https://github.com/ReVanced/revanced-patches/commit/13998bbf95ac3cde8bf24754d60258d0ff9bc4f4))
+
+# [4.17.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.2...v4.17.0-dev.3) (2024-10-06)
+
+
+### Features
+
+* **YouTube - Hide layout components:** Add option to hide Yoodles (YouTube Doodles) ([#3743](https://github.com/ReVanced/revanced-patches/issues/3743)) ([b8c8916](https://github.com/ReVanced/revanced-patches/commit/b8c89164cf3911ac3842df9b0d2ec42b52213505))
+
+# [4.17.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.1...v4.17.0-dev.2) (2024-10-05)
+
+
+### Features
+
+* **Willhaben:** Add `Hide ads` patch ([#3740](https://github.com/ReVanced/revanced-patches/issues/3740)) ([1fe3a52](https://github.com/ReVanced/revanced-patches/commit/1fe3a523e99ccfe556d88800686e34ac6ed77b2c))
+
 # [4.17.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.16.1-dev.1...v4.17.0-dev.1) (2024-10-02)
 
 

api/revanced-patches.api

@@ -1520,6 +1520,12 @@ public final class app/revanced/patches/warnwetter/misc/promocode/PromoCodeUnloc
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/willhaben/ads/HideAdsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/willhaben/ads/HideAdsPatch;
+	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/windyapp/misc/unlockpro/UnlockProPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/windyapp/misc/unlockpro/UnlockProPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -2178,6 +2184,7 @@ public final class app/revanced/util/BytecodeUtilsKt {
 	public static final fun containsWideLiteralInstructionValue (Lcom/android/tools/smali/dexlib2/iface/Method;J)Z
 	public static final fun findMutableMethodOf (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;Lcom/android/tools/smali/dexlib2/iface/Method;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;
 	public static final fun findOpcodeIndicesReversed (Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/Opcode;)Ljava/util/List;
+	public static final fun findOpcodeIndicesReversed (Lcom/android/tools/smali/dexlib2/iface/Method;Lkotlin/jvm/functions/Function1;)Ljava/util/List;
 	public static final fun getException (Lapp/revanced/patcher/fingerprint/MethodFingerprint;)Lapp/revanced/patcher/patch/PatchException;
 	public static final fun indexOfFirstInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;ILkotlin/jvm/functions/Function1;)I
 	public static final fun indexOfFirstInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;Lkotlin/jvm/functions/Function1;)I

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.17.0-dev.1
+version = 4.17.0-dev.7

src/main/kotlin/app/revanced/patches/backdrops/misc/pro/ProUnlockPatch.kt

@@ -12,7 +12,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch(
     name = "Pro unlock",
-    compatiblePackages = [CompatiblePackage("com.backdrops.wallpapers", ["4.52"])]
+    compatiblePackages = [CompatiblePackage("com.backdrops.wallpapers")]
 )
 @Suppress("unused")
 object ProUnlockPatch : BytecodePatch(
@@ -34,4 +34,4 @@ object ProUnlockPatch : BytecodePatch(
 
         } ?: throw ProUnlockFingerprint.exception
     }
-}
+}

src/main/kotlin/app/revanced/patches/twitter/interaction/downloads/fingerprints/BuildMediaOptionsSheetFingerprint.kt

@@ -10,5 +10,5 @@ internal object BuildMediaOptionsSheetFingerprint : MethodFingerprint(
         Opcode.GOTO_16,
         Opcode.NEW_INSTANCE,
     ),
-    strings = listOf("resources.getString(R.string.post_video)"),
+    strings = listOf("mediaEntity", "media_options_sheet"),
 )

src/main/kotlin/app/revanced/patches/twitter/interaction/downloads/fingerprints/ShowDownloadVideoUpsellBottomSheetFingerprint.kt

@@ -5,6 +5,6 @@ import com.android.tools.smali.dexlib2.Opcode
 
 internal object ShowDownloadVideoUpsellBottomSheetFingerprint : MethodFingerprint(
     returnType = "Z",
-    strings = listOf("variantToDownload.url"),
+    strings = listOf("mediaEntity", "url"),
     opcodes = listOf(Opcode.IF_EQZ)
 )

src/main/kotlin/app/revanced/patches/willhaben/ads/HideAdsPatch.kt

@@ -0,0 +1,28 @@
+package app.revanced.patches.willhaben.ads
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.willhaben.ads.fingerprints.AdResolverFingerprint
+import app.revanced.patches.willhaben.ads.fingerprints.WHAdViewInjectorFingerprint
+import app.revanced.util.returnEarly
+
+@Patch(
+    name = "Hide ads",
+    description = "Hides all in-app ads.",
+    compatiblePackages = [CompatiblePackage("at.willhaben")]
+)
+@Suppress("unused")
+object HideAdsPatch : BytecodePatch(
+    fingerprints = setOf(
+        AdResolverFingerprint,
+        WHAdViewInjectorFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext) {
+        arrayOf(AdResolverFingerprint, WHAdViewInjectorFingerprint).forEach {
+            it.returnEarly()
+        }
+    }
+}

src/main/kotlin/app/revanced/patches/willhaben/ads/fingerprints/AdResolverFingerprint.kt

@@ -0,0 +1,17 @@
+package app.revanced.patches.willhaben.ads.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object AdResolverFingerprint : MethodFingerprint(
+    "L",
+    parameters = listOf("L", "L"),
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    strings = listOf(
+        "Google Ad is invalid ",
+        "Google Native Ad is invalid ",
+        "Criteo Ad is invalid ",
+        "Amazon Ad is invalid "
+    )
+)

src/main/kotlin/app/revanced/patches/willhaben/ads/fingerprints/WHAdViewInjectorFingerprint.kt

@@ -0,0 +1,15 @@
+package app.revanced.patches.willhaben.ads.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object WHAdViewInjectorFingerprint : MethodFingerprint(
+    "V",
+    parameters = listOf("L", "L", "L", "Z"),
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    strings = listOf("successfulAdView"),
+    customFingerprint = { _, classDef ->
+        classDef.type == "Lat/willhaben/advertising/WHAdView;"
+    }
+)

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

@@ -18,13 +18,18 @@ import app.revanced.patches.youtube.layout.hide.general.fingerprints.HideShowMor
 import app.revanced.patches.youtube.layout.hide.general.fingerprints.ParseElementFromBufferFingerprint
 import app.revanced.patches.youtube.layout.hide.general.fingerprints.PlayerOverlayFingerprint
 import app.revanced.patches.youtube.layout.hide.general.fingerprints.ShowWatermarkFingerprint
+import app.revanced.patches.youtube.layout.hide.general.fingerprints.YoodlesImageViewFingerprint
 import app.revanced.patches.youtube.misc.litho.filter.LithoFilterPatch
 import app.revanced.patches.youtube.misc.navigation.NavigationBarHookPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
+import app.revanced.util.findOpcodeIndicesReversed
+import app.revanced.util.getReference
 import app.revanced.util.resultOrThrow
 import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
 @Patch(
     name = "Hide layout components",
@@ -70,7 +75,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 )
 @Suppress("unused")
 object HideLayoutComponentsPatch : BytecodePatch(
-    setOf(ParseElementFromBufferFingerprint, PlayerOverlayFingerprint, HideShowMoreButtonFingerprint),
+    setOf(
+        ParseElementFromBufferFingerprint,
+        PlayerOverlayFingerprint,
+        HideShowMoreButtonFingerprint,
+        YoodlesImageViewFingerprint,
+    ),
 ) {
     private const val LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR =
         "Lapp/revanced/integrations/youtube/patches/components/LayoutComponentsFilter;"
@@ -128,6 +138,7 @@ object HideLayoutComponentsPatch : BytecodePatch(
             SwitchPreference("revanced_hide_search_result_recommendations"),
             SwitchPreference("revanced_hide_search_result_shelf_header"),
             SwitchPreference("revanced_hide_show_more_button"),
+            SwitchPreference("revanced_hide_doodles"),
             PreferenceScreen(
                 key = "revanced_hide_keyword_content_screen",
                 sorting = Sorting.UNSORTED,
@@ -226,5 +237,28 @@ object HideLayoutComponentsPatch : BytecodePatch(
         }
 
         // endregion
+
+        // region 'Yoodles'
+
+        YoodlesImageViewFingerprint.resultOrThrow().mutableMethod.apply {
+            findOpcodeIndicesReversed{
+                opcode == Opcode.INVOKE_VIRTUAL
+                        && getReference<MethodReference>()?.name == "setImageDrawable"
+            }.forEach { insertIndex ->
+                val register = getInstruction<FiveRegisterInstruction>(insertIndex).registerD
+
+                addInstructionsWithLabels(
+                    insertIndex,
+                    """
+                        invoke-static { v$register }, $LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR->hideYoodles(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+                        move-result-object v$register
+                        if-eqz v$register, :hide
+                    """,
+                    ExternalLabel("hide", getInstruction(insertIndex + 1)),
+                )
+            }
+        }
+
+        // endregion
     }
 }

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

@@ -17,10 +17,17 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
 internal object HideLayoutComponentsResourcePatch : ResourcePatch() {
     internal var expandButtonDownId: Long = -1
 
+    var youTubeLogo = -1L
+
     override fun execute(context: ResourceContext) {
         expandButtonDownId = ResourceMappingPatch[
             "layout",
             "expand_button_down",
         ]
+
+        youTubeLogo = ResourceMappingPatch[
+            "id",
+            "youtube_logo"
+        ]
     }
 }

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

@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.hide.general.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patches.youtube.layout.hide.general.HideLayoutComponentsResourcePatch
+import app.revanced.util.patch.LiteralValueFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object YoodlesImageViewFingerprint : LiteralValueFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("L", "L"),
+    returnType = "Landroid/view/View;",
+    literalSupplier = { HideLayoutComponentsResourcePatch.youTubeLogo }
+)

src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt

@@ -42,6 +42,9 @@ object HideShortsComponentsResourcePatch : ResourcePatch() {
             SwitchPreference("revanced_hide_shorts_subscribe_button"),
             SwitchPreference("revanced_hide_shorts_paused_overlay_buttons"),
             SwitchPreference("revanced_hide_shorts_save_sound_button"),
+            SwitchPreference("revanced_hide_shorts_use_template_button"),
+            SwitchPreference("revanced_hide_shorts_upcoming_button"),
+            SwitchPreference("revanced_hide_shorts_green_screen_button"),
             SwitchPreference("revanced_hide_shorts_shop_button"),
             SwitchPreference("revanced_hide_shorts_tagged_products"),
             SwitchPreference("revanced_hide_shorts_stickers"),

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

@@ -254,7 +254,9 @@ object SpoofVideoStreamsPatch : BytecodePatch(
         // endregion
 
         // region Remove /videoplayback request body to fix playback.
-        // This is needed when using iOS client as streaming data source.
+        // It is assumed, YouTube makes a request with a body tuned for Android.
+        // Requesting streams intended for other platforms with a body tuned for Android could be the cause of 400 errors.
+        // A proper fix may include modifying the request body to match the platforms expected body.
 
         BuildMediaDataSourceFingerprint.resultOrThrow().let {
             it.mutableMethod.apply {

src/main/kotlin/app/revanced/util/BytecodeUtils.kt

@@ -224,18 +224,25 @@ fun Method.indexOfFirstInstructionOrThrow(startIndex: Int = 0, predicate: Instru
 /**
  * @return The list of indices of the opcode in reverse order.
  */
-fun Method.findOpcodeIndicesReversed(opcode: Opcode): List<Int> {
+fun Method.findOpcodeIndicesReversed(opcode: Opcode): List<Int> =
+    findOpcodeIndicesReversed { this.opcode == opcode }
+
+/**
+ * @return The list of indices of the opcode in reverse order.
+ */
+fun Method.findOpcodeIndicesReversed(filter: Instruction.() -> Boolean): List<Int> {
     val indexes = implementation!!.instructions
         .withIndex()
-        .filter { (_, instruction) -> instruction.opcode == opcode }
+        .filter { (_, instruction) -> filter(instruction) }
         .map { (index, _) -> index }
         .reversed()
 
-    if (indexes.isEmpty()) throw PatchException("No ${opcode.name} instructions found in: $this")
+    if (indexes.isEmpty()) throw PatchException("No matching instructions found in: $this")
 
     return indexes
 }
 
+
 /**
  * Return the resolved method early.
  */

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

@@ -231,6 +231,13 @@ This is because Crowdin requires temporarily flattening this file and removing t
             <string name="revanced_hide_transcript_section_summary_off">Transcript section is shown</string>
             <string name="revanced_hide_description_components_screen_title">Video description</string>
             <string name="revanced_hide_description_components_screen_summary">Hide or show video description components</string>
+
+            <!-- https://logos.fandom.com/wiki/YouTube/Yoodles -->
+            <string name="revanced_hide_doodles_title">Hide YouTube Doodles</string>
+            <string name="revanced_hide_doodles_summary_on">Search bar Doodles are hidden</string>
+            <string name="revanced_hide_doodles_summary_off">Search bar Doodles are shown</string>
+            <string name="revanced_hide_doodles_user_dialog_message">YouTube Doodles show up a few days each year.\n\nIf a Doodle is currently showing in your region and this hide setting is on, then the filter bar below the search bar will also be hidden.</string>
+
             <string name="revanced_custom_filter_screen_title">Custom filter</string>
             <string name="revanced_custom_filter_screen_summary">Hide components using custom filters</string>
             <string name="revanced_custom_filter_title">Enable custom filter</string>
@@ -240,6 +247,7 @@ This is because Crowdin requires temporarily flattening this file and removing t
             <!-- 'Component path builder strings' is the technical name for identifying the Litho UI layout items to hide. This is an advanced feature and most users will never use this. -->
             <string name="revanced_custom_filter_strings_summary">List of component path builder strings to filter separated by new line</string>
             <string name="revanced_custom_filter_toast_invalid_syntax">Invalid custom filter: %s</string>
+
             <string name="revanced_hide_keyword_content_screen_title">Hide keyword content</string>
             <string name="revanced_hide_keyword_content_screen_summary">Hide search and feed videos using keyword filters</string>
             <string name="revanced_hide_keyword_content_home_title">Hide home videos by keywords</string>
@@ -629,8 +637,17 @@ This is because Crowdin requires temporarily flattening this file and removing t
             <string name="revanced_hide_shorts_location_label_summary_on">Location label is hidden</string>
             <string name="revanced_hide_shorts_location_label_summary_off">Location label is shown</string>
             <string name="revanced_hide_shorts_save_sound_button_title">Hide save music button</string>
-            <string name="revanced_hide_shorts_save_sound_button_summary_on">Save music is hidden</string>
-            <string name="revanced_hide_shorts_save_sound_button_summary_off">Save music is shown</string>
+            <string name="revanced_hide_shorts_save_sound_button_summary_on">Save music button is hidden</string>
+            <string name="revanced_hide_shorts_save_sound_button_summary_off">Save music button is shown</string>
+            <string name="revanced_hide_shorts_use_template_button_title">Hide use template button</string>
+            <string name="revanced_hide_shorts_use_template_button_summary_on">Use template button is hidden</string>
+            <string name="revanced_hide_shorts_use_template_button_summary_off">Use template button is shown</string>
+            <string name="revanced_hide_shorts_upcoming_button_title">Hide upcoming button</string>
+            <string name="revanced_hide_shorts_upcoming_button_summary_on">Upcoming button is hidden</string>
+            <string name="revanced_hide_shorts_upcoming_button_summary_off">Upcoming button is shown</string>
+            <string name="revanced_hide_shorts_green_screen_button_title">Hide green screen button</string>
+            <string name="revanced_hide_shorts_green_screen_button_summary_on">Green screen button is hidden</string>
+            <string name="revanced_hide_shorts_green_screen_button_summary_off">Green screen button is shown</string>
             <string name="revanced_hide_shorts_search_suggestions_title">Hide search suggestions</string>
             <string name="revanced_hide_shorts_search_suggestions_summary_on">Search suggestions are hidden</string>
             <string name="revanced_hide_shorts_search_suggestions_summary_off">Search suggestions are shown</string>