fix(YouTube - Hide Shorts components): Correctly hide Shorts if navigation tab is changed using device back button

app/src/main/java/app/revanced/integrations/youtube/patches/AlternativeThumbnailsPatch.java

@@ -1,19 +1,15 @@
 package app.revanced.integrations.youtube.patches;
 
+import static app.revanced.integrations.shared.StringRef.str;
+import static app.revanced.integrations.youtube.settings.Settings.*;
+import static app.revanced.integrations.youtube.shared.NavigationBar.NavigationButton;
+
 import android.net.Uri;
+
 import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import app.revanced.integrations.shared.settings.BaseSettings;
-import app.revanced.integrations.shared.settings.EnumSetting;
-import app.revanced.integrations.shared.settings.Setting;
-import app.revanced.integrations.youtube.settings.Settings;
-import app.revanced.integrations.shared.Logger;
-import app.revanced.integrations.shared.Utils;
-import app.revanced.integrations.youtube.shared.NavigationBar;
-import app.revanced.integrations.youtube.shared.PlayerType;
-
 import org.chromium.net.UrlRequest;
 import org.chromium.net.UrlResponseInfo;
 import org.chromium.net.impl.CronetUrlRequest;
@@ -26,13 +22,12 @@
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
-import static app.revanced.integrations.shared.StringRef.str;
-import static app.revanced.integrations.youtube.settings.Settings.ALT_THUMBNAIL_HOME;
-import static app.revanced.integrations.youtube.settings.Settings.ALT_THUMBNAIL_LIBRARY;
-import static app.revanced.integrations.youtube.settings.Settings.ALT_THUMBNAIL_PLAYER;
-import static app.revanced.integrations.youtube.settings.Settings.ALT_THUMBNAIL_SEARCH;
-import static app.revanced.integrations.youtube.settings.Settings.ALT_THUMBNAIL_SUBSCRIPTIONS;
-import static app.revanced.integrations.youtube.shared.NavigationBar.NavigationButton;
+import app.revanced.integrations.shared.Logger;
+import app.revanced.integrations.shared.Utils;
+import app.revanced.integrations.shared.settings.Setting;
+import app.revanced.integrations.youtube.settings.Settings;
+import app.revanced.integrations.youtube.shared.NavigationBar;
+import app.revanced.integrations.youtube.shared.PlayerType;
 
 /**
  * Alternative YouTube thumbnails.
@@ -134,11 +129,6 @@ public enum ThumbnailStillTime {
  */
  private static volatile long timeToResumeDeArrowAPICalls;
 
- /**
- * Used only for debug logging.
- */
- private static volatile EnumSetting<ThumbnailOption> currentOptionSetting;
-
  static {
  dearrowApiUri = validateSettings();
  final int port = dearrowApiUri.getPort();
@@ -162,23 +152,38 @@ private static Uri validateSettings() {
  return apiUri;
  }
 
- private static EnumSetting<ThumbnailOption> optionSettingForCurrentNavigation() {
+ private static ThumbnailOption optionSettingForCurrentNavigation() {
  // Must check player type first, as search bar can be active behind the player.
  if (PlayerType.getCurrent().isMaximizedOrFullscreen()) {
- return ALT_THUMBNAIL_PLAYER;
+ return ALT_THUMBNAIL_PLAYER.get();
  }
+
  // Must check second, as search can be from any tab.
  if (NavigationBar.isSearchBarActive()) {
- return ALT_THUMBNAIL_SEARCH;
+ return ALT_THUMBNAIL_SEARCH.get();
+ }
+
+ // Avoid checking which navigation button is selected, if all other settings are the same.
+ ThumbnailOption homeOption = ALT_THUMBNAIL_HOME.get();
+ ThumbnailOption subscriptionsOption = ALT_THUMBNAIL_SUBSCRIPTIONS.get();
+ ThumbnailOption libraryOption = ALT_THUMBNAIL_LIBRARY.get();
+ if ((homeOption == subscriptionsOption) && (homeOption == libraryOption)) {
+ return homeOption; // All are the same option.
  }
- if (NavigationButton.HOME.isSelected()) {
- return ALT_THUMBNAIL_HOME;
+
+ NavigationButton selectedNavButton = NavigationButton.getSelectedNavigationButton();
+ if (selectedNavButton == null) {
+ // Unknown tab, treat as the home tab;
+ return homeOption;
  }
- if (NavigationButton.SUBSCRIPTIONS.isSelected() || NavigationButton.NOTIFICATIONS.isSelected()) {
- return ALT_THUMBNAIL_SUBSCRIPTIONS;
+ if (selectedNavButton == NavigationButton.HOME) {
+ return homeOption;
+ }
+ if (selectedNavButton == NavigationButton.SUBSCRIPTIONS || selectedNavButton == NavigationButton.NOTIFICATIONS) {
+ return subscriptionsOption;
  }
  // A library tab variant is active.
- return ALT_THUMBNAIL_LIBRARY;
+ return libraryOption;
  }
 
  /**
@@ -256,14 +261,7 @@ private static void handleDeArrowError(@NonNull String url, int statusCode) {
  */
  public static String overrideImageURL(String originalUrl) {
  try {
- EnumSetting<ThumbnailOption> optionSetting = optionSettingForCurrentNavigation();
- ThumbnailOption option = optionSetting.get();
- if (BaseSettings.DEBUG.get()) {
- if (currentOptionSetting != optionSetting) {
- currentOptionSetting = optionSetting;
- Logger.printDebug(() -> "Changed to setting: " + optionSetting.key);
- }
- }
+ ThumbnailOption option = optionSettingForCurrentNavigation();
 
  if (option == ThumbnailOption.ORIGINAL) {
  return originalUrl;

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

@@ -112,37 +112,35 @@ final class KeywordContentFilter extends Filter {
 
  private volatile ByteTrieSearch bufferSearch;
 
- private static void logNavigationState(String state) {
- // Enable locally to debug filtering. Default off to reduce log spam.
- final boolean LOG_NAVIGATION_STATE = false;
- // noinspection ConstantValue
- if (LOG_NAVIGATION_STATE) {
- Logger.printDebug(() -> "Navigation state: " + state);
- }
- }
-
  private static boolean hideKeywordSettingIsActive() {
  // Must check player type first, as search bar can be active behind the player.
  if (PlayerType.getCurrent().isMaximizedOrFullscreen()) {
  // For now, consider the under video results the same as the home feed.
- logNavigationState("Player active");
  return Settings.HIDE_KEYWORD_CONTENT_HOME.get();
  }
  // Must check second, as search can be from any tab.
  if (NavigationBar.isSearchBarActive()) {
- logNavigationState("Search");
  return Settings.HIDE_KEYWORD_CONTENT_SEARCH.get();
  }
- if (NavigationButton.HOME.isSelected()) {
- logNavigationState("Home tab");
- return Settings.HIDE_KEYWORD_CONTENT_HOME.get();
+
+ // 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();
+ if (!hideHome && !hideSubscriptions) {
+ return false;
+ }
+
+ NavigationButton selectedNavButton = NavigationButton.getSelectedNavigationButton();
+ if (selectedNavButton == null) {
+ return hideHome; // Unknown tab, treat the same as home.
+ }
+ if (selectedNavButton == NavigationButton.HOME) {
+ return hideHome;
  }
- if (NavigationButton.SUBSCRIPTIONS.isSelected()) {
- logNavigationState("Subscription tab");
- return Settings.HIDE_SUBSCRIPTIONS_BUTTON.get();
+ if (selectedNavButton == NavigationButton.SUBSCRIPTIONS) {
+ return hideSubscriptions;
  }
  // User is in the Library or Notifications tab.
- logNavigationState("Ignored tab");
  return false;
  }
 

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

@@ -1,15 +1,17 @@
 package app.revanced.integrations.youtube.patches.components;
 
+import static app.revanced.integrations.youtube.shared.NavigationBar.NavigationButton;
+
 import android.os.Build;
 import android.view.View;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
-import app.revanced.integrations.shared.Utils;
-import app.revanced.integrations.youtube.settings.Settings;
 import app.revanced.integrations.shared.Logger;
+import app.revanced.integrations.shared.Utils;
 import app.revanced.integrations.youtube.StringTrieSearch;
+import app.revanced.integrations.youtube.settings.Settings;
 import app.revanced.integrations.youtube.shared.NavigationBar;
 import app.revanced.integrations.youtube.shared.PlayerType;
 
@@ -366,13 +368,18 @@ public static void hideShowMoreButton(View view) {
  }
 
  private static boolean hideShelves() {
+ // If the player is opened while library is selected,
+ // then filter any recommendations below the player.
+ if (PlayerType.getCurrent().isMaximizedOrFullscreen()
+ // Or if the search is active while library is selected, then also filter.
+ || NavigationBar.isSearchBarActive()) {
+ return true;
+ }
+
+ // Check navigation button last.
  // Only filter if the library tab is not selected.
  // This check is important as the shelf layout is used for the library tab playlists.
- return !NavigationBar.NavigationButton.libraryOrYouTabIsSelected()
- // But if the player is opened while library is selected,
- // then still filter any recommendations below the player.
- || PlayerType.getCurrent().isMaximizedOrFullscreen()
- // Or if the search is active while library is selected, then also filter.
- || NavigationBar.isSearchBarActive();
+ NavigationButton selectedNavButton = NavigationButton.getSelectedNavigationButton();
+ return selectedNavButton != null && !selectedNavButton.isLibraryOrYouTab();
  }
 }

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

@@ -1,6 +1,7 @@
 package app.revanced.integrations.youtube.patches.components;
 
 import static app.revanced.integrations.shared.Utils.hideViewUnderCondition;
+import static app.revanced.integrations.youtube.shared.NavigationBar.NavigationButton;
 
 import android.view.View;
 
@@ -224,16 +225,30 @@ private static boolean shouldHideShortsFeedItems() {
  // For now, consider the under video results the same as the home feed.
  return Settings.HIDE_SHORTS_HOME.get();
  }
+
  // Must check second, as search can be from any tab.
  if (NavigationBar.isSearchBarActive()) {
  return Settings.HIDE_SHORTS_SEARCH.get();
  }
- if (NavigationBar.NavigationButton.HOME.isSelected()) {
- return Settings.HIDE_SHORTS_HOME.get();
+
+ // Avoid checking navigation button status if all other settings are off.
+ final boolean hideHome = Settings.HIDE_SHORTS_HOME.get();
+ final boolean hideSubscriptions = Settings.HIDE_SHORTS_SUBSCRIPTIONS.get();
+ if (!hideHome && !hideSubscriptions) {
+ return false;
+ }
+
+ NavigationButton selectedNavButton = NavigationButton.getSelectedNavigationButton();
+ if (selectedNavButton == null) {
+ return hideHome; // Unknown tab, treat the same as home.
+ }
+ if (selectedNavButton == NavigationButton.HOME) {
+ return hideHome;
  }
- if (NavigationBar.NavigationButton.SUBSCRIPTIONS.isSelected()) {
- return Settings.HIDE_SHORTS_SUBSCRIPTIONS.get();
+ if (selectedNavButton == NavigationButton.SUBSCRIPTIONS) {
+ return hideSubscriptions;
  }
+ // User must be in the library tab. Don't hide the history or any playlists here.
  return false;
  }