From 3ce100ced57d7099c2209d9a955484f1e7d418e0 Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Thu, 18 Apr 2024 14:57:17 +0400 Subject: [PATCH 1/6] fix(YouTube - Hide Shorts components): Hide paid promotion label --- .../youtube/patches/components/ShortsFilter.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/ShortsFilter.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/ShortsFilter.java index c03d4518..371fde56 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/ShortsFilter.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/ShortsFilter.java @@ -20,7 +20,7 @@ public final class ShortsFilter extends Filter { private final static String REEL_CHANNEL_BAR_PATH = "reel_channel_bar.eml"; /** - * For subscribe button that appears in the channel bar. + * For paid promotion label and subscribe button that appears in the channel bar. */ private final static String REEL_METAPANEL_PATH = "reel_metapanel.eml"; @@ -29,6 +29,7 @@ public final class ShortsFilter extends Filter { private final StringFilterGroup subscribeButton; private final StringFilterGroup joinButton; + private final StringFilterGroup paidPromotionButton; private final StringFilterGroup shelfHeader; private final StringFilterGroup suggestedAction; @@ -117,6 +118,11 @@ public final class ShortsFilter extends Filter { "subscribe_button" ); + paidPromotionButton = new StringFilterGroup( + Settings.HIDE_PAID_PROMOTION_LABEL, + "reel_player_disclosure.eml" + ); + actionBar = new StringFilterGroup( null, "shorts_action_bar" @@ -129,8 +135,8 @@ public final class ShortsFilter extends Filter { addPathCallbacks( shortsCompactFeedVideoPath, suggestedAction, actionBar, joinButton, subscribeButton, - pausedOverlayButtons, channelBar, fullVideoLinkLabel, videoTitle, reelSoundMetadata, - soundButton, infoPanel + paidPromotionButton, pausedOverlayButtons, channelBar, fullVideoLinkLabel, videoTitle, + reelSoundMetadata, soundButton, infoPanel ); // @@ -196,7 +202,7 @@ public final class ShortsFilter extends Filter { boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray, StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) { if (contentType == FilterContentType.PATH) { - if (matchedGroup == subscribeButton || matchedGroup == joinButton) { + if (matchedGroup == subscribeButton || matchedGroup == joinButton || matchedGroup == paidPromotionButton) { // Selectively filter to avoid false positive filtering of other subscribe/join buttons. if (path.startsWith(REEL_CHANNEL_BAR_PATH) || path.startsWith(REEL_METAPANEL_PATH)) { return super.isFiltered( From bcc9126107cdd533fc0d4b888d00dbd6f3297e50 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 18 Apr 2024 11:00:38 +0000 Subject: [PATCH 2/6] chore(release): 1.8.0-dev.17 [skip ci] # [1.8.0-dev.17](https://github.com/ReVanced/revanced-integrations/compare/v1.8.0-dev.16...v1.8.0-dev.17) (2024-04-18) ### Bug Fixes * **YouTube - Hide Shorts components:** Hide paid promotion label ([3ce100c](https://github.com/ReVanced/revanced-integrations/commit/3ce100ced57d7099c2209d9a955484f1e7d418e0)) --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dd98cd0..1a70810d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [1.8.0-dev.17](https://github.com/ReVanced/revanced-integrations/compare/v1.8.0-dev.16...v1.8.0-dev.17) (2024-04-18) + + +### Bug Fixes + +* **YouTube - Hide Shorts components:** Hide paid promotion label ([3ce100c](https://github.com/ReVanced/revanced-integrations/commit/3ce100ced57d7099c2209d9a955484f1e7d418e0)) + # [1.8.0-dev.16](https://github.com/ReVanced/revanced-integrations/compare/v1.8.0-dev.15...v1.8.0-dev.16) (2024-04-18) diff --git a/gradle.properties b/gradle.properties index 29e32191..c5f7ec5d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.parallel = true org.gradle.caching = true android.useAndroidX = true -version = 1.8.0-dev.16 +version = 1.8.0-dev.17 From 786ac9d2b71886964454fcb748e656d1beed1964 Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Thu, 18 Apr 2024 17:18:52 +0400 Subject: [PATCH 3/6] fix(YouTube - Spoof device dimensions): Warn about potential performance issues (#617) --- .../app/revanced/integrations/youtube/settings/Settings.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java b/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java index 98770fea..505ad451 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java +++ b/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java @@ -223,7 +223,8 @@ public class Settings extends BaseSettings { parent(SPOOF_SIGNATURE)); public static final BooleanSetting SPOOF_STORYBOARD_RENDERER = new BooleanSetting("revanced_spoof_storyboard", TRUE, true, parent(SPOOF_SIGNATURE)); - public static final BooleanSetting SPOOF_DEVICE_DIMENSIONS = new BooleanSetting("revanced_spoof_device_dimensions", FALSE, true); + public static final BooleanSetting SPOOF_DEVICE_DIMENSIONS = new BooleanSetting("revanced_spoof_device_dimensions", FALSE, true, + "revanced_spoof_device_dimensions_user_dialog_message"); public static final BooleanSetting BYPASS_URL_REDIRECTS = new BooleanSetting("revanced_bypass_url_redirects", TRUE); public static final BooleanSetting ANNOUNCEMENTS = new BooleanSetting("revanced_announcements", TRUE); @Deprecated From 3ff5dcd05fbab3aadcadb46f7f0205e1f4d75a4a Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 18 Apr 2024 13:21:46 +0000 Subject: [PATCH 4/6] chore(release): 1.8.0-dev.18 [skip ci] # [1.8.0-dev.18](https://github.com/ReVanced/revanced-integrations/compare/v1.8.0-dev.17...v1.8.0-dev.18) (2024-04-18) ### Bug Fixes * **YouTube - Spoof device dimensions:** Warn about potential performance issues ([#617](https://github.com/ReVanced/revanced-integrations/issues/617)) ([786ac9d](https://github.com/ReVanced/revanced-integrations/commit/786ac9d2b71886964454fcb748e656d1beed1964)) --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a70810d..3d5d81c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [1.8.0-dev.18](https://github.com/ReVanced/revanced-integrations/compare/v1.8.0-dev.17...v1.8.0-dev.18) (2024-04-18) + + +### Bug Fixes + +* **YouTube - Spoof device dimensions:** Warn about potential performance issues ([#617](https://github.com/ReVanced/revanced-integrations/issues/617)) ([786ac9d](https://github.com/ReVanced/revanced-integrations/commit/786ac9d2b71886964454fcb748e656d1beed1964)) + # [1.8.0-dev.17](https://github.com/ReVanced/revanced-integrations/compare/v1.8.0-dev.16...v1.8.0-dev.17) (2024-04-18) diff --git a/gradle.properties b/gradle.properties index c5f7ec5d..537810ba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.parallel = true org.gradle.caching = true android.useAndroidX = true -version = 1.8.0-dev.17 +version = 1.8.0-dev.18 From c3bfa77d62b15dedfed8f697583f2f0805f0c2c1 Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Thu, 18 Apr 2024 22:40:26 +0400 Subject: [PATCH 5/6] fix(YouTube - Hide keyword content): Correctly hide content in the subscription tab --- .../youtube/patches/components/KeywordContentFilter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/KeywordContentFilter.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/KeywordContentFilter.java index 95b9f466..acb9c9b2 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/KeywordContentFilter.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/KeywordContentFilter.java @@ -118,6 +118,7 @@ final class KeywordContentFilter extends Filter { // For now, consider the under video results the same as the home feed. return Settings.HIDE_KEYWORD_CONTENT_HOME.get(); } + // Must check second, as search can be from any tab. if (NavigationBar.isSearchBarActive()) { return Settings.HIDE_KEYWORD_CONTENT_SEARCH.get(); @@ -125,7 +126,7 @@ final class KeywordContentFilter extends Filter { // Avoid checking navigation button status if all other settings are off. final boolean hideHome = Settings.HIDE_KEYWORD_CONTENT_HOME.get(); - final boolean hideSubscriptions = Settings.HIDE_SUBSCRIPTIONS_BUTTON.get(); + final boolean hideSubscriptions = Settings.HIDE_KEYWORD_CONTENT_SUBSCRIPTIONS.get(); if (!hideHome && !hideSubscriptions) { return false; } From efd03012d04a8b0fc358faa73a1b58721e3fd29c Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 18 Apr 2024 18:43:48 +0000 Subject: [PATCH 6/6] chore(release): 1.8.0-dev.19 [skip ci] # [1.8.0-dev.19](https://github.com/ReVanced/revanced-integrations/compare/v1.8.0-dev.18...v1.8.0-dev.19) (2024-04-18) ### Bug Fixes * **YouTube - Hide keyword content:** Correctly hide content in the subscription tab ([c3bfa77](https://github.com/ReVanced/revanced-integrations/commit/c3bfa77d62b15dedfed8f697583f2f0805f0c2c1)) --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d5d81c3..6c9554d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [1.8.0-dev.19](https://github.com/ReVanced/revanced-integrations/compare/v1.8.0-dev.18...v1.8.0-dev.19) (2024-04-18) + + +### Bug Fixes + +* **YouTube - Hide keyword content:** Correctly hide content in the subscription tab ([c3bfa77](https://github.com/ReVanced/revanced-integrations/commit/c3bfa77d62b15dedfed8f697583f2f0805f0c2c1)) + # [1.8.0-dev.18](https://github.com/ReVanced/revanced-integrations/compare/v1.8.0-dev.17...v1.8.0-dev.18) (2024-04-18) diff --git a/gradle.properties b/gradle.properties index 537810ba..511bbbf0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.parallel = true org.gradle.caching = true android.useAndroidX = true -version = 1.8.0-dev.18 +version = 1.8.0-dev.19