fix(Spotify - Unlock Premium): Remove wrongfully hidden non ad browse sections (#5403)

Author: Nuckyz

extensions/spotify/src/main/java/app/revanced/extension/spotify/layout/hide/createbutton/HideCreateButtonPatch.java

@@ -1,9 +1,11 @@
 package app.revanced.extension.spotify.layout.hide.createbutton;
 
-import java.util.List;
-
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.spotify.shared.ComponentFilters.*;
+import app.revanced.extension.spotify.shared.ComponentFilters.ComponentFilter;
+import app.revanced.extension.spotify.shared.ComponentFilters.ResourceIdComponentFilter;
+import app.revanced.extension.spotify.shared.ComponentFilters.StringComponentFilter;
+
+import java.util.List;
 
 @SuppressWarnings("unused")
 public final class HideCreateButtonPatch {
@@ -53,7 +55,9 @@ public static Object returnNullIfIsCreateButton(Object navigationBarItem) {
                     return null;
                 }
             }
-        } catch (Exception ex) {
+        } catch (Throwable ex) {
+            // Catch Throwable as calling toString can cause crashes with wrongfully generated code that throws
+            // NoSuchMethod errors.
             Logger.printException(() -> "returnNullIfIsCreateButton failure", ex);
         }
 

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/UnlockPremiumPatch.java

@@ -88,9 +88,7 @@ private static class OverrideAttribute {
      * response which delivers browse sections.
      */
     private static final List<Integer> REMOVED_BROWSE_SECTIONS = List.of(
-            com.spotify.browsita.v1.resolved.Section.BRAND_ADS_FIELD_NUMBER,
-            com.spotify.browsita.v1.resolved.Section.PROMOTION_V1_FIELD_NUMBER,
-            com.spotify.browsita.v1.resolved.Section.PROMOTION_V3_FIELD_NUMBER
+            com.spotify.browsita.v1.resolved.Section.BRAND_ADS_FIELD_NUMBER
     );
 
     /**
@@ -249,7 +247,9 @@ public static boolean isFilteredContextMenuItem(Object contextMenuItem) {
                     return true;
                 }
             }
-        } catch (Exception ex) {
+        } catch (Throwable ex) {
+            // Catch Throwable as calling toString can cause crashes with wrongfully generated code that throws
+            // NoSuchMethod errors.
             Logger.printException(() -> "isFilteredContextMenuItem failure", ex);
         }
 

extensions/spotify/stub/src/main/java/com/spotify/browsita/v1/resolved/Section.java

@@ -2,7 +2,5 @@
 
 public final class Section {
     public static final int BRAND_ADS_FIELD_NUMBER = 6;
-    public static final int PROMOTION_V1_FIELD_NUMBER = 3;
-    public static final int PROMOTION_V3_FIELD_NUMBER = 5;
     public int sectionTypeCase_;
 }