chore(release): 0.103.1-dev.1 [skip ci]

## [0.103.1-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.103.0...v0.103.1-dev.1) (2023-04-22) ### Bug Fixes * **youtube/sponsorblock:** Include milliseconds in the voting menu ([#362](https://github.com/revanced/revanced-integrations/issues/362)) ([1ada30d](1ada30d5c9))
fix(youtube/sponsorblock): Include milliseconds in the voting menu (#362 )
2025-11-21 18:35:37 +01:00 · 2023-04-22 21:55:11 +00:00 · 2023-04-23 01:52:41 +04:00 · 2023-04-21 21:37:53 +04:00
9 changed files with 46 additions and 124 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,48 +1,3 @@
-## [0.104.1-dev.2](https://github.com/revanced/revanced-integrations/compare/v0.104.1-dev.1...v0.104.1-dev.2) (2023-04-25)
-
-
-### Bug Fixes
-
-* **youtube/spoof-signature-verification:** additional fixes for subtitle window positions ([#369](https://github.com/revanced/revanced-integrations/issues/369)) ([6f2ae31](https://github.com/revanced/revanced-integrations/commit/6f2ae313cf492166d64e5e33e759f2b234191b64))
-
-## [0.104.1-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.104.0...v0.104.1-dev.1) (2023-04-25)
-
-
-### Bug Fixes
-
-* **youtube/return-youtube-dislike:** fix dislikes using wrong font if dark mode is enabled during video playback ([#368](https://github.com/revanced/revanced-integrations/issues/368)) ([3b37a3b](https://github.com/revanced/revanced-integrations/commit/3b37a3b41f7bfbc4a6d6d12e2deb2acd9bb2ccc8))
-
-# [0.104.0](https://github.com/revanced/revanced-integrations/compare/v0.103.0...v0.104.0) (2023-04-24)
-
-
-### Bug Fixes
-
-* **spoof-wifi-connection:** fixed crash when wifi is disabled ([#363](https://github.com/revanced/revanced-integrations/issues/363)) ([7fc8e88](https://github.com/revanced/revanced-integrations/commit/7fc8e882d8d268484b6e273fdb0371db2feef1d3))
-* **youtube/hide-video-action-buttons:** fix hide action buttons not working for some users ([#366](https://github.com/revanced/revanced-integrations/issues/366)) ([246deb1](https://github.com/revanced/revanced-integrations/commit/246deb16020adda26d9d0a0449157f4855678d18))
-* **youtube/sponsorblock:** Include milliseconds in the voting menu ([#362](https://github.com/revanced/revanced-integrations/issues/362)) ([6952c50](https://github.com/revanced/revanced-integrations/commit/6952c505957153d7fdeb7ee42b3f824c155993f5))
-
-
-### Features
-
-* **youtube/wide-searchbar:** rename patch ([8493f57](https://github.com/revanced/revanced-integrations/commit/8493f57879f0075c73932240b61bf0c52efda0ed))
-* **youtube:** remove non working patch `hide-my-mix` ([436a84e](https://github.com/revanced/revanced-integrations/commit/436a84ee0785e5b0bed1b9a4a02b5be86eff4a4a))
-
-# [0.104.0-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.103.1-dev.2...v0.104.0-dev.1) (2023-04-24)
-
-
-### Features
-
-* **youtube/wide-searchbar:** rename patch ([2320880](https://github.com/revanced/revanced-integrations/commit/2320880a42bf37335ececf1f8e6cb83bd57f347d))
-* **youtube:** bump compatibility to `18.15.40` ([#367](https://github.com/revanced/revanced-integrations/issues/367)) ([52a3193](https://github.com/revanced/revanced-integrations/commit/52a31930870b838e766d08c3203bd8cd7ae443ba))
-* **youtube:** remove non working patch `hide-my-mix` ([98edcdd](https://github.com/revanced/revanced-integrations/commit/98edcdd589c0d3615530b44c8bbaeb94ae599afb))
-
-## [0.103.1-dev.2](https://github.com/revanced/revanced-integrations/compare/v0.103.1-dev.1...v0.103.1-dev.2) (2023-04-23)
-
-
-### Bug Fixes
-
-* **youtube/hide-video-action-buttons:** fix hide action buttons not working for some users ([#366](https://github.com/revanced/revanced-integrations/issues/366)) ([afd9b6e](https://github.com/revanced/revanced-integrations/commit/afd9b6e30566d735075c16d3f5173e406c965a8c))
-
 ## [0.103.1-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.103.0...v0.103.1-dev.1) (2023-04-22)


--- a/app/src/main/java/app/revanced/integrations/patches/ButtonsPatch.java
+++ b/app/src/main/java/app/revanced/integrations/patches/ButtonsPatch.java
@@ -11,8 +11,7 @@ final class ButtonsPatch extends Filter {
                new BlockRule(SettingsEnum.HIDE_LIKE_DISLIKE_BUTTON, "|like_button", "dislike_button"),
                new BlockRule(SettingsEnum.HIDE_DOWNLOAD_BUTTON, "download_button"),
                new BlockRule(SettingsEnum.HIDE_PLAYLIST_BUTTON, "save_to_playlist_button"),
-                new BlockRule(SettingsEnum.HIDE_CLIP_BUTTON, "|clip_button.eml|"),
-                new BlockRule(SettingsEnum.HIDE_ACTION_BUTTONS, "ContainerType|video_action_button", "|CellType|CollectionType|CellType|ContainerType|button.eml|")
+                new BlockRule(SettingsEnum.HIDE_ACTION_BUTTONS, "ContainerType|video_action_button")
        );
    }

--- a/app/src/main/java/app/revanced/integrations/patches/HideMixPlaylistsPatch.java
+++ b/app/src/main/java/app/revanced/integrations/patches/HideMixPlaylistsPatch.java
@@ -0,0 +1,14 @@
+package app.revanced.integrations.patches;
+
+import android.view.View;
+
+import app.revanced.integrations.adremover.AdRemoverAPI;
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class HideMixPlaylistsPatch {
+
+    public static void hideMixPlaylists(View view) {
+        if (!SettingsEnum.HIDE_MIX_PLAYLISTS.getBoolean()) return;
+        AdRemoverAPI.HideViewWithLayout1dp(view);
+    }
+}
--- a/app/src/main/java/app/revanced/integrations/patches/NewActionbarPatch.java
+++ b/app/src/main/java/app/revanced/integrations/patches/NewActionbarPatch.java
@@ -0,0 +1,12 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class NewActionbarPatch {
+
+    //Used by app.revanced.patches.youtube.layout.widesearchbar.patch.WideSearchbarPatch
+    public static boolean getNewActionBar() {
+        return SettingsEnum.WIDE_SEARCHBAR.getBoolean(); // TODO: maybe this has to be inverted
+    }
+
+}
--- a/app/src/main/java/app/revanced/integrations/patches/SpoofSignatureVerificationPatch.java
+++ b/app/src/main/java/app/revanced/integrations/patches/SpoofSignatureVerificationPatch.java
@@ -1,15 +1,12 @@
 package app.revanced.integrations.patches;

-import static app.revanced.integrations.utils.ReVancedUtils.containsAny;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.shared.PlayerType;
 import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;

+import static app.revanced.integrations.utils.ReVancedUtils.containsAny;
+
 public class SpoofSignatureVerificationPatch {
    /**
     * Protobuf parameters used for autoplay in scrim.
@@ -31,14 +28,6 @@ public class SpoofSignatureVerificationPatch {
            "SAFg"  // Autoplay in scrim
    };

-    @Nullable
-    private static String currentVideoId;
-
-    /**
-     * If any of the subtitles settings encountered from the current video have been non default values.
-     */
-    private static boolean nonDefaultSubtitlesEncountered;
-
    /**
     * Injection point.
     *
@@ -60,7 +49,7 @@ public class SpoofSignatureVerificationPatch {
            if (isPlayingFeed) {
                // Videos in feed won't autoplay with sound.
                return PROTOBUF_PARAMETER_SCRIM + PROTOBUF_PARAMETER_SHORTS;
-            } else {
+            } else{
                // Spoof the parameter to prevent playback issues.
                return PROTOBUF_PARAMETER_SHORTS;
            }
@@ -132,40 +121,21 @@ public class SpoofSignatureVerificationPatch {
        // Videos with custom captions that specify screen positions appear to always have correct screen positions (even with spoofing).
        // But for auto generated and most other captions, the spoof incorrectly gives various default Shorts caption settings.
        // Check for these known default shorts captions parameters, and replace with the known correct values.
-        //
-        // If a regular video uses a custom subtitle setting that match a default short setting,
-        // then this will incorrectly replace the setting.
-        // But, if the video uses multiple subtitles in different screen locations, then detect the non-default values
-        // and do not replace any window settings for the video (regardless if they match a shorts default).
-        if (signatureSpoofing && !nonDefaultSubtitlesEncountered && !PlayerType.getCurrent().isNoneOrHidden()) {
+        if (signatureSpoofing && !PlayerType.getCurrent().isNoneOrHidden()) { // video is not a Short or Story
            for (SubtitleWindowReplacementSettings setting : SubtitleWindowReplacementSettings.values()) {
                if (setting.match(ap, ah, av, vs, sd)) {
                    return setting.replacementSetting();
                }
            }
-            // Settings appear to be custom subtitles.
-            nonDefaultSubtitlesEncountered = true;
-            LogHelper.printDebug(() -> "Non default subtitles found. Using existing settings without replacement.");
+            // Parameters are either subtitles with custom positions, or a set of unidentified (and incorrect) default parameters.
+            // The subtitles could be forced to the bottom no matter what, but that would override custom screen positions.
+            // For now, just return the original parameters.
        }

+        // No matches, pass back the original values
        return new int[]{ap, ah, av};
    }

-    /**
-     * Injection point.
-     */
-    public static void setCurrentVideoId(@NonNull String videoId) {
-        try {
-            if (videoId.equals(currentVideoId)) {
-                return;
-            }
-            currentVideoId = videoId;
-            nonDefaultSubtitlesEncountered = false;
-        } catch (Exception ex) {
-            LogHelper.printException(() -> "setCurrentVideoId failure", ex);
-        }
-    }
-

    /**
     * Known incorrect default Shorts subtitle parameters, and the corresponding correct (non-Shorts) values.
@@ -182,8 +152,8 @@ public class SpoofSignatureVerificationPatch {
        final int ap, ah, av;
        final boolean vs, sd;

-        // replacement int values
-        final int[] replacement;
+        // replacement values
+        final int replacementAp, replacementAh, replacementAv;

        SubtitleWindowReplacementSettings(int ap, int ah, int av, boolean vs, boolean sd,
                                          int replacementAp, int replacementAh, int replacementAv) {
@@ -192,7 +162,9 @@ public class SpoofSignatureVerificationPatch {
            this.av = av;
            this.vs = vs;
            this.sd = sd;
-            this.replacement = new int[]{replacementAp, replacementAh, replacementAv};
+            this.replacementAp = replacementAp;
+            this.replacementAh = replacementAh;
+            this.replacementAv = replacementAv;
        }

        boolean match(int ap, int ah, int av, boolean vs, boolean sd) {
@@ -200,7 +172,7 @@ public class SpoofSignatureVerificationPatch {
        }

        int[] replacementSetting() {
-            return replacement;
+            return new int[]{replacementAp, replacementAh, replacementAv};
        }
    }
 }
--- a/app/src/main/java/app/revanced/integrations/patches/WideSearchbarPatch.java
+++ b/app/src/main/java/app/revanced/integrations/patches/WideSearchbarPatch.java
@@ -1,9 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public final class WideSearchbarPatch {
-    public static boolean enableWideSearchbar() {
-        return SettingsEnum.WIDE_SEARCHBAR.getBoolean();
-    }
-}
--- a/app/src/main/java/app/revanced/integrations/returnyoutubedislike/ReturnYouTubeDislike.java
+++ b/app/src/main/java/app/revanced/integrations/returnyoutubedislike/ReturnYouTubeDislike.java
@@ -15,7 +15,6 @@ import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
-import android.text.style.ForegroundColorSpan;
 import android.text.style.ImageSpan;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
@@ -258,11 +257,12 @@ public class ReturnYouTubeDislike {
        try {
            synchronized (videoIdLockObject) {
                if (replacementLikeDislikeSpan != null) {
-                    if (spansHaveEqualTextAndColor(replacementLikeDislikeSpan, oldSpannable)) {
+                    String oldSpannableString = oldSpannable.toString();
+                    if (replacementLikeDislikeSpan.toString().equals(oldSpannableString)) {
                        LogHelper.printDebug(() -> "Ignoring previously created dislikes span");
                        return null;
                    }
-                    if (spansHaveEqualTextAndColor(Objects.requireNonNull(originalDislikeSpan), oldSpannable)) {
+                    if (originalDislikeSpan.toString().equals(oldSpannableString)) {
                        LogHelper.printDebug(() -> "Replacing span with previously created dislike span");
                        return replacementLikeDislikeSpan;
                    }
@@ -470,27 +470,6 @@ public class ReturnYouTubeDislike {
        return false;
    }

-    private static boolean spansHaveEqualTextAndColor(@NonNull Spanned one, @NonNull Spanned two) {
-        // Cannot use equals on the span, because many of the inner styling spans do not implement equals.
-        // Instead, compare the underlying text and the text color to handle when dark mode is changed.
-        // Cannot compare the status of device dark mode, as Litho components are updated just before dark mode status changes.
-        if (!one.toString().equals(two.toString())) {
-            return false;
-        }
-        ForegroundColorSpan[] oneColors = one.getSpans(0, one.length(), ForegroundColorSpan.class);
-        ForegroundColorSpan[] twoColors = two.getSpans(0, two.length(), ForegroundColorSpan.class);
-        final int oneLength = oneColors.length;
-        if (oneLength != twoColors.length) {
-            return false;
-        }
-        for (int i = 0; i < oneLength; i++) {
-            if (oneColors[i].getForegroundColor() != twoColors[i].getForegroundColor()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
    private static SpannableString newSpannableWithDislikes(@NonNull Spanned sourceStyling, @NonNull RYDVoteData voteData) {
        return newSpanUsingStylingOfAnotherSpan(sourceStyling,
                SettingsEnum.RYD_SHOW_DISLIKE_PERCENTAGE.getBoolean()
--- a/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java
+++ b/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java
@@ -74,7 +74,6 @@ public enum SettingsEnum {
    HIDE_LIKE_DISLIKE_BUTTON("revanced_hide_like_dislike_button", BOOLEAN, FALSE),
    HIDE_DOWNLOAD_BUTTON("revanced_hide_download_button", BOOLEAN, FALSE),
    HIDE_PLAYLIST_BUTTON("revanced_hide_playlist_button", BOOLEAN, FALSE),
-    HIDE_CLIP_BUTTON("revanced_hide_clip_button", BOOLEAN, FALSE, "revanced_hide_clip_button_user_dialog_message"),
    HIDE_ACTION_BUTTONS("revanced_hide_action_buttons", BOOLEAN, FALSE),

    // Layout settings
@@ -93,6 +92,7 @@ public enum SettingsEnum {
    HIDE_FLOATING_MICROPHONE_BUTTON("revanced_hide_floating_microphone_button", BOOLEAN, TRUE, true),
    HIDE_FULLSCREEN_PANELS("revanced_hide_fullscreen_panels", BOOLEAN, TRUE),
    HIDE_INFO_CARDS("revanced_hide_infocards", BOOLEAN, TRUE),
+    HIDE_MIX_PLAYLISTS("revanced_hide_mix_playlists", BOOLEAN, FALSE, true),
    HIDE_PLAYER_BUTTONS("revanced_hide_player_buttons", BOOLEAN, FALSE),
    HIDE_PREVIEW_COMMENT("revanced_hide_preview_comment", BOOLEAN, FALSE, true),
    HIDE_SEEKBAR("revanced_hide_seekbar", BOOLEAN, FALSE),
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.jvmargs = -Xmx2048m
 android.useAndroidX = true
-version = 0.104.1-dev.2
+version = 0.103.1-dev.1
Author	SHA1	Message	Date
semantic-release-bot	5e6d9ed9cd	chore(release): 0.103.1-dev.1 [skip ci] ## [0.103.1-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.103.0...v0.103.1-dev.1) (2023-04-22) ### Bug Fixes * youtube/sponsorblock: Include milliseconds in the voting menu ([#362](https://github.com/revanced/revanced-integrations/issues/362)) ([`1ada30d`](`1ada30d5c9`))	2023-04-22 21:55:11 +00:00
cane	1ada30d5c9	fix(youtube/sponsorblock): Include milliseconds in the voting menu (#362 )	2023-04-23 01:52:41 +04:00
LisoUseInAIKyrios	f20f6c24b3	fix:(spoof-wifi-connection): fixed crash when wifi is disabled (#363 )	2023-04-21 21:37:53 +04:00