From 8afbef01343c1e3e6e7e4a4cec6319aebfa4b11c Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 5 Jun 2025 16:55:33 -0300
Subject: [PATCH] fix(Spotify): Prevent hiding all navigation bar buttons
 (#5122)

---
 .../hide/createbutton/HideCreateButtonPatch.java       | 10 ++++++++++
 .../extension/spotify/misc/UnlockPremiumPatch.java     |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/extensions/spotify/src/main/java/app/revanced/extension/spotify/layout/hide/createbutton/HideCreateButtonPatch.java b/extensions/spotify/src/main/java/app/revanced/extension/spotify/layout/hide/createbutton/HideCreateButtonPatch.java
index a96ca0cb2..6c0975a90 100644
--- a/extensions/spotify/src/main/java/app/revanced/extension/spotify/layout/hide/createbutton/HideCreateButtonPatch.java
+++ b/extensions/spotify/src/main/java/app/revanced/extension/spotify/layout/hide/createbutton/HideCreateButtonPatch.java
@@ -37,6 +37,11 @@ public final class HideCreateButtonPatch {
         String matchedTitleResId = null;
 
         for (String titleResId : CREATE_BUTTON_TITLE_RES_ID_LIST) {
+            // In case the resource id has not been found.
+            if (titleResId.equals("0")) {
+                continue;
+            }
+
             if (stringifiedNavigationBarItem.contains(titleResId)) {
                 isCreateButton = true;
                 matchedTitleResId = titleResId;
@@ -58,6 +63,11 @@ public final class HideCreateButtonPatch {
      * Create button.
      */
     public static boolean isOldCreateButton(int oldNavigationBarItemTitleResId) {
+        // In case the resource id has not been found.
+        if (OLD_CREATE_BUTTON_TITLE_RES_ID == 0) {
+            return false;
+        }
+
         boolean isCreateButton = oldNavigationBarItemTitleResId == OLD_CREATE_BUTTON_TITLE_RES_ID;
 
         if (isCreateButton) {
diff --git a/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/UnlockPremiumPatch.java b/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/UnlockPremiumPatch.java
index 065bbb8f9..d455ee6ac 100644
--- a/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/UnlockPremiumPatch.java
+++ b/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/UnlockPremiumPatch.java
@@ -216,6 +216,12 @@ public final class UnlockPremiumPatch {
 
             for (int i = 0; i < stringList.size(); i++) {
                 String string = stringList.get(i);
+
+                // In case the string is a resource id, and it has not been found.
+                if (string.equals("0")) {
+                    continue;
+                }
+
                 if (!stringifiedContextMenuItem.contains(string)) {
                     allMatch = false;
                     break;