diff --git a/app/src/main/java/app/revanced/integrations/adremover/LithoAdRemoval.java b/app/src/main/java/app/revanced/integrations/adremover/LithoAdRemoval.java index 7f28c2fa..9a8a3652 100644 --- a/app/src/main/java/app/revanced/integrations/adremover/LithoAdRemoval.java +++ b/app/src/main/java/app/revanced/integrations/adremover/LithoAdRemoval.java @@ -19,62 +19,62 @@ public class LithoAdRemoval { private static boolean getBoolean(String key, boolean _default) { return SharedPrefHelper.getBoolean(Objects.requireNonNull(ReVancedUtils.getContext()), SharedPrefHelper.SharedPrefNames.YOUTUBE, key, _default); } - - private static boolean isExperimentalInfoPanelRemoval() { - return getBoolean("experimental_info_panel", true); - } - - private static boolean isExperimentalMedicalPanelRemoval() { - return getBoolean("experimental_medical_panel", true); - } - - private static boolean isExperimentalEmergencyBoxRemoval() { - return getBoolean("experimental_emergency_box", true); - } - - private static boolean isExperimentalAdRemoval() { - return getBoolean("experimental_ad_removal", true); - } - - private static boolean isExperimentalMerchandiseRemoval() { - return getBoolean("experimental_merchandise", true); - } - - private static boolean isExperimentalCommunityPostRemoval() { - return getBoolean("experimental_community_posts", false); - } - - private static boolean isExperimentalMovieRemoval() { - return getBoolean("experimental_movie", true); - } - - private static boolean isExperimentalCompactBannerRemoval() { - return getBoolean("experimental_compact_banner", false); - } - - private static boolean isExperimentalPaidContentRemoval() { - return getBoolean("experimental_paid_content", true); - } - - private static boolean isExperimentalCommentsRemoval() { - return getBoolean("experimental_comments", false); - } - - private static boolean isInFeedSurvey() { - return getBoolean("experimental_in_feed_survey", false); - } - - private static boolean isShortsShelf() { - return getBoolean("experimental_shorts_shelf", true); - } - + private static boolean isCommunityGuidelines() { return getBoolean("experimental_community_guidelines", true); } + private static boolean isExperimentalAdRemoval() { + return getBoolean("experimental_ad_removal", true); + } + + private static boolean isExperimentalCommentsRemoval() { + return getBoolean("experimental_comments", false); + } + + private static boolean isExperimentalCommunityPostRemoval() { + return getBoolean("experimental_community_posts", false); + } + + private static boolean isExperimentalCompactBannerRemoval() { + return getBoolean("experimental_compact_banner", false); + } + + private static boolean isExperimentalEmergencyBoxRemoval() { + return getBoolean("experimental_emergency_box", true); + } + + private static boolean isExperimentalInfoPanelRemoval() { + return getBoolean("experimental_info_panel", true); + } + + private static boolean isExperimentalMedicalPanelRemoval() { + return getBoolean("experimental_medical_panel", true); + } + + private static boolean isExperimentalMerchandiseRemoval() { + return getBoolean("experimental_merchandise", true); + } + + private static boolean isExperimentalMovieRemoval() { + return getBoolean("experimental_movie", true); + } + + private static boolean isExperimentalPaidContentRemoval() { + return getBoolean("experimental_paid_content", true); + } + private static boolean isExperimentalSuggestedForYou() { return getBoolean("experimental_suggested_for_you", true); } + + private static boolean isInFeedSurvey() { + return getBoolean("experimental_in_feed_survey", false); + } + + private static boolean isShortsShelf() { + return getBoolean("experimental_shorts_shelf", true); + } @RequiresApi(api = Build.VERSION_CODES.N) public static boolean containsAd(String value, ByteBuffer buffer) { @@ -100,63 +100,63 @@ public class LithoAdRemoval { blockList.add("_ad"); blockList.add("ad_badge"); blockList.add("ads_video_with_context"); - blockList.add("text_search_ad_with_description_first"); - blockList.add("shelf_header"); blockList.add("cell_divider"); - blockList.add("watch_metadata_app_promo"); blockList.add("reels_player_overlay"); - + blockList.add("shelf_header"); + blockList.add("text_search_ad_with_description_first"); + blockList.add("watch_metadata_app_promo"); + bufferBlockList.add("ad_cpn"); } if (isExperimentalSuggestedForYou()) { bufferBlockList.add("watch-vrecH"); } if (isExperimentalMovieRemoval()) { - blockList.add("movie_and_show_upsell_card"); blockList.add("compact_movie"); blockList.add("horizontal_movie_shelf"); - + blockList.add("movie_and_show_upsell_card"); + bufferBlockList.add("YouTube Movies"); } if (containsAny(value, "home_video_with_context", "related_video_with_context") && bufferBlockList.stream().anyMatch(StandardCharsets.UTF_8.decode(buffer).toString()::contains) ) return true; - if (isExperimentalMerchandiseRemoval()) { - blockList.add("product_carousel"); - } - if (isExperimentalCommunityPostRemoval()) { - blockList.add("post_base_wrapper"); - } - if (isExperimentalPaidContentRemoval()) { - blockList.add("paid_content_overlay"); - } - if (isExperimentalEmergencyBoxRemoval()) { - blockList.add("emergency_onebox"); - } - if (isExperimentalMedicalPanelRemoval()) { - blockList.add("medical_panel"); - } - if (isExperimentalInfoPanelRemoval()) { - blockList.add("single_item_information_panel"); - blockList.add("publisher_transparency_panel"); - } - if (isExperimentalCompactBannerRemoval()) { - blockList.add("compact_banner"); - } if (isExperimentalCommentsRemoval()) { blockList.add("comments_composite_entry_point"); } - if (isInFeedSurvey()) { - blockList.add("in_feed_survey"); - } - if (isShortsShelf()) { - blockList.add("shorts_shelf"); - } if (isCommunityGuidelines()) { blockList.add("community_guidelines"); } - + if (isExperimentalCompactBannerRemoval()) { + blockList.add("compact_banner"); + } + if (isExperimentalEmergencyBoxRemoval()) { + blockList.add("emergency_onebox"); + } + if (isInFeedSurvey()) { + blockList.add("in_feed_survey"); + } + if (isExperimentalMedicalPanelRemoval()) { + blockList.add("medical_panel"); + } + if (isExperimentalPaidContentRemoval()) { + blockList.add("paid_content_overlay"); + } + if (isExperimentalCommunityPostRemoval()) { + blockList.add("post_base_wrapper"); + } + if (isExperimentalMerchandiseRemoval()) { + blockList.add("product_carousel"); + } + if (isShortsShelf()) { + blockList.add("shorts_shelf"); + } + if (isExperimentalInfoPanelRemoval()) { + blockList.add("publisher_transparency_panel"); + blockList.add("single_item_information_panel"); + } + if (containsAny(value, "home_video_with_context", "related_video_with_context", @@ -185,7 +185,6 @@ public class LithoAdRemoval { LogHelper.printException(LithoAdRemoval.class, ex.getMessage(), ex); return false; } - } private static boolean containsAny(String value, String... targets) {