Merge remote-tracking branch 'upstream/dev' into filter_keyword_content

# Conflicts:
#	app/src/main/java/app/revanced/integrations/youtube/patches/components/LithoFilterPatch.java

CHANGELOG.md

@@ -1,3 +1,41 @@
+# [1.5.0-dev.9](https://github.com/ReVanced/revanced-integrations/compare/v1.5.0-dev.8...v1.5.0-dev.9) (2024-03-26)
+
+
+### Bug Fixes
+
+* Check index of pattern in string instead of the other way around ([e3ba343](https://github.com/ReVanced/revanced-integrations/commit/e3ba343d890bf3cf79642b1b196c96934a4c0007))
+* **YouTube - Hide layout components:** Correctly hide Join button ([b945e2f](https://github.com/ReVanced/revanced-integrations/commit/b945e2f44b1a62326e6d45345c1467668d803f53))
+* **YouTube - Hide Shorts components:** Correctly hide join button ([b7a8995](https://github.com/ReVanced/revanced-integrations/commit/b7a8995f798e386ee1d9ab5bbd857c1736cc5a29))
+
+
+### Features
+
+* **YouTube - Hide Shorts components:** Hide like and dislike buttons ([2a08e5a](https://github.com/ReVanced/revanced-integrations/commit/2a08e5a98e9e9a00bb306313ff487d67c042a92e))
+* **YouTube - Hide Shorts components:** Hide sound metadata label ([46d8ef6](https://github.com/ReVanced/revanced-integrations/commit/46d8ef6f88bd4c912a45357541291af38b5fc81f))
+* **YouTube - Hide Shorts components:** Hide title and full video link label ([59165de](https://github.com/ReVanced/revanced-integrations/commit/59165de801a5481fa4055dcf1797fe84dce235c0))
+
+# [1.5.0-dev.9](https://github.com/ReVanced/revanced-integrations/compare/v1.5.0-dev.8...v1.5.0-dev.9) (2024-03-26)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Correctly hide Join button ([b945e2f](https://github.com/ReVanced/revanced-integrations/commit/b945e2f44b1a62326e6d45345c1467668d803f53))
+* **YouTube - Hide Shorts components:** Correctly hide join button ([0ab9c70](https://github.com/ReVanced/revanced-integrations/commit/0ab9c701376ba700abb573fcd7dd3a06be65e52e))
+
+
+### Features
+
+* **YouTube - Hide Shorts components:** Hide like and dislike buttons ([2a08e5a](https://github.com/ReVanced/revanced-integrations/commit/2a08e5a98e9e9a00bb306313ff487d67c042a92e))
+* **YouTube - Hide Shorts components:** Hide sound metadata label ([827beff](https://github.com/ReVanced/revanced-integrations/commit/827beffde0c7c6b27a3ac4bbec727f51d17dd3cd))
+* **YouTube - Hide Shorts components:** Hide title and full video link label ([59165de](https://github.com/ReVanced/revanced-integrations/commit/59165de801a5481fa4055dcf1797fe84dce235c0))
+
+# [1.5.0-dev.8](https://github.com/ReVanced/revanced-integrations/compare/v1.5.0-dev.7...v1.5.0-dev.8) (2024-03-25)
+
+
+### Bug Fixes
+
+* **YouTube - Hide ads:** Prevent app crash if hiding fullscreen ads is not possible ([#590](https://github.com/ReVanced/revanced-integrations/issues/590)) ([4ec955f](https://github.com/ReVanced/revanced-integrations/commit/4ec955fd0133643826e47be7089fbfa07fd9a089))
+
 # [1.5.0-dev.7](https://github.com/ReVanced/revanced-integrations/compare/v1.5.0-dev.6...v1.5.0-dev.7) (2024-03-18)
 
 

app/src/main/java/app/revanced/integrations/youtube/patches/announcements/AnnouncementsPatch.java

@@ -18,16 +18,13 @@
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.util.Locale;
-import java.util.UUID;
 
 import static android.text.Html.FROM_HTML_MODE_COMPACT;
 import static app.revanced.integrations.shared.StringRef.str;
 import static app.revanced.integrations.youtube.patches.announcements.requests.AnnouncementsRoutes.GET_LATEST_ANNOUNCEMENT;
 
 @SuppressWarnings("unused")
 public final class AnnouncementsPatch {
-    private final static String CONSUMER = getOrSetConsumer();
-
     private AnnouncementsPatch() {
     }
 
@@ -41,7 +38,7 @@ public static void showAnnouncement(final Activity context) {
         Utils.runOnBackgroundThread(() -> {
             try {
                 HttpURLConnection connection = AnnouncementsRoutes.getAnnouncementsConnectionFromRoute(
-                        GET_LATEST_ANNOUNCEMENT, CONSUMER, Locale.getDefault().toLanguageTag());
+                        GET_LATEST_ANNOUNCEMENT, Locale.getDefault().toLanguageTag());
 
                 Logger.printDebug(() -> "Get latest announcement route connection url: " + connection.getURL());
 
@@ -139,15 +136,6 @@ public static void showAnnouncement(final Activity context) {
         });
     }
 
-    private static String getOrSetConsumer() {
-        final var consumer = Settings.ANNOUNCEMENT_CONSUMER.get();
-        if (!consumer.isEmpty()) return consumer;
-
-        final var uuid = UUID.randomUUID().toString();
-        Settings.ANNOUNCEMENT_CONSUMER.save(uuid);
-        return uuid;
-    }
-
     // TODO: Use better icons.
     private enum Level {
         INFO(android.R.drawable.ic_dialog_info),

app/src/main/java/app/revanced/integrations/youtube/patches/announcements/requests/AnnouncementsRoutes.java

@@ -14,7 +14,7 @@ public class AnnouncementsRoutes {
     /**
      * 'language' parameter is IETF format (for USA it would be 'en-us').
      */
-    public static final Route GET_LATEST_ANNOUNCEMENT = new Route(GET, "/announcements/youtube/latest?consumer={consumer}&language={language}");
+    public static final Route GET_LATEST_ANNOUNCEMENT = new Route(GET, "/announcements/youtube/latest?language={language}");
 
     private AnnouncementsRoutes() {
     }

app/src/main/java/app/revanced/integrations/youtube/patches/components/AdsFilter.java

@@ -1,5 +1,7 @@
 package app.revanced.integrations.youtube.patches.components;
 
+import static app.revanced.integrations.shared.StringRef.str;
+
 import android.app.Instrumentation;
 import android.view.KeyEvent;
 import android.view.View;
@@ -170,7 +172,24 @@ private static void closeFullscreenAd() {
 
         Utils.runOnMainThreadDelayed(() -> {
             // Must run off main thread (Odd, but whatever).
-            Utils.runOnBackgroundThread(() -> instrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_BACK));
+            Utils.runOnBackgroundThread(() -> {
+                try {
+                    instrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);
+                } catch (Exception ex) {
+                    // Injecting user events on Android 10+ requires the manifest to include
+                    // INJECT_EVENTS, and it's usage is heavily restricted
+                    // and requires the user to manually approve the permission in the device settings.
+                    //
+                    // And no matter what, permissions cannot be added for root installations
+                    // as manifest changes are ignored for mount installations.
+                    //
+                    // Instead, catch the SecurityException and turn off hide full screen ads
+                    // since this functionality does not work for these devices.
+                    Logger.printInfo(() -> "Could not inject back button event", ex);
+                    Settings.HIDE_FULLSCREEN_ADS.save(false);
+                    Utils.showToastLong(str("revanced_hide_fullscreen_ads_feature_not_available_toast"));
+                }
+            });
         }, 1000);
     }
 }

app/src/main/java/app/revanced/integrations/youtube/patches/components/LayoutComponentsFilter.java

@@ -29,6 +29,9 @@ public final class LayoutComponentsFilter extends Filter {
     private final StringFilterGroup expandableMetadata;
     private final ByteArrayFilterGroup searchResultRecommendations;
     private final StringFilterGroup searchResultVideo;
+    private final StringFilterGroup compactChannelBarInner;
+    private final StringFilterGroup compactChannelBarInnerButton;
+    private final ByteArrayFilterGroup joinMembershipButton;
 
     static {
         mixPlaylistsExceptions.addPatterns(
@@ -37,6 +40,7 @@ public final class LayoutComponentsFilter extends Filter {
         );
     }
 
+
     @RequiresApi(api = Build.VERSION_CODES.N)
     public LayoutComponentsFilter() {
         exceptions.addPatterns(
@@ -194,9 +198,19 @@ public LayoutComponentsFilter() {
                 "set_reminder_button"
         );
 
-        final var joinMembership = new StringFilterGroup(
+        compactChannelBarInner = new StringFilterGroup(
                 Settings.HIDE_JOIN_MEMBERSHIP_BUTTON,
-                "compact_sponsor_button"
+                "compact_channel_bar_inner"
+        );
+
+        compactChannelBarInnerButton = new StringFilterGroup(
+                null,
+                "|button.eml|"
+        );
+
+        joinMembershipButton = new ByteArrayFilterGroup(
+                null,
+                "sponsorships"
         );
 
         final var channelWatermark = new StringFilterGroup(
@@ -233,7 +247,7 @@ public LayoutComponentsFilter() {
                 quickActions,
                 relatedVideos,
                 compactBanner,
-                joinMembership,
+                compactChannelBarInner,
                 medicalPanel,
                 videoQualityMenuFooter,
                 infoPanel,
@@ -265,6 +279,18 @@ public boolean isFiltered(@Nullable String identifier, String path, byte[] proto
 
         if (exceptions.matches(path)) return false; // Exceptions are not filtered.
 
+        if (matchedGroup == compactChannelBarInner) {
+            if (compactChannelBarInnerButton.check(path).isFiltered()) {
+                // The filter may be broad, but in the context of a compactChannelBarInnerButton,
+                // it's safe to assume that the button is the only thing that should be hidden.
+                if (joinMembershipButton.check(protobufBufferArray).isFiltered()) {
+                    return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+                }
+            }
+
+            return false;
+        }
+
         // TODO: This also hides the feed Shorts shelf header
         if (matchedGroup == searchResultShelfHeader && contentIndex != 0) return false;
 

app/src/main/java/app/revanced/integrations/youtube/patches/components/LithoFilterPatch.java

@@ -1,7 +1,6 @@
 package app.revanced.integrations.youtube.patches.components;
 
 import android.os.Build;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
@@ -15,8 +14,8 @@
 import java.util.function.Consumer;
 
 import app.revanced.integrations.shared.Logger;
-import app.revanced.integrations.shared.settings.BaseSettings;
 import app.revanced.integrations.shared.settings.BooleanSetting;
+import app.revanced.integrations.shared.settings.BaseSettings;
 import app.revanced.integrations.youtube.ByteTrieSearch;
 import app.revanced.integrations.youtube.StringTrieSearch;
 import app.revanced.integrations.youtube.TrieSearch;
@@ -123,7 +122,7 @@ public FilterGroupResult check(final String string) {
         if (isEnabled()) {
             for (String pattern : filters) {
                 if (!string.isEmpty()) {
-                    final int indexOf = pattern.indexOf(string);
+                    final int indexOf = string.indexOf(pattern);
                     if (indexOf >= 0) {
                         matchedIndex = indexOf;
                         matchedLength = pattern.length();

app/src/main/java/app/revanced/integrations/youtube/patches/components/ShortsFilter.java

@@ -21,13 +21,17 @@ public final class ShortsFilter extends Filter {
     private final ByteArrayFilterGroup shortsCompactFeedVideoBuffer;
 
     private final StringFilterGroup channelBar;
+    private final StringFilterGroup fullVideoLinkLabel;
+    private final StringFilterGroup videoTitle;
+    private final StringFilterGroup reelSoundMetadata;
     private final StringFilterGroup subscribeButton;
     private final StringFilterGroup subscribeButtonPaused;
     private final StringFilterGroup soundButton;
     private final StringFilterGroup infoPanel;
+    private final StringFilterGroup joinButton;
     private final StringFilterGroup shelfHeader;
 
-    private final StringFilterGroup videoActionButton;
+    private final StringFilterGroup actionBar;
     private final ByteArrayFilterGroupList videoActionButtonGroupList = new ByteArrayFilterGroupList();
 
     public ShortsFilter() {
@@ -64,7 +68,7 @@ public ShortsFilter() {
                 "/frame0.jpg");
 
         // Shorts player components.
-        var joinButton = new StringFilterGroup(
+        joinButton = new StringFilterGroup(
                 Settings.HIDE_SHORTS_JOIN_BUTTON,
                 "sponsor_button"
         );
@@ -84,6 +88,21 @@ public ShortsFilter() {
                 REEL_CHANNEL_BAR_PATH
         );
 
+        fullVideoLinkLabel = new StringFilterGroup(
+                Settings.HIDE_SHORTS_FULL_VIDEO_LINK_LABEL,
+                "reel_multi_format_link"
+        );
+
+        videoTitle = new StringFilterGroup(
+                Settings.HIDE_SHORTS_VIDEO_TITLE,
+                "shorts_video_title_item"
+        );
+
+        reelSoundMetadata = new StringFilterGroup(
+                Settings.HIDE_SHORTS_SOUND_METADATA_LABEL,
+                "reel_sound_metadata"
+        );
+
         soundButton = new StringFilterGroup(
                 Settings.HIDE_SHORTS_SOUND_BUTTON,
                 "reel_pivot_button"
@@ -94,15 +113,26 @@ public ShortsFilter() {
                 "shorts_info_panel_overview"
         );
 
-        videoActionButton = new StringFilterGroup(
+        actionBar = new StringFilterGroup(
                 null,
-                "ContainerType|shorts_video_action_button"
+                "shorts_action_bar"
         );
 
         addPathCallbacks(
                 shortsCompactFeedVideoPath,
                 joinButton, subscribeButton, subscribeButtonPaused,
-                channelBar, soundButton, infoPanel, videoActionButton
+                channelBar, fullVideoLinkLabel, videoTitle, reelSoundMetadata,
+                soundButton, infoPanel, actionBar
+        );
+
+        var shortsLikeButton = new ByteArrayFilterGroup(
+                Settings.HIDE_SHORTS_LIKE_BUTTON,
+                "shorts_like_button"
+        );
+
+        var shortsDislikeButton = new ByteArrayFilterGroup(
+                Settings.HIDE_SHORTS_DISLIKE_BUTTON,
+                "shorts_dislike_button"
         );
 
         var shortsCommentButton = new ByteArrayFilterGroup(
@@ -120,7 +150,13 @@ public ShortsFilter() {
                 "reel_remix_button"
         );
 
-        videoActionButtonGroupList.addAll(shortsCommentButton, shortsShareButton, shortsRemixButton);
+        videoActionButtonGroupList.addAll(
+                shortsLikeButton,
+                shortsDislikeButton,
+                shortsCommentButton,
+                shortsShareButton,
+                shortsRemixButton
+        );
     }
 
     @Override
@@ -131,6 +167,9 @@ boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBuff
             if (matchedGroup == soundButton ||
                     matchedGroup == infoPanel ||
                     matchedGroup == channelBar ||
+                    matchedGroup == fullVideoLinkLabel ||
+                    matchedGroup == videoTitle ||
+                    matchedGroup == reelSoundMetadata ||
                     matchedGroup == subscribeButtonPaused
             ) return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
 
@@ -141,8 +180,8 @@ boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBuff
                 return false;
             }
 
-            // Video action buttons (comment, share, remix) have the same path.
-            if (matchedGroup == videoActionButton) {
+            // Video action buttons (like, dislike, comment, share, remix) have the same path.
+            if (matchedGroup == actionBar) {
                 if (videoActionButtonGroupList.check(protobufBufferArray).isFiltered()) return super.isFiltered(
                         identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex
                 );
@@ -151,7 +190,9 @@ boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBuff
 
             // Filter other path groups from pathFilterGroupList, only when reelChannelBar is visible
             // to avoid false positives.
-            if (matchedGroup == subscribeButton) {
+            if (matchedGroup == subscribeButton ||
+                    matchedGroup == joinButton
+            ) {
                 if (path.startsWith(REEL_CHANNEL_BAR_PATH)) return super.isFiltered(
                         identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex
                 );

app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java

@@ -146,12 +146,17 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_SHORTS_SUBSCRIBE_BUTTON = new BooleanSetting("revanced_hide_shorts_subscribe_button", TRUE);
     public static final BooleanSetting HIDE_SHORTS_SUBSCRIBE_BUTTON_PAUSED = new BooleanSetting("revanced_hide_shorts_subscribe_button_paused", FALSE);
     public static final BooleanSetting HIDE_SHORTS_THANKS_BUTTON = new BooleanSetting("revanced_hide_shorts_thanks_button", TRUE);
+    public static final BooleanSetting HIDE_SHORTS_LIKE_BUTTON = new BooleanSetting("revanced_hide_shorts_like_button", FALSE);
+    public static final BooleanSetting HIDE_SHORTS_DISLIKE_BUTTON = new BooleanSetting("revanced_hide_shorts_dislike_button", FALSE);
     public static final BooleanSetting HIDE_SHORTS_COMMENTS_BUTTON = new BooleanSetting("revanced_hide_shorts_comments_button", FALSE);
     public static final BooleanSetting HIDE_SHORTS_REMIX_BUTTON = new BooleanSetting("revanced_hide_shorts_remix_button", TRUE);
     public static final BooleanSetting HIDE_SHORTS_SHARE_BUTTON = new BooleanSetting("revanced_hide_shorts_share_button", FALSE);
     public static final BooleanSetting HIDE_SHORTS_INFO_PANEL = new BooleanSetting("revanced_hide_shorts_info_panel", TRUE);
     public static final BooleanSetting HIDE_SHORTS_SOUND_BUTTON = new BooleanSetting("revanced_hide_shorts_sound_button", FALSE);
     public static final BooleanSetting HIDE_SHORTS_CHANNEL_BAR = new BooleanSetting("revanced_hide_shorts_channel_bar", FALSE);
+    public static final BooleanSetting HIDE_SHORTS_VIDEO_TITLE = new BooleanSetting("revanced_hide_shorts_video_title", FALSE);
+    public static final BooleanSetting HIDE_SHORTS_SOUND_METADATA_LABEL = new BooleanSetting("revanced_hide_shorts_sound_metadata_label", FALSE);
+    public static final BooleanSetting HIDE_SHORTS_FULL_VIDEO_LINK_LABEL = new BooleanSetting("revanced_hide_shorts_full_video_link_label", FALSE);
     public static final BooleanSetting HIDE_SHORTS_NAVIGATION_BAR = new BooleanSetting("revanced_hide_shorts_navigation_bar", TRUE, true);
 
     // Seekbar
@@ -201,7 +206,6 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting SPOOF_DEVICE_DIMENSIONS = new BooleanSetting("revanced_spoof_device_dimensions", FALSE, true);
     public static final BooleanSetting BYPASS_URL_REDIRECTS = new BooleanSetting("revanced_bypass_url_redirects", TRUE);
     public static final BooleanSetting ANNOUNCEMENTS = new BooleanSetting("revanced_announcements", TRUE);
-    public static final StringSetting ANNOUNCEMENT_CONSUMER = new StringSetting("revanced_announcement_consumer", "", false, false);
    @Deprecated
     public static final StringSetting DEPRECATED_ANNOUNCEMENT_LAST_HASH = new StringSetting("revanced_announcement_last_hash", "");
     public static final IntegerSetting ANNOUNCEMENT_LAST_ID = new IntegerSetting("revanced_announcement_last_id", -1);
@@ -355,6 +359,10 @@ public class Settings extends BaseSettings {
         }
 
 
+        // Remove any previously saved announcement consumer (a random generated string).
+        Setting.preferences.saveString("revanced_announcement_consumer", null);
+
+
         // endregion
     }
 }

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 android.useAndroidX = true
-version = 1.5.0-dev.7
+version = 1.5.0-dev.9