chore(release): 4.0.3-dev.2 [skip ci]

## [4.0.3-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.0.3-dev.1...v4.0.3-dev.2) (2024-02-01)

### Bug Fixes

* **Infinity for Reddit - Unlock subscription:** Restore functionality on v7.0.0 ([2c50c25](2c50c25a36))

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -71,7 +71,7 @@ body:
         Before creating a new feature request, please keep the following in mind:
 
         - **Do not submit a duplicate feature request**: You can review existing feature requests [here](https://github.com/ReVanced/revanced-patches/labels/Feature%20request).
-        - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md).
+        - **Review the contribution guidelines**: Make sure your feature request adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md).
         - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
   - type: textarea
     attributes:

CHANGELOG.md

@@ -1,3 +1,47 @@
+## [4.0.3-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.0.3-dev.1...v4.0.3-dev.2) (2024-02-01)
+
+
+### Bug Fixes
+
+* **Infinity for Reddit - Unlock subscription:** Restore functionality on v7.0.0 ([bf19af9](https://github.com/ReVanced/revanced-patches/commit/bf19af99cb522f9027a4b3ae42d6258ac71758e5))
+
+## [4.0.3-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.0.2...v4.0.3-dev.1) (2024-01-28)
+
+
+### Bug Fixes
+
+* **YouTube:** Correctly show channel page on tablet devices ([#2656](https://github.com/ReVanced/revanced-patches/issues/2656)) ([c7c9700](https://github.com/ReVanced/revanced-patches/commit/c7c9700d93caeae105916d33376670f525276fac))
+
+## [4.0.2](https://github.com/ReVanced/revanced-patches/compare/v4.0.1...v4.0.2) (2024-01-28)
+
+
+### Bug Fixes
+
+* **Twitch:** Correct patch resources to fix build ([1b63898](https://github.com/ReVanced/revanced-patches/commit/1b63898413b24693b0b737df29adcf9142963dfa))
+* **YouTube:** Do not crash on startup for root installs ([#2655](https://github.com/ReVanced/revanced-patches/issues/2655)) ([02abace](https://github.com/ReVanced/revanced-patches/commit/02abace127c9ef906c06ded9135cbba2871bd1e6))
+
+## [4.0.2-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.0.2-dev.1...v4.0.2-dev.2) (2024-01-28)
+
+
+### Bug Fixes
+
+* **YouTube:** Do not crash on startup for root installs ([#2655](https://github.com/ReVanced/revanced-patches/issues/2655)) ([02abace](https://github.com/ReVanced/revanced-patches/commit/02abace127c9ef906c06ded9135cbba2871bd1e6))
+
+## [4.0.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.0.1...v4.0.2-dev.1) (2024-01-27)
+
+
+### Bug Fixes
+
+* **Twitch:** Correct patch resources to fix build ([1b63898](https://github.com/ReVanced/revanced-patches/commit/1b63898413b24693b0b737df29adcf9142963dfa))
+
+## [4.0.1](https://github.com/ReVanced/revanced-patches/compare/v4.0.0...v4.0.1) (2024-01-27)
+
+
+### Bug Fixes
+
+* Indent patch option description correctly ([bd86ef6](https://github.com/ReVanced/revanced-patches/commit/bd86ef6fc2344fa049077e9aa4bcd5d7ffa4c7f9))
+* Only set Android key if not null to prevent build errors ([1181b0b](https://github.com/ReVanced/revanced-patches/commit/1181b0bca24c524c376f7ea26ae02ee771645e6b))
+
 ## [4.0.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.0.1-dev.1...v4.0.1-dev.2) (2024-01-27)
 
 

gradle.properties

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

src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/subscription/UnlockSubscriptionPatch.kt

@@ -6,6 +6,7 @@ import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.reddit.customclients.infinityforreddit.api.SpoofClientPatch
 import app.revanced.patches.reddit.customclients.infinityforreddit.subscription.fingerprints.StartSubscriptionActivityFingerprint
+import app.revanced.patches.reddit.customclients.infinityforreddit.subscription.fingerprints.SubscriptionActivityOnCreateFingerprint
 import app.revanced.util.returnEarly
 
 @Patch(
@@ -18,7 +19,8 @@ import app.revanced.util.returnEarly
 )
 @Suppress("unused")
 object UnlockSubscriptionPatch : BytecodePatch(
-    setOf(StartSubscriptionActivityFingerprint)
+    setOf(StartSubscriptionActivityFingerprint, SubscriptionActivityOnCreateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) = listOf(StartSubscriptionActivityFingerprint).returnEarly()
+    override fun execute(context: BytecodeContext) =
+        listOf(StartSubscriptionActivityFingerprint, SubscriptionActivityOnCreateFingerprint).returnEarly()
 }

src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/subscription/fingerprints/SubscriptionActivityOnCreateFingerprint.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.reddit.customclients.infinityforreddit.subscription.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object SubscriptionActivityOnCreateFingerprint : MethodFingerprint(
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC.value,
+    parameters = listOf("Landroid/os/Bundle;"),
+    customFingerprint = { method, classDef ->
+        method.name == "onCreate" && classDef.type.endsWith("SubscriptionActivity;")
+    }
+)

src/main/kotlin/app/revanced/patches/twitch/ad/embedded/EmbeddedAdsPatch.kt

@@ -32,7 +32,7 @@ object EmbeddedAdsPatch : BytecodePatch(
         AddResourcesPatch(this::class)
 
         SettingsPatch.PreferenceScreen.ADS.SURESTREAM.addPreferences(
-            ListPreference("revanced_block_embedded_ads")
+            ListPreference("revanced_block_embedded_ads", summaryKey = null)
         )
 
         val result = CreateUsherClientFingerprint.result ?: throw CreateUsherClientFingerprint.exception

src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt

@@ -2,6 +2,7 @@ package app.revanced.patches.youtube.layout.searchbar
 
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
@@ -14,6 +15,7 @@ import app.revanced.patches.youtube.layout.searchbar.fingerprints.SetWordmarkHea
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.util.exception
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch(
     name = "Wide searchbar",
@@ -43,6 +45,10 @@ object WideSearchbarPatch : BytecodePatch(
         CreateSearchSuggestionsFingerprint
     )
 ) {
+
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
+        "Lapp/revanced/integrations/youtube/patches/WideSearchbarPatch;"
+
     override fun execute(context: BytecodeContext) {
         AddResourcesPatch(this::class)
 
@@ -76,11 +82,14 @@ object WideSearchbarPatch : BytecodePatch(
      * Injects instructions required for certain methods.
      */
     private fun MutableMethod.injectSearchBarHook() {
+        val insertIndex = implementation!!.instructions.size - 1
+        val insertRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
+
         addInstructions(
-            implementation!!.instructions.size - 1,
+            insertIndex,
             """
-                    invoke-static {}, Lapp/revanced/integrations/youtube/patches/WideSearchbarPatch;->enableWideSearchbar()Z
+                invoke-static {v$insertRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->enableWideSearchbar(Z)Z
-                    move-result p0
+                move-result v$insertRegister
             """
         )
     }

src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt

@@ -25,7 +25,6 @@ import java.io.Closeable
 @Patch(
     description = "Adds settings for ReVanced to YouTube.",
     dependencies = [
-        ChangePackageNamePatch::class,
         IntegrationsPatch::class,
         SettingsResourcePatch::class,
         AddResourcesPatch::class
@@ -101,7 +100,7 @@ object SettingsPatch : BytecodePatch(
         targetClass = "com.google.android.libraries.social.licenses.LicenseActivity"
     ) {
         // The package name change has to be reflected in the intent.
-        ChangePackageNamePatch.setOrGetFallbackPackageName("com.google.android.apps.youtube")
+        ChangePackageNamePatch.setOrGetFallbackPackageName("com.google.android.youtube")
     }
 
     object PreferenceScreen : BasePreferenceScreen() {

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

@@ -74,25 +74,28 @@
         </patch>
     </app>
     <app id="twitch">
-        <patch id="chat.autoclaim.AutoClaimChannelPointsPatch">
+        <patch id="chat.antidelete.ShowDeletedMessagesPatch">
-            <string-array name="revanced_deleted_messages_entries">
+            <string-array name="revanced_show_deleted_messages_entries">
-                <item>@string/revanced_deleted_messages_entry_1</item>
+                <item>@string/revanced_show_deleted_messages_entry_1</item>
-                <item>@string/revanced_deleted_messages_entry_2</item>
+                <item>@string/revanced_show_deleted_messages_entry_2</item>
-                <item>@string/revanced_deleted_messages_entry_3</item>
+                <item>@string/revanced_show_deleted_messages_entry_3</item>
             </string-array>
-            <string-array name="revanced_deleted_messages_entry_values">
+            <string-array name="revanced_show_deleted_messages_entry_values">
                 <item>hide</item>
                 <item>spoiler</item>
                 <item>cross-out</item>
             </string-array>
+        </patch>
+        <patch id="chat.autoclaim.AutoClaimChannelPointsPatch">
+
         </patch>
         <patch id="ad.embedded.EmbeddedAdsPatch">
-            <string-array name="revanced_hls_proxies_entries">
+            <string-array name="revanced_block_embedded_ads_entries">
-                <item>@string/revanced_hls_proxies_entry_1</item>
+                <item>@string/revanced_block_embedded_ads_entry_1</item>
-                <item>@string/revanced_hls_proxies_entry_2</item>
+                <item>@string/revanced_block_embedded_ads_entry_2</item>
-                <item>@string/revanced_hls_proxies_entry_3</item>
+                <item>@string/revanced_block_embedded_ads_entry_3</item>
             </string-array>
-            <string-array name="revanced_hls_proxies_entry_values">
+            <string-array name="revanced_block_embedded_ads_entry_values">
                 <item>disabled</item>
                 <item>luminous</item>
                 <item>purpleadblock</item>

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

@@ -972,11 +972,9 @@
             <string name="revanced_embedded_ads_service_unavailable">%s is unavailable. Ads may show. Try switching to another ad block service in settings.</string>
             <string name="revanced_embedded_ads_service_failed">%s server returned an error. Ads may show. Try switching to another ad block service in settings.</string>
             <string name="revanced_block_embedded_ads_title">Block embedded video ads</string>
-            <string name="revanced_block_embedded_ads_summary_on">Embedded video ads are blocked</string>
+            <string name="revanced_block_embedded_ads_entry_1">Disabled</string>
-            <string name="revanced_block_embedded_ads_summary_off">Embedded video ads are unblocked</string>
+            <string name="revanced_block_embedded_ads_entry_2">Luminous proxy</string>
-            <string name="revanced_hls_proxies_entry_1">Disabled</string>
+            <string name="revanced_block_embedded_ads_entry_3">PurpleAdBlock proxy</string>
-            <string name="revanced_hls_proxies_entry_2">Luminous proxy</string>
-            <string name="revanced_hls_proxies_entry_3">PurpleAdBlock proxy</string>
         </patch>
         <patch id="ad.video.VideoAdsPatch">
             <string name="revanced_block_video_ads_title">Block video ads</string>
@@ -986,9 +984,9 @@
         <patch id="chat.antidelete.ShowDeletedMessagesPatch">
             <string name="revanced_deleted_msg">message deleted</string>
             <string name="revanced_show_deleted_messages_title">Show deleted messages</string>
-            <string name="revanced_deleted_messages_entry_1">Do not show deleted messages</string>
+            <string name="revanced_show_deleted_messages_entry_1">Do not show deleted messages</string>
-            <string name="revanced_deleted_messages_entry_2">Hide deleted messages behind a spoiler</string>
+            <string name="revanced_show_deleted_messages_entry_2">Hide deleted messages behind a spoiler</string>
-            <string name="revanced_deleted_messages_entry_3">Show deleted messages as crossed-out text</string>
+            <string name="revanced_show_deleted_messages_entry_3">Show deleted messages as crossed-out text</string>
         </patch>
         <patch id="chat.autoclaim.AutoClaimChannelPointsPatch">
             <string name="revanced_auto_claim_channel_points_title">Automatically claim Channel Points</string>
@@ -1000,7 +998,7 @@
             <string name="revanced_twitch_debug_mode_summary_on">Twitch debug mode is enabled (not recommended)</string>
             <string name="revanced_twitch_debug_mode_summary_off">Twitch debug mode is disabled</string>
         </patch>
-        <patch id="settings.SettingsPatch">
+        <patch id="misc.settings.SettingsPatch">
             <string name="revanced_settings">ReVanced Settings</string>
             <string name="revanced_debug_title">Debug logging</string>
             <string name="revanced_debug_summary_on">Debug logs are enabled</string>