From 1b63898413b24693b0b737df29adcf9142963dfa Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sat, 27 Jan 2024 15:35:12 +0100 Subject: [PATCH 1/5] 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 @@ - - - @string/revanced_deleted_messages_entry_1 - @string/revanced_deleted_messages_entry_2 - @string/revanced_deleted_messages_entry_3 + + + @string/revanced_show_deleted_messages_entry_1 + @string/revanced_show_deleted_messages_entry_2 + @string/revanced_show_deleted_messages_entry_3 - + hide spoiler cross-out + + + - - @string/revanced_hls_proxies_entry_1 - @string/revanced_hls_proxies_entry_2 - @string/revanced_hls_proxies_entry_3 + + @string/revanced_block_embedded_ads_entry_1 + @string/revanced_block_embedded_ads_entry_2 + @string/revanced_block_embedded_ads_entry_3 - + disabled luminous purpleadblock 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 @@ %s is unavailable. Ads may show. Try switching to another ad block service in settings. %s server returned an error. Ads may show. Try switching to another ad block service in settings. Block embedded video ads - Embedded video ads are blocked - Embedded video ads are unblocked - Disabled - Luminous proxy - PurpleAdBlock proxy + Disabled + Luminous proxy + PurpleAdBlock proxy Block video ads @@ -986,9 +984,9 @@ message deleted Show deleted messages - Do not show deleted messages - Hide deleted messages behind a spoiler - Show deleted messages as crossed-out text + Do not show deleted messages + Hide deleted messages behind a spoiler + Show deleted messages as crossed-out text Automatically claim Channel Points @@ -1000,7 +998,7 @@ Twitch debug mode is enabled (not recommended) Twitch debug mode is disabled - + ReVanced Settings Debug logging Debug logs are enabled From 4b2b97a6e2f6271f709b18ad5875f9a34d090fb6 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 27 Jan 2024 14:37:12 +0000 Subject: [PATCH 2/5] chore(release): 4.0.2-dev.1 [skip ci] ## [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)) --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abc64a0bd8..7dc305cfde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [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) diff --git a/gradle.properties b/gradle.properties index b8e6dad079..d9df47fe5c 100644 --- a/gradle.properties +++ b/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.1 From aaed3a970b663a2e0e086f86f073a85f88be56b8 Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Sat, 27 Jan 2024 23:13:34 +0400 Subject: [PATCH 3/5] chore: fix typo --- src/main/resources/addresources/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/addresources/values/strings.xml b/src/main/resources/addresources/values/strings.xml index a202ebdbd5..9d1b377b6d 100644 --- a/src/main/resources/addresources/values/strings.xml +++ b/src/main/resources/addresources/values/strings.xml @@ -878,7 +878,7 @@ Turning off this setting will cause video playback issues. Spoof app signature in feed 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 - App signature not spoofed for feed videos\n\nFeed videos will play for less than 1 minute beforeencountering playback issues + App signature not spoofed for feed videos\n\nFeed videos will play for less than 1 minute before encountering playback issues Spoof storyboard Storyboard spoofed Storyboard not spoofed\n\nSide effects include:\n• No ambient mode\n• Seekbar thumbnails are hidden From 02abace127c9ef906c06ded9135cbba2871bd1e6 Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Sun, 28 Jan 2024 14:47:01 +0400 Subject: [PATCH 4/5] fix(YouTube): Do not crash on startup for root installs (#2655) --- .../revanced/patches/youtube/misc/settings/SettingsPatch.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt index d2360b8f1c..dd33c86373 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt +++ b/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() { From 9ca37ca5284e9d0df77c962e1bca6f51cc84f4c1 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 28 Jan 2024 10:49:16 +0000 Subject: [PATCH 5/5] chore(release): 4.0.2-dev.2 [skip ci] ## [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)) --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7dc305cfde..deddc9c11e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [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) diff --git a/gradle.properties b/gradle.properties index d9df47fe5c..0a0dd9c2e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.parallel = true org.gradle.caching = true kotlin.code.style = official -version = 4.0.2-dev.1 +version = 4.0.2-dev.2