From 1b63898413b24693b0b737df29adcf9142963dfa Mon Sep 17 00:00:00 2001
From: oSumAtrIX <johan.melkonyan1@web.de>
Date: Sat, 27 Jan 2024 15:35:12 +0100
Subject: [PATCH] fix(Twitch): Correct patch resources to fix build

---
 .../twitch/ad/embedded/EmbeddedAdsPatch.kt    |  2 +-
 .../resources/addresources/values/arrays.xml  | 25 +++++++++++--------
 .../resources/addresources/values/strings.xml | 16 ++++++------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/main/kotlin/app/revanced/patches/twitch/ad/embedded/EmbeddedAdsPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/ad/embedded/EmbeddedAdsPatch.kt
index afc2e367d6..4dd39f59fd 100644
--- a/src/main/kotlin/app/revanced/patches/twitch/ad/embedded/EmbeddedAdsPatch.kt
+++ b/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
diff --git a/src/main/resources/addresources/values/arrays.xml b/src/main/resources/addresources/values/arrays.xml
index 1c7d050f8d..9ecc3239eb 100644
--- a/src/main/resources/addresources/values/arrays.xml
+++ b/src/main/resources/addresources/values/arrays.xml
@@ -74,25 +74,28 @@
         </patch>
     </app>
     <app id="twitch">
-        <patch id="chat.autoclaim.AutoClaimChannelPointsPatch">
-            <string-array name="revanced_deleted_messages_entries">
-                <item>@string/revanced_deleted_messages_entry_1</item>
-                <item>@string/revanced_deleted_messages_entry_2</item>
-                <item>@string/revanced_deleted_messages_entry_3</item>
+        <patch id="chat.antidelete.ShowDeletedMessagesPatch">
+            <string-array name="revanced_show_deleted_messages_entries">
+                <item>@string/revanced_show_deleted_messages_entry_1</item>
+                <item>@string/revanced_show_deleted_messages_entry_2</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">
-                <item>@string/revanced_hls_proxies_entry_1</item>
-                <item>@string/revanced_hls_proxies_entry_2</item>
-                <item>@string/revanced_hls_proxies_entry_3</item>
+            <string-array name="revanced_block_embedded_ads_entries">
+                <item>@string/revanced_block_embedded_ads_entry_1</item>
+                <item>@string/revanced_block_embedded_ads_entry_2</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>
diff --git a/src/main/resources/addresources/values/strings.xml b/src/main/resources/addresources/values/strings.xml
index e312ffe5bc..a202ebdbd5 100644
--- a/src/main/resources/addresources/values/strings.xml
+++ b/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_summary_off">Embedded video ads are unblocked</string>
-            <string name="revanced_hls_proxies_entry_1">Disabled</string>
-            <string name="revanced_hls_proxies_entry_2">Luminous proxy</string>
-            <string name="revanced_hls_proxies_entry_3">PurpleAdBlock proxy</string>
+            <string name="revanced_block_embedded_ads_entry_1">Disabled</string>
+            <string name="revanced_block_embedded_ads_entry_2">Luminous proxy</string>
+            <string name="revanced_block_embedded_ads_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_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_1">Do not show deleted messages</string>
+            <string name="revanced_show_deleted_messages_entry_2">Hide deleted messages behind a spoiler</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>