From c424c08f3d9feb0f4be1b6bc7c7e42b1e79c7866 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Wed, 23 Aug 2023 05:28:57 +0200 Subject: [PATCH] refactor: fix naming inconsistency --- .../patches/components/AdsFilter.java | 4 +-- .../patches/components/ButtonsFilter.java | 6 ++-- .../patches/components/CommentsFilter.java | 2 +- .../components/LayoutComponentsFilter.java | 4 +-- .../patches/components/LithoFilterPatch.java | 28 ++++++------------- .../PlaybackSpeedMenuFilterPatch.java | 2 +- .../PlayerFlyoutMenuItemsFilter.java | 2 +- .../patches/components/ShortsFilter.java | 8 +++--- .../VideoQualityMenuFilterPatch.java | 2 +- 9 files changed, 24 insertions(+), 34 deletions(-) diff --git a/integrations/java/app/revanced/integrations/patches/components/AdsFilter.java b/integrations/java/app/revanced/integrations/patches/components/AdsFilter.java index 9ccef8a52..40192d0df 100644 --- a/integrations/java/app/revanced/integrations/patches/components/AdsFilter.java +++ b/integrations/java/app/revanced/integrations/patches/components/AdsFilter.java @@ -86,7 +86,7 @@ public final class AdsFilter extends Filter { "cta_shelf_card" ); - this.pathFilterGroups.addAll( + this.pathFilterGroupList.addAll( generalAds, buttonedAd, merchandise, @@ -95,7 +95,7 @@ public final class AdsFilter extends Filter { webLinkPanel, movieAds ); - this.identifierFilterGroups.addAll(carouselAd); + this.identifierFilterGroupList.addAll(carouselAd); } @Override diff --git a/integrations/java/app/revanced/integrations/patches/components/ButtonsFilter.java b/integrations/java/app/revanced/integrations/patches/components/ButtonsFilter.java index f2ef0f56b..19cddf3f6 100644 --- a/integrations/java/app/revanced/integrations/patches/components/ButtonsFilter.java +++ b/integrations/java/app/revanced/integrations/patches/components/ButtonsFilter.java @@ -20,14 +20,14 @@ final class ButtonsFilter extends Filter { null, VIDEO_ACTION_BAR_PATH ); - identifierFilterGroups.addAll(actionBarGroup); + identifierFilterGroupList.addAll(actionBarGroup); bufferFilterPathGroup = new StringFilterGroup( null, "|CellType|CollectionType|CellType|ContainerType|button.eml|" ); - pathFilterGroups.addAll( + pathFilterGroupList.addAll( new StringFilterGroup( SettingsEnum.HIDE_LIKE_DISLIKE_BUTTON, "|segmented_like_dislike_button" @@ -82,7 +82,7 @@ final class ButtonsFilter extends Filter { } private boolean isEveryFilterGroupEnabled() { - for (var group : pathFilterGroups) + for (var group : pathFilterGroupList) if (!group.isEnabled()) return false; for (var group : bufferButtonsGroupList) diff --git a/integrations/java/app/revanced/integrations/patches/components/CommentsFilter.java b/integrations/java/app/revanced/integrations/patches/components/CommentsFilter.java index 22a9cba60..089fb9480 100644 --- a/integrations/java/app/revanced/integrations/patches/components/CommentsFilter.java +++ b/integrations/java/app/revanced/integrations/patches/components/CommentsFilter.java @@ -18,7 +18,7 @@ final class CommentsFilter extends Filter { "comments_entry_point_simplebox" ); - this.pathFilterGroups.addAll( + this.pathFilterGroupList.addAll( comments, previewComment ); diff --git a/integrations/java/app/revanced/integrations/patches/components/LayoutComponentsFilter.java b/integrations/java/app/revanced/integrations/patches/components/LayoutComponentsFilter.java index 534c7a352..67811a899 100644 --- a/integrations/java/app/revanced/integrations/patches/components/LayoutComponentsFilter.java +++ b/integrations/java/app/revanced/integrations/patches/components/LayoutComponentsFilter.java @@ -142,7 +142,7 @@ public final class LayoutComponentsFilter extends Filter { "chips_shelf" ); - this.pathFilterGroups.addAll( + this.pathFilterGroupList.addAll( channelBar, communityPosts, paidContent, @@ -165,7 +165,7 @@ public final class LayoutComponentsFilter extends Filter { custom ); - this.identifierFilterGroups.addAll( + this.identifierFilterGroupList.addAll( graySeparator, chipsShelf ); diff --git a/integrations/java/app/revanced/integrations/patches/components/LithoFilterPatch.java b/integrations/java/app/revanced/integrations/patches/components/LithoFilterPatch.java index de96efadb..90aa67810 100644 --- a/integrations/java/app/revanced/integrations/patches/components/LithoFilterPatch.java +++ b/integrations/java/app/revanced/integrations/patches/components/LithoFilterPatch.java @@ -1,26 +1,16 @@ package app.revanced.integrations.patches.components; import android.os.Build; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; +import app.revanced.integrations.settings.SettingsEnum; +import app.revanced.integrations.utils.*; import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Spliterator; +import java.util.*; import java.util.function.Consumer; -import app.revanced.integrations.settings.SettingsEnum; -import app.revanced.integrations.utils.ByteTrieSearch; -import app.revanced.integrations.utils.LogHelper; -import app.revanced.integrations.utils.ReVancedUtils; -import app.revanced.integrations.utils.StringTrieSearch; -import app.revanced.integrations.utils.TrieSearch; - abstract class FilterGroup { final static class FilterGroupResult { SettingsEnum setting; @@ -283,8 +273,8 @@ abstract class Filter { * will never be called for any matches. */ - protected final StringFilterGroupList pathFilterGroups = new StringFilterGroupList(); - protected final StringFilterGroupList identifierFilterGroups = new StringFilterGroupList(); + protected final StringFilterGroupList pathFilterGroupList = new StringFilterGroupList(); + protected final StringFilterGroupList identifierFilterGroupList = new StringFilterGroupList(); /** * Called after an enabled filter has been matched. @@ -302,9 +292,9 @@ abstract class Filter { boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray, FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) { if (SettingsEnum.DEBUG.getBoolean()) { - if (pathFilterGroups == matchedList) { + if (pathFilterGroupList == matchedList) { LogHelper.printDebug(() -> getClass().getSimpleName() + " Filtered path: " + path); - } else if (identifierFilterGroups == matchedList) { + } else if (identifierFilterGroupList == matchedList) { LogHelper.printDebug(() -> getClass().getSimpleName() + " Filtered identifier: " + identifier); } } @@ -391,8 +381,8 @@ public final class LithoFilterPatch { static { for (Filter filter : filters) { - filterGroupLists(pathSearchTree, filter, filter.pathFilterGroups); - filterGroupLists(identifierSearchTree, filter, filter.identifierFilterGroups); + filterGroupLists(pathSearchTree, filter, filter.pathFilterGroupList); + filterGroupLists(identifierSearchTree, filter, filter.identifierFilterGroupList); } LogHelper.printDebug(() -> "Using: " diff --git a/integrations/java/app/revanced/integrations/patches/components/PlaybackSpeedMenuFilterPatch.java b/integrations/java/app/revanced/integrations/patches/components/PlaybackSpeedMenuFilterPatch.java index 2e93574f8..00b11af3b 100644 --- a/integrations/java/app/revanced/integrations/patches/components/PlaybackSpeedMenuFilterPatch.java +++ b/integrations/java/app/revanced/integrations/patches/components/PlaybackSpeedMenuFilterPatch.java @@ -8,7 +8,7 @@ public final class PlaybackSpeedMenuFilterPatch extends Filter { public static volatile boolean isPlaybackSpeedMenuVisible; public PlaybackSpeedMenuFilterPatch() { - pathFilterGroups.addAll(new StringFilterGroup( + pathFilterGroupList.addAll(new StringFilterGroup( null, "playback_speed_sheet_content.eml-js" )); diff --git a/integrations/java/app/revanced/integrations/patches/components/PlayerFlyoutMenuItemsFilter.java b/integrations/java/app/revanced/integrations/patches/components/PlayerFlyoutMenuItemsFilter.java index 9b627f971..c394f84f7 100644 --- a/integrations/java/app/revanced/integrations/patches/components/PlayerFlyoutMenuItemsFilter.java +++ b/integrations/java/app/revanced/integrations/patches/components/PlayerFlyoutMenuItemsFilter.java @@ -15,7 +15,7 @@ public class PlayerFlyoutMenuItemsFilter extends Filter { @RequiresApi(api = Build.VERSION_CODES.N) public PlayerFlyoutMenuItemsFilter() { - identifierFilterGroups.addAll(new StringFilterGroup(null, "overflow_menu_item.eml|")); + identifierFilterGroupList.addAll(new StringFilterGroup(null, "overflow_menu_item.eml|")); flyoutFilterGroupList.addAll( new ByteArrayAsStringFilterGroup( diff --git a/integrations/java/app/revanced/integrations/patches/components/ShortsFilter.java b/integrations/java/app/revanced/integrations/patches/components/ShortsFilter.java index fa97f2ddc..cfe9ebd36 100644 --- a/integrations/java/app/revanced/integrations/patches/components/ShortsFilter.java +++ b/integrations/java/app/revanced/integrations/patches/components/ShortsFilter.java @@ -59,8 +59,8 @@ public final class ShortsFilter extends Filter { "shorts_pivot_item" ); - pathFilterGroups.addAll(joinButton, subscribeButton, channelBar, soundButton, infoPanel); - identifierFilterGroups.addAll(shorts, thanksButton); + pathFilterGroupList.addAll(joinButton, subscribeButton, channelBar, soundButton, infoPanel); + identifierFilterGroupList.addAll(shorts, thanksButton); } @Override @@ -69,11 +69,11 @@ public final class ShortsFilter extends Filter { if (matchedGroup == soundButton || matchedGroup == infoPanel || matchedGroup == channelBar) return true; // Filter the path only when reelChannelBar is visible. - if (pathFilterGroups == matchedList) { + if (pathFilterGroupList == matchedList) { return path.contains(REEL_CHANNEL_BAR_PATH); } - return identifierFilterGroups == matchedList; + return identifierFilterGroupList == matchedList; } public static void hideShortsShelf(final View shortsShelfView) { diff --git a/integrations/java/app/revanced/integrations/patches/components/VideoQualityMenuFilterPatch.java b/integrations/java/app/revanced/integrations/patches/components/VideoQualityMenuFilterPatch.java index 6199effa0..8b5d9643d 100644 --- a/integrations/java/app/revanced/integrations/patches/components/VideoQualityMenuFilterPatch.java +++ b/integrations/java/app/revanced/integrations/patches/components/VideoQualityMenuFilterPatch.java @@ -10,7 +10,7 @@ public final class VideoQualityMenuFilterPatch extends Filter { public static volatile boolean isVideoQualityMenuVisible; public VideoQualityMenuFilterPatch() { - pathFilterGroups.addAll(new StringFilterGroup( + pathFilterGroupList.addAll(new StringFilterGroup( SettingsEnum.SHOW_OLD_VIDEO_QUALITY_MENU, "quick_quality_sheet_content.eml-js" ));