From b3e6c215cc71edc6ed1ca991cf6dd78b7a602bdb Mon Sep 17 00:00:00 2001 From: Nuckyz <61953774+Nuckyz@users.noreply.github.com> Date: Fri, 11 Jul 2025 12:38:33 -0300 Subject: [PATCH] fix(Spotify - Unlock Premium): Remove wrongfully hidden non ad browse sections (#5403) --- .../hide/createbutton/HideCreateButtonPatch.java | 12 ++++++++---- .../com/spotify/browsita/v1/resolved/Section.java | 2 -- 2 files changed, 8 insertions(+), 6 deletions(-) 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 c7d2a0754..1ed2e771f 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 @@ -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 final class HideCreateButtonPatch { 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); } diff --git a/extensions/spotify/stub/src/main/java/com/spotify/browsita/v1/resolved/Section.java b/extensions/spotify/stub/src/main/java/com/spotify/browsita/v1/resolved/Section.java index db64230eb..af3fd9aa3 100644 --- a/extensions/spotify/stub/src/main/java/com/spotify/browsita/v1/resolved/Section.java +++ b/extensions/spotify/stub/src/main/java/com/spotify/browsita/v1/resolved/Section.java @@ -2,7 +2,5 @@ package com.spotify.browsita.v1.resolved; 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_; }