chore: Merge branch dev to main (#2649)

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [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)
 
 

gradle.properties

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

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/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">
- <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>

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

@@ -878,7 +878,7 @@
  <string name="revanced_spoof_signature_verification_enabled_user_dialog_message">Turning off this setting will cause video playback issues.</string>
  <string name="revanced_spoof_signature_in_feed_enabled_title">Spoof app signature in feed</string>
  <string name="revanced_spoof_signature_in_feed_enabled_summary_on">App signature spoofed\n\nSide effects include:\n• Feed videos are missing subtitles\n• Automatically played feed videos will show up in your watch history</string>
- <string name="revanced_spoof_signature_in_feed_enabled_summary_off">App signature not spoofed for feed videos\n\nFeed videos will play for less than 1 minute beforeencountering playback issues</string>
+ <string name="revanced_spoof_signature_in_feed_enabled_summary_off">App signature not spoofed for feed videos\n\nFeed videos will play for less than 1 minute before encountering playback issues</string>
  <string name="revanced_spoof_storyboard_title">Spoof storyboard</string>
  <string name="revanced_spoof_storyboard_summary_on">Storyboard spoofed</string>
  <string name="revanced_spoof_storyboard_summary_off">Storyboard not spoofed\n\nSide effects include:\n• No ambient mode\n• Seekbar thumbnails are hidden</string>
@@ -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>