chore(release): 2.171.0-dev.4 [skip ci]

# [2.171.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.171.0-dev.3...v2.171.0-dev.4) (2023-04-27) ### Bug Fixes * **youtube/minimized-playback:** disable minimized playback for shorts ([#1990](https://github.com/revanced/revanced-patches/issues/1990)) ([16f1998](16f1998ba3))
fix(youtube/minimized-playback): disable minimized playback for shorts (#1990 )
2026-01-13 06:27:41 +00:00 · 2023-04-27 13:41:17 +00:00 · 2023-04-27 17:39:05 +04:00 · 2023-04-26 08:33:22 +00:00 · 2023-04-26 12:31:39 +04:00
8 changed files with 84 additions and 134 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# [2.171.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.171.0-dev.3...v2.171.0-dev.4) (2023-04-27)
+
+
+### Bug Fixes
+
+* **youtube/minimized-playback:** disable minimized playback for shorts ([#1990](https://github.com/revanced/revanced-patches/issues/1990)) ([b91d18d](https://github.com/revanced/revanced-patches/commit/b91d18d24f332a9aa8721dc053e395d352b5796d))
+
+# [2.171.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.171.0-dev.2...v2.171.0-dev.3) (2023-04-26)
+
+
+### Features
+
+* **youtube/sponsorblock:** automatically hide skip button ([#1956](https://github.com/revanced/revanced-patches/issues/1956)) ([c3c8ae6](https://github.com/revanced/revanced-patches/commit/c3c8ae6b4377b12838971cedc32779e12c07363c))
+
 # [2.171.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.171.0-dev.1...v2.171.0-dev.2) (2023-04-25)


--- a/README.md
+++ b/README.md
@@ -306,14 +306,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-prime` | Unlocks Nova Prime and all functions of the app. | all |
 </details>

-### [📦 `ginlemon.iconpackstudio`](https://play.google.com/store/apps/details?id=ginlemon.iconpackstudio)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all pro features. | all |
-</details>
-
 ### [📦 `co.windyapp.android`](https://play.google.com/store/apps/details?id=co.windyapp.android)
 <details>

@@ -322,14 +314,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-pro` | Unlocks all pro features. | all |
 </details>

-### [📦 `com.ithebk.expensemanager`](https://play.google.com/store/apps/details?id=com.ithebk.expensemanager)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks pro features. | all |
-</details>
-
 ### [📦 `org.totschnig.myexpenses`](https://play.google.com/store/apps/details?id=org.totschnig.myexpenses)
 <details>

@@ -346,6 +330,22 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-pro` | Unlocks pro features. | 4.6364 |
 </details>

+### [📦 `com.ithebk.expensemanager`](https://play.google.com/store/apps/details?id=com.ithebk.expensemanager)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks pro features. | all |
+</details>
+
+### [📦 `ginlemon.iconpackstudio`](https://play.google.com/store/apps/details?id=ginlemon.iconpackstudio)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all pro features. | all |
+</details>
+
 ### [📦 `com.awedea.nyx`](https://play.google.com/store/apps/details?id=com.awedea.nyx)
 <details>

--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.171.0-dev.2
+version = 2.171.0-dev.4
--- a/patches.json
+++ b/patches.json
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/KidsMinimizedPlaybackPolicyControllerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/KidsMinimizedPlaybackPolicyControllerFingerprint.kt
@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.misc.minimizedplayback.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 KidsMinimizedPlaybackPolicyControllerFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("I", "L", "L"),
-    listOf(
-        Opcode.IF_EQZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IF_NE,
-        Opcode.CONST_4,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IF_EQZ,
-        Opcode.IGET,
-        Opcode.INVOKE_STATIC
-    ),
-    customFingerprint = { it.definingClass.endsWith("MinimizedPlaybackPolicyController;") }
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/PipControllerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/PipControllerFingerprint.kt
@@ -1,16 +0,0 @@
-package app.revanced.patches.youtube.misc.minimizedplayback.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 PipControllerFingerprint : MethodFingerprint(
-    returnType = "L",
-    access = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("L"),
-    opcodes = listOf(
-        Opcode.IGET_BOOLEAN
-    ),
-    customFingerprint = { it.definingClass.endsWith("DefaultPipController;") }
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt
@@ -7,28 +7,23 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.instruction
 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.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.shared.settings.preference.impl.NonInteractivePreference
 import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.minimizedplayback.annotations.MinimizedPlaybackCompatibility
-import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.KidsMinimizedPlaybackPolicyControllerFingerprint
 import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
 import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackSettingsFingerprint
-import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.PipControllerFingerprint
 import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
 import org.jf.dexlib2.iface.reference.MethodReference

-
@Patch
@Name("minimized-playback")
@Description("Enables minimized and background playback.")
@@ -37,75 +32,47 @@ import org.jf.dexlib2.iface.reference.MethodReference
@Version("0.0.1")
 class MinimizedPlaybackPatch : BytecodePatch(
    listOf(
-        KidsMinimizedPlaybackPolicyControllerFingerprint,
        MinimizedPlaybackManagerFingerprint,
-        MinimizedPlaybackSettingsFingerprint,
-        PipControllerFingerprint
+        MinimizedPlaybackSettingsFingerprint
    )
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
+        // TODO: remove this empty preference sometime after mid 2023
        SettingsPatch.PreferenceScreen.MISC.addPreferences(
-            SwitchPreference(
-                "revanced_enable_minimized_playback",
-                StringResource("revanced_minimized_playback_enabled_title", "Enable minimized playback"),
-                true,
-                StringResource("revanced_minimized_playback_summary_on", "Minimized playback is enabled"),
-                StringResource("revanced_minimized_playback_summary_off", "Minimized playback is disabled")
+            NonInteractivePreference(
+                StringResource("revanced_minimized_playback_enabled_title", "Minimized playback"),
+                StringResource("revanced_minimized_playback_summary_on", "This setting can be found in Settings -> General")
            )
        )

        MinimizedPlaybackManagerFingerprint.result?.apply {
            mutableMethod.addInstructions(
                0, """
-                invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->isMinimizedPlaybackEnabled()Z
+                invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->playbackIsNotShort()Z
                move-result v0
                return v0
                """
            )
        } ?: return MinimizedPlaybackManagerFingerprint.toErrorResult()

-        val method = MinimizedPlaybackSettingsFingerprint.result!!.mutableMethod
-        val booleanCalls = method.implementation!!.instructions.withIndex()
-            .filter { ((it.value as? ReferenceInstruction)?.reference as? MethodReference)?.returnType == "Z" }
+        // Enable minimized playback option in YouTube settings
+        MinimizedPlaybackSettingsFingerprint.result?.apply {
+            val booleanCalls = method.implementation!!.instructions.withIndex()
+                .filter { ((it.value as? ReferenceInstruction)?.reference as? MethodReference)?.returnType == "Z" }

-        val settingsBooleanIndex = booleanCalls.elementAt(1).index
-        val settingsBooleanMethod =
-            context.toMethodWalker(method).nextMethod(settingsBooleanIndex, true).getMethod() as MutableMethod
+            val settingsBooleanIndex = booleanCalls.elementAt(1).index
+            val settingsBooleanMethod =
+                context.toMethodWalker(method).nextMethod(settingsBooleanIndex, true).getMethod() as MutableMethod

-        settingsBooleanMethod.addInstructions(
-            0, """
-                invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->isMinimizedPlaybackEnabled()Z
+            settingsBooleanMethod.addInstructions(
+                0, """
+                invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->overrideMinimizedPlaybackAvailable()Z
                move-result v0
                return v0
                """
-        )
-
-        KidsMinimizedPlaybackPolicyControllerFingerprint.result?.apply {
-            mutableMethod.addInstructions(
-                0, """
-                invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->isMinimizedPlaybackEnabled()Z
-                move-result v0
-                if-eqz v0, :enable
-                return-void
-                :enable
-                nop
-                """
            )
-        } ?: return KidsMinimizedPlaybackPolicyControllerFingerprint.toErrorResult()
+        } ?: return MinimizedPlaybackSettingsFingerprint.toErrorResult()

-        PipControllerFingerprint.result?.apply {
-            val insertIndex = scanResult.patternScanResult!!.endIndex + 1
-            val pipEnabledRegister = (mutableMethod.instruction(insertIndex - 1) as TwoRegisterInstruction).registerA
-
-            mutableMethod.addInstructions(
-                insertIndex,
-                """
-                    invoke-static {v$pipEnabledRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->isNotPlayingShorts(Z)Z
-                    move-result v$pipEnabledRegister
-                """
-            )
-
-        } ?: return PipControllerFingerprint.toErrorResult()
        return PatchResultSuccess()
    }

--- a/src/main/resources/sponsorblock/host/values/strings.xml
+++ b/src/main/resources/sponsorblock/host/values/strings.xml
@@ -2,42 +2,59 @@
 <resources>
    <string name="sb_enable_sb">Enable SponsorBlock</string>
    <string name="sb_enable_sb_sum">SponsorBlock is a crowd-sourced system for skipping annoying parts of YouTube videos</string>
+
+    <string name="sb_appearance_category">Appearance</string>
    <string name="sb_enable_voting">Show voting button</string>
    <string name="sb_enable_voting_sum_on">Segment voting button is shown</string>
    <string name="sb_enable_voting_sum_off">Segment voting button is not shown</string>
-    <string name="sb_enable_create_segment">Show create new segment button</string>
-    <string name="sb_enable_create_segment_sum_on">Create new segment button is shown</string>
-    <string name="sb_enable_create_segment_sum_off">Create new segment button is not shown</string>
    <string name="sb_enable_compact_skip_button">Use compact skip button</string>
    <string name="sb_enable_compact_skip_button_sum_on">Skip button styled for minimum width</string>
    <string name="sb_enable_compact_skip_button_sum_off">Skip button styled for best appearance</string>
-    <string name="sb_diff_segments">What to do with different segments</string>
-    <string name="sb_general">General</string>
-    <string name="sb_general_skiptoast">Show a toast when skipping segment automatically</string>
+    <string name="sb_enable_auto_hide_skip_segment_button">Automatically hide skip button</string>
+    <string name="sb_enable_auto_hide_skip_segment_button_sum_on">Skip button hides after a few seconds</string>
+    <string name="sb_enable_auto_hide_skip_segment_button_sum_off">Skip button displayed for entire segment</string>
+    <string name="sb_general_skiptoast">Show a toast when skipping automatically</string>
    <string name="sb_general_skiptoast_sum_on">Toast shown when a segment is automatically skipped. Tap here to see an example</string>
    <string name="sb_general_skiptoast_sum_off">Toast not shown. Tap here to see an example</string>
-    <string name="sb_general_skipcount">Enable skip count tracking</string>
-    <string name="sb_general_skipcount_sum_on">Lets the SponsorBlock leaderboard know how much time is saved. A message is sent to the leaderboard each time a segment is skipped</string>
-    <string name="sb_general_skipcount_sum_off">Skip count tracking is not enabled</string>
    <string name="sb_general_time_without">Show video length without segments</string>
    <string name="sb_general_time_without_sum_on">Video length minus all segments, shown in parentheses next to the full video length</string>
    <string name="sb_general_time_without_sum_off">Full video length shown</string>
+
+    <string name="sb_create_segment_category">Creating new segments</string>
+    <string name="sb_enable_create_segment">Show create new segment button</string>
+    <string name="sb_enable_create_segment_sum_on">Create new segment button is shown</string>
+    <string name="sb_enable_create_segment_sum_off">Create new segment button is not shown</string>
    <string name="sb_general_adjusting">Adjust new segment step</string>
    <string name="sb_general_adjusting_sum">Number of milliseconds the time adjustment buttons move when creating new segments</string>
    <string name="sb_general_adjusting_invalid">Value must be a positive number</string>
+    <string name="sb_guidelines_preference_title">View guidelines</string>
+    <string name="sb_guidelines_preference_sum">Guidelines contain rules and tips for creating new segments</string>
+    <string name="sb_guidelines_popup_title">Follow the guidelines</string>
+    <string name="sb_guidelines_popup_content">Read the SponsorBlock guidelines before creating new segments</string>
+    <string name="sb_guidelines_popup_already_read">Already read</string>
+    <string name="sb_guidelines_popup_open">Show me</string>
+
+    <string name="sb_general">General</string>
+    <string name="sb_general_skipcount">Enable skip count tracking</string>
+    <string name="sb_general_skipcount_sum_on">Lets the SponsorBlock leaderboard know how much time is saved. A message is sent to the leaderboard each time a segment is skipped</string>
+    <string name="sb_general_skipcount_sum_off">Skip count tracking is not enabled</string>
    <string name="sb_general_min_duration">Minimum segment duration</string>
    <string name="sb_general_min_duration_sum">Segments shorter than this value (in seconds) will not be shown or skipped</string>
    <string name="sb_general_uuid">Your private user id</string>
    <string name="sb_general_uuid_sum">This should be kept private. This is like a password and should not be shared with anyone. If someone has this, they can impersonate you</string>
    <string name="sb_general_uuid_invalid">User id cannot be blank</string>
+    <string name="sb_general_api_url">Change API URL</string>
+    <string name="sb_general_api_url_sum">The address SponsorBlock uses to make calls to the server. Do not change this unless you know what you\'re doing</string>
+    <string name="sb_api_url_reset">API URL reset</string>
+    <string name="sb_api_url_invalid">API URL is invalid</string>
+    <string name="sb_api_url_changed">API URL changed</string>
    <string name="sb_settings_ie">Import/Export settings</string>
    <string name="sb_settings_ie_sum">Your SponsorBlock JSON configuration that can be imported/exported to ReVanced and other SponsorBlock platforms. This includes your private user id. Be sure to share this wisely</string>
-    <string name="sb_general_api_url">Change API URL</string>
-    <string name="sb_general_api_url_sum">The address SponsorBlock uses to make calls to the server. &lt;b>Don\'t change this unless you know what you\'re doing&lt;/b></string>
    <string name="sb_settings_import_successful">Settings imported successfully</string>
    <string name="sb_settings_import_failed">Failed to import: %s</string>
    <string name="sb_settings_export_failed">Failed to export settings (try clearing app data)</string>

+    <string name="sb_diff_segments">Change segment behavior</string>
    <string name="sb_segments_sponsor">Sponsor</string>
    <string name="sb_segments_sponsor_sum">Paid promotion, paid referrals and direct advertisements. Not for self-promotion or free shout-outs to causes/creators/websites/products they like</string>
    <string name="sb_segments_selfpromo">Unpaid/Self Promotion</string>
@@ -96,11 +113,6 @@
    <string name="sb_skip_seekbaronly">Show in seek bar</string>
    <string name="sb_skip_ignore">Disable</string>

-    <string name="sb_about">About</string>
-    <string name="sb_about_api">sponsor.ajay.app</string>
-    <string name="sb_about_api_sum">Data is provided by the SponsorBlock API. Tap here to learn more and see downloads for other platforms</string>
-    <string name="sb_about_made_by">ReVanced integration by JakubWeg,\nrecoded by oSumAtrIX</string>
-
    <string name="sb_submit_failed_invalid" formatted="false">Can\'t submit the segment: %s</string>
    <string name="sb_submit_failed_timeout">Unable to submit segments (API timed out)</string>
    <string name="sb_submit_failed_unknown_error" formatted="false">Unable to submit segments (status: %d %s)</string>
@@ -139,13 +151,6 @@
    <string name="sb_new_segment_edit_by_hand_content">Do you want to edit the timing for the start or end of the segment?</string>
    <string name="sb_new_segment_edit_by_hand_parse_error">Invalid time given</string>

-    <string name="sb_guidelines_preference_title">View guidelines</string>
-    <string name="sb_guidelines_preference_sum">Guidelines contain rules and tips for creating new segments</string>
-    <string name="sb_guidelines_popup_title">Follow the guidelines</string>
-    <string name="sb_guidelines_popup_content">Read the SponsorBlock guidelines before creating new segments</string>
-    <string name="sb_guidelines_popup_already_read">Already read</string>
-    <string name="sb_guidelines_popup_open">Show me</string>
-
    <string name="sb_stats">Stats</string>
    <string name="sb_stats_connection_failure">Stats temporarily not available (API is down)</string>
    <string name="sb_stats_loading">Loading...</string>
@@ -166,6 +171,7 @@
    <string name="sb_stats_saved_hour_format" formatted="false">%d hours %d minutes</string>
    <string name="sb_stats_saved_minute_format" formatted="false">%d minutes %d seconds</string>
    <string name="sb_stats_saved_second_format" formatted="false">%d seconds</string>
+
    <string name="sb_color_dot_label">Color:</string>
    <string name="sb_color_changed">Color changed</string>
    <string name="sb_color_reset">Color reset</string>
@@ -173,7 +179,9 @@
    <string name="sb_reset_color">Reset color</string>

    <string name="sb_reset">Reset</string>
-    <string name="sb_api_url_reset">API URL reset</string>
-    <string name="sb_api_url_invalid">API URL is invalid</string>
-    <string name="sb_api_url_changed">API URL changed</string>
+
+    <string name="sb_about">About</string>
+    <string name="sb_about_api">sponsor.ajay.app</string>
+    <string name="sb_about_api_sum">Data is provided by the SponsorBlock API. Tap here to learn more and see downloads for other platforms</string>
+    <string name="sb_about_made_by">ReVanced integration by JakubWeg,\nrecoded by oSumAtrIX</string>
 </resources>
Author	SHA1	Message	Date
semantic-release-bot	420f392dcf	chore(release): 2.171.0-dev.4 [skip ci] # [2.171.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.171.0-dev.3...v2.171.0-dev.4) (2023-04-27) ### Bug Fixes * youtube/minimized-playback: disable minimized playback for shorts ([#1990](https://github.com/revanced/revanced-patches/issues/1990)) ([`16f1998`](`16f1998ba3`))	2023-04-27 13:41:17 +00:00
LisoUseInAIKyrios	16f1998ba3	fix(youtube/minimized-playback): disable minimized playback for shorts (#1990 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-04-27 17:39:05 +04:00
semantic-release-bot	9fce0f4b44	chore(release): 2.171.0-dev.3 [skip ci] # [2.171.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.171.0-dev.2...v2.171.0-dev.3) (2023-04-26) ### Features * youtube/sponsorblock: automatically hide skip button ([#1956](https://github.com/revanced/revanced-patches/issues/1956)) ([`1131b40`](`1131b40b11`))	2023-04-26 08:33:22 +00:00
LisoUseInAIKyrios	1131b40b11	feat(youtube/sponsorblock): automatically hide skip button (#1956 )	2023-04-26 12:31:39 +04:00