chore(release): 0.101.0-dev.2 [skip ci]

# [0.101.0-dev.2](https://github.com/revanced/revanced-integrations/compare/v0.101.0-dev.1...v0.101.0-dev.2) (2023-03-19)

### Bug Fixes

* **youtube/remember-playback-speed:**  allow to not remember playback speed ([#338](https://github.com/revanced/revanced-integrations/issues/338)) ([7627e5d](7627e5d057))

.github/workflows/pull_request.yml

@@ -21,5 +21,10 @@ jobs:
         with:
           destination_branch: 'main'
           pr_title: 'chore: ${{ env.MESSAGE }}'
-          pr_body: 'This pull request will ${{ env.MESSAGE }}.'
+          pr_body: |
+            This pull request will ${{ env.MESSAGE }}.
+            
+            ## Dependencies before merge
+
+            - [] https://github.com/revanced/revanced-patches
           pr_draft: true

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release
 on:
   workflow_dispatch:
   push:
-    branches: 
+    branches:
       - main
       - dev
   pull_request:
@@ -16,7 +16,7 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     steps:
-    - name: Cancel previou runs
+    - name: Cancel previous runs
       uses: styfle/cancel-workflow-action@0.11.0
     - name: Checkout
       uses: actions/checkout@v3
@@ -33,11 +33,11 @@ jobs:
     - name: Setup Node.js
       uses: actions/setup-node@v3
       with:
-        node-version: "latest"
+        node-version: "18"
         cache: 'npm'
     - name: Setup semantic-release
-      run: npm install semantic-release@19.0.5 @saithodev/semantic-release-backmerge @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin@1.7.4 -D
+      run: npm install
     - name: Release
       env:
         GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
-      run: npx semantic-release
+      run: npm exec semantic-release

.releaserc

@@ -34,7 +34,7 @@
     [
       "@saithodev/semantic-release-backmerge",
       {
-        branches: [{from: "main", to: "dev"}],
+        backmergeBranches: [{"from": "main", "to": "dev"}],
         clearWorkspace: true
       }
     ]

app/build.gradle.kts

@@ -1,6 +1,3 @@
-import java.io.FileInputStream
-import java.util.Properties
-
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
@@ -47,7 +44,7 @@ android {
 dependencies {
     compileOnly(project(mapOf("path" to ":dummy")))
     compileOnly("androidx.annotation:annotation:1.5.0")
-    compileOnly("androidx.appcompat:appcompat:1.5.1")
+    compileOnly("androidx.appcompat:appcompat:1.6.1")
     compileOnly("com.squareup.okhttp3:okhttp:5.0.0-alpha.11")
     compileOnly("com.squareup.retrofit2:retrofit:2.9.0")
 }

app/src/main/java/app/revanced/integrations/patches/CommentsPatch.java

@@ -9,7 +9,7 @@ final class CommentsPatch extends Filter {
         var comments = new BlockRule(SettingsEnum.HIDE_COMMENTS_SECTION, "video_metadata_carousel", "_comments");
         var previewComment = new BlockRule(
                 SettingsEnum.HIDE_PREVIEW_COMMENT,
-                "carousel_item",
+                "|carousel_item",
                 "comments_entry_point_teaser",
                 "comments_entry_point_simplebox"
         );

app/src/main/java/app/revanced/integrations/patches/FixPlaybackPatch.java

@@ -1,40 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-
-public final class FixPlaybackPatch {
-    private static Thread currentThread = null;
-    private static String videoId;
-
-    public static void newVideoLoaded(final String videoId) {
-        if (!SettingsEnum.FIX_PLAYBACK.getBoolean()) return;
-
-        if (videoId.equals(FixPlaybackPatch.videoId)) return;
-        else FixPlaybackPatch.videoId = videoId;
-
-        if (currentThread != null) {
-            currentThread.interrupt();
-        }
-
-        currentThread = new Thread(() -> {
-            try {
-                while (true) {
-                    var currentVideoTime = VideoInformation.getVideoTime();
-
-                    if (currentVideoTime > -1) {
-                        VideoInformation.seekTo(Integer.MAX_VALUE);
-                        VideoInformation.seekTo(currentVideoTime);
-                        return;
-                    }
-
-                    Thread.sleep(10);
-                }
-            } catch (InterruptedException e) {
-                LogHelper.printDebug(() -> "Thread was interrupted");
-            }
-        });
-
-        currentThread.start();
-    }
-}

app/src/main/java/app/revanced/integrations/patches/FullscreenPanelsRemoverPatch.java

@@ -1,13 +1,10 @@
 package app.revanced.integrations.patches;
 
 import android.view.View;
-
 import app.revanced.integrations.settings.SettingsEnum;
 
 public class FullscreenPanelsRemoverPatch {
-
     public static int getFullscreenPanelsVisibility() {
         return SettingsEnum.HIDE_FULLSCREEN_PANELS.getBoolean() ? View.GONE : View.VISIBLE;
     }
-
 }

app/src/main/java/app/revanced/integrations/patches/GeneralAdsPatch.java

@@ -1,7 +1,6 @@
 package app.revanced.integrations.patches;
 
 import android.view.View;
-
 import app.revanced.integrations.adremover.AdRemoverAPI;
 import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.utils.LogHelper;
@@ -27,22 +26,27 @@ public final class GeneralAdsPatch extends Filter {
         var subscribersCommunityGuidelines = new BlockRule(SettingsEnum.ADREMOVER_SUBSCRIBERS_COMMUNITY_GUIDELINES_REMOVAL, "sponsorships_comments_upsell");
         var channelMemberShelf = new BlockRule(SettingsEnum.ADREMOVER_CHANNEL_MEMBER_SHELF_REMOVAL, "member_recognition_shelf");
         var compactBanner = new BlockRule(SettingsEnum.ADREMOVER_COMPACT_BANNER_REMOVAL, "compact_banner");
-        var inFeedSurvey = new BlockRule(SettingsEnum.ADREMOVER_FEED_SURVEY_REMOVAL, "in_feed_survey");
+        var inFeedSurvey = new BlockRule(SettingsEnum.ADREMOVER_FEED_SURVEY_REMOVAL, "in_feed_survey", "slimline_survey");
         var medicalPanel = new BlockRule(SettingsEnum.ADREMOVER_MEDICAL_PANEL_REMOVAL, "medical_panel");
         var paidContent = new BlockRule(SettingsEnum.ADREMOVER_PAID_CONTENT_REMOVAL, "paid_content_overlay");
         var merchandise = new BlockRule(SettingsEnum.ADREMOVER_MERCHANDISE_REMOVAL, "product_carousel");
         var infoPanel = new BlockRule(SettingsEnum.ADREMOVER_INFO_PANEL_REMOVAL, "publisher_transparency_panel", "single_item_information_panel");
-        var suggestions = new BlockRule(SettingsEnum.ADREMOVER_SUGGESTIONS_REMOVAL, "horizontal_video_shelf");
         var latestPosts = new BlockRule(SettingsEnum.ADREMOVER_HIDE_LATEST_POSTS, "post_shelf");
         var channelGuidelines = new BlockRule(SettingsEnum.ADREMOVER_HIDE_CHANNEL_GUIDELINES, "channel_guidelines_entry_banner");
-        var artistCard = new BlockRule(SettingsEnum.HIDE_ARTIST_CARD, "official_card");
+        var artistCard = new BlockRule(SettingsEnum.HIDE_ARTIST_CARDS, "official_card");
         var selfSponsor = new BlockRule(SettingsEnum.ADREMOVER_SELF_SPONSOR_REMOVAL, "cta_shelf_card");
-        var chapterTeaser = new BlockRule(SettingsEnum.ADREMOVER_CHAPTER_TEASER_REMOVAL, "expandable_metadata");
+        var chapterTeaser = new BlockRule(SettingsEnum.ADREMOVER_CHAPTER_TEASER_REMOVAL, "expandable_metadata", "macro_markers_carousel");
+        var viewProducts = new BlockRule(SettingsEnum.ADREMOVER_VIEW_PRODUCTS, "product_item", "products_in_video");
+        var webLinkPanel = new BlockRule(SettingsEnum.ADREMOVER_WEB_SEARCH_RESULTS, "web_link_panel");
+        var channelBar = new BlockRule(SettingsEnum.ADREMOVER_CHANNEL_BAR, "channel_bar");
+        var relatedVideos = new BlockRule(SettingsEnum.ADREMOVER_RELATED_VIDEOS, "fullscreen_related_videos");
+        var quickActions = new BlockRule(SettingsEnum.ADREMOVER_QUICK_ACTIONS, "quick_actions");
+        var imageShelf = new BlockRule(SettingsEnum.ADREMOVER_IMAGE_SHELF, "image_shelf");
         var graySeparator = new BlockRule(SettingsEnum.ADREMOVER_GRAY_SEPARATOR,
                 "cell_divider" // layout residue (gray line above the buttoned ad),
         );
         var buttonedAd = new BlockRule(SettingsEnum.ADREMOVER_BUTTONED_REMOVAL,
-                "video_display_full_buttoned_layout",
+                "_buttoned_layout",
                 "full_width_square_image_layout",
                 "_ad_with",
                 "landscape_image_wide_button_layout"
@@ -53,7 +57,11 @@ public final class GeneralAdsPatch extends Filter {
                 "banner_text_icon",
                 "square_image_layout",
                 "watch_metadata_app_promo",
-                "video_display_full_layout"
+                "video_display_full_layout",
+                "hero_promo_image",
+                "statement_banner",
+                "carousel_footered_layout",
+                "text_image_button_layout"
         );
         var movieAds = new BlockRule(
                 SettingsEnum.ADREMOVER_MOVIE_REMOVAL,
@@ -67,21 +75,26 @@ public final class GeneralAdsPatch extends Filter {
         this.pathRegister.registerAll(
                 generalAds,
                 buttonedAd,
+                channelBar,
                 communityPosts,
                 paidContent,
-                suggestions,
                 latestPosts,
                 movieAds,
                 chapterTeaser,
                 communityGuidelines,
+                quickActions,
+                relatedVideos,
                 compactBanner,
                 inFeedSurvey,
+                viewProducts,
                 medicalPanel,
                 merchandise,
                 infoPanel,
                 channelGuidelines,
                 artistCard,
                 selfSponsor,
+                webLinkPanel,
+                imageShelf,
                 subscribersCommunityGuidelines,
                 channelMemberShelf
         );
@@ -115,7 +128,7 @@ public final class GeneralAdsPatch extends Filter {
         else
             result = BlockResult.UNBLOCKED;
 
-        log(String.format("%s (ID: %s): %s", result.message, identifier, path));
+        LogHelper.printDebug(() -> String.format("%s (ID: %s): %s", result.message, identifier, path));
 
         return result.filter;
     }
@@ -144,7 +157,7 @@ public final class GeneralAdsPatch extends Filter {
     private static void hideView(SettingsEnum condition, View view) {
         if (!condition.getBoolean()) return;
 
-        log("Hiding view with setting: " + condition);
+        LogHelper.printDebug(() -> "Hiding view with setting: " + condition);
 
         AdRemoverAPI.HideViewWithLayout1dp(view);
     }
@@ -167,7 +180,4 @@ public final class GeneralAdsPatch extends Filter {
         hideView(SettingsEnum.ADREMOVER_SHORTS_REMOVAL, view);
     }
 
-    private static void log(String message) {
-        LogHelper.printDebug(() -> message);
-    }
 }

app/src/main/java/app/revanced/integrations/patches/HideAutoplayButtonPatch.java

@@ -3,8 +3,7 @@ package app.revanced.integrations.patches;
 import app.revanced.integrations.settings.SettingsEnum;
 
 public class HideAutoplayButtonPatch {
-
     public static boolean isButtonShown() {
-        return SettingsEnum.HIDE_AUTOPLAY_BUTTON.getBoolean() == false;
+        return !SettingsEnum.HIDE_AUTOPLAY_BUTTON.getBoolean();
     }
 }

app/src/main/java/app/revanced/integrations/patches/HideCreateButtonPatch.java

@@ -10,8 +10,7 @@ public class HideCreateButtonPatch {
     //Used by app.revanced.patches.youtube.layout.createbutton.patch.CreateButtonRemoverPatch
     public static void hideCreateButton(View view) {
         boolean hidden = SettingsEnum.HIDE_CREATE_BUTTON.getBoolean();
-        String message =  "Create button: " + (hidden ? "hidden" : "shown");
-        LogHelper.printDebug(() -> message);
+        LogHelper.printDebug(() -> "Create button: " + (hidden ? "hidden" : "shown"));
         view.setVisibility(hidden ? View.GONE : View.VISIBLE);
     }
 }

app/src/main/java/app/revanced/integrations/patches/HideFloatingMicrophoneButtonPatch.java

@@ -0,0 +1,9 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public final class HideFloatingMicrophoneButtonPatch {
+    public static boolean hideFloatingMicrophoneButton(final boolean original) {
+        return SettingsEnum.HIDE_FLOATING_MICROPHONE_BUTTON.getBoolean() || original;
+    }
+}

app/src/main/java/app/revanced/integrations/patches/HideInfoCardsPatch.java

@@ -1,16 +1,15 @@
 package app.revanced.integrations.patches;
 
 import android.view.View;
-
 import app.revanced.integrations.settings.SettingsEnum;
 
-public class HideInfocardsPatch {
-    public static void hideInfocardsIncognito(View view) {
+public class HideInfoCardsPatch {
+    public static void hideInfoCardsIncognito(View view) {
         if (!SettingsEnum.HIDE_INFO_CARDS.getBoolean()) return;
         view.setVisibility(View.GONE);
     }
 
-    public static boolean hideInfocardsMethodCall() {
+    public static boolean hideInfoCardsMethodCall() {
         return SettingsEnum.HIDE_INFO_CARDS.getBoolean();
     }
 }

app/src/main/java/app/revanced/integrations/patches/HidePlayerButtonsPatch.java

@@ -0,0 +1,11 @@
+package app.revanced.integrations.patches;
+
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public final class HidePlayerButtonsPatch {
+
+    public static boolean hideButtons() {
+        return SettingsEnum.HIDE_PLAYER_BUTTONS.getBoolean();
+    }
+}

app/src/main/java/app/revanced/integrations/patches/HideSeekbarPatch.java

@@ -0,0 +1,9 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class HideSeekbarPatch {
+    public static boolean hideSeekbar() {
+        return SettingsEnum.HIDE_SEEKBAR.getBoolean();
+    }
+}

app/src/main/java/app/revanced/integrations/patches/HideShortsButtonPatch.java

@@ -12,10 +12,9 @@ public class HideShortsButtonPatch {
     public static void hideShortsButton(View view) {
         if (lastPivotTab != null && lastPivotTab.name() == "TAB_SHORTS") {
             boolean hide = SettingsEnum.HIDE_SHORTS_BUTTON.getBoolean();
-            String message = hide ? "Shorts button: hidden" : "Shorts button: shown";
-            LogHelper.printDebug(() -> message);
+            LogHelper.printDebug(() -> hide ? "Shorts button: hidden" : "Shorts button: shown");
             if (hide) {
-                view.setVisibility(hide ? View.GONE : View.VISIBLE);
+                view.setVisibility(View.GONE);
             }
         }
     }

app/src/main/java/app/revanced/integrations/patches/HideTimeAndSeekbarPatch.java

@@ -1,10 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public class HideTimeAndSeekbarPatch {
-    //Used by app.revanced.patches.youtube.layout.hidetimeandseekbar.patch.HideTimeAndSeekbarPatch
-    public static boolean hideTimeAndSeekbar() {
-        return SettingsEnum.HIDE_TIME_AND_SEEKBAR.getBoolean();
-    }
-}

app/src/main/java/app/revanced/integrations/patches/HideTimestampPatch.java

@@ -0,0 +1,9 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class HideTimestampPatch {
+    public static boolean hideTimestamp() {
+        return SettingsEnum.HIDE_TIMESTAMP.getBoolean();
+    }
+}

app/src/main/java/app/revanced/integrations/patches/HideWatchInVRPatch.java

@@ -2,9 +2,8 @@ package app.revanced.integrations.patches;
 
 import app.revanced.integrations.settings.SettingsEnum;
 
-public class HideWatchinVRPatch {
-    //Used by app.revanced.patches.youtube.layout.watchinvr.patch.HideWatchinVRPatch
-    public static boolean hideWatchinVR() {
+public class HideWatchInVRPatch {
+    public static boolean hideWatchInVR() {
         return SettingsEnum.HIDE_WATCH_IN_VR.getBoolean();
     }
 }

app/src/main/java/app/revanced/integrations/patches/MicroGSupport.java

@@ -1,34 +1,50 @@
 package app.revanced.integrations.patches;
 
-import static app.revanced.integrations.sponsorblock.StringRef.str;
-
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.widget.Toast;
-
 import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;
 
+import java.util.Objects;
+
+import static app.revanced.integrations.sponsorblock.StringRef.str;
+
 public class MicroGSupport {
     private static final String MICROG_VENDOR = "com.mgoogle";
-    private static final String MICROG_PACKAGE_NAME = "com.mgoogle.android.gms";
+    private static final String MICROG_PACKAGE_NAME = MICROG_VENDOR + ".android.gms";
     private static final String VANCED_MICROG_DOWNLOAD_LINK = "https://github.com/TeamVanced/VancedMicroG/releases/latest";
+    private static final String DONT_KILL_MY_APP_LINK = "https://dontkillmyapp.com";
+    private static final Uri VANCED_MICROG_PROVIDER = Uri.parse("content://" + MICROG_VENDOR + ".android.gsf.gservices/prefix");
+
+    private static void startIntent(Context context, String uriString, String message) {
+        Toast.makeText(context, message, Toast.LENGTH_LONG).show();
+
+        var intent = new Intent(Intent.ACTION_VIEW);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.setData(Uri.parse(uriString));
+        context.startActivity(intent);
+    }
 
     public static void checkAvailability() {
-        var context = ReVancedUtils.getContext();
-        assert context != null;
+        var context = Objects.requireNonNull(ReVancedUtils.getContext());
+
         try {
             context.getPackageManager().getPackageInfo(MICROG_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
-            LogHelper.printDebug(() -> "MicroG is installed on the device");
         } catch (PackageManager.NameNotFoundException exception) {
-            LogHelper.printException(() -> ("MicroG was not found"), exception);
-            Toast.makeText(context, str("microg_not_installed_warning"), Toast.LENGTH_LONG).show();
+            LogHelper.printInfo(() -> "Vanced MicroG was not found", exception);
+            startIntent(context, VANCED_MICROG_DOWNLOAD_LINK, str("microg_not_installed_warning"));
 
-            var intent = new Intent(Intent.ACTION_VIEW);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            intent.setData(Uri.parse(VANCED_MICROG_DOWNLOAD_LINK));
-            context.startActivity(intent);
+            // Gracefully exit the app, so it does not crash.
+            System.exit(0);
+        }
+
+        try (var client = context.getContentResolver().acquireContentProviderClient(VANCED_MICROG_PROVIDER)) {
+            if (client != null) return;
+            LogHelper.printInfo(() -> "Vanced MicroG is not running in the background");
+            startIntent(context, DONT_KILL_MY_APP_LINK, str("microg_not_running_warning"));
         }
     }
 }

app/src/main/java/app/revanced/integrations/patches/MinimizedPlaybackPatch.java

@@ -1,9 +1,14 @@
 package app.revanced.integrations.patches;
 
 import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.shared.PlayerType;
 
 public class MinimizedPlaybackPatch {
 
+    public static boolean isNotPlayingShorts(boolean isPipEnabled) {
+        return !PlayerType.getCurrent().isNoneOrHidden() && isPipEnabled;
+    }
+
     public static boolean isMinimizedPlaybackEnabled() {
         return SettingsEnum.ENABLE_MINIMIZED_PLAYBACK.getBoolean();
     }

app/src/main/java/app/revanced/integrations/patches/OpenLinksDirectlyPatch.java

@@ -1,18 +0,0 @@
-package app.revanced.integrations.patches;
-
-import java.net.URLDecoder;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public class OpenLinksDirectlyPatch {
-
-    public static String parseRedirectUri(String uri) {
-        if (SettingsEnum.OPEN_LINKS_DIRECTLY.getBoolean()) {
-            Matcher matcher = Pattern.compile("&q=(http.+?)&v=").matcher(uri);
-            return matcher.find() ? URLDecoder.decode(matcher.group(1)) : uri;
-        }
-        return uri;
-    }
-}

app/src/main/java/app/revanced/integrations/patches/PlayerTypeHookPatch.java

@@ -2,8 +2,8 @@ package app.revanced.integrations.patches;
 
 import androidx.annotation.Nullable;
 
-import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.shared.PlayerType;
+import app.revanced.integrations.utils.LogHelper;
 
 /**
  * Hook receiver class for 'player-type-hook' patch
@@ -24,7 +24,9 @@ public class PlayerTypeHookPatch {
 
         // update current player type
         final PlayerType newType = PlayerType.safeParseFromString(type.toString());
-        if (newType != null) {
+        if (newType == null) {
+            LogHelper.printException(() -> "Unknown PlayerType encountered: " + type);
+        } else {
             PlayerType.setCurrent(newType);
             LogHelper.printDebug(() -> "YouTubePlayerOverlaysLayout player type was updated to " + newType);
         }

app/src/main/java/app/revanced/integrations/patches/ReturnYouTubeDislikePatch.java

@@ -1,22 +1,25 @@
 package app.revanced.integrations.patches;
 
-import java.util.concurrent.atomic.AtomicReference;
-
+import android.text.Spanned;
 import app.revanced.integrations.returnyoutubedislike.ReturnYouTubeDislike;
 
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * Used by app.revanced.patches.youtube.layout.returnyoutubedislike.patch.ReturnYouTubeDislikePatch
  */
 public class ReturnYouTubeDislikePatch {
 
     /**
-     * Called when the video id changes
+     * Injection point
      */
     public static void newVideoLoaded(String videoId) {
         ReturnYouTubeDislike.newVideoLoaded(videoId);
     }
 
     /**
+     * Injection point
+     *
      * Called when a litho text component is created
      */
     public static void onComponentCreated(Object conversionContext, AtomicReference<Object> textRef) {
@@ -24,16 +27,22 @@ public class ReturnYouTubeDislikePatch {
     }
 
     /**
+     * Injection point
+     *
+     * Called when a Shorts dislike Spannable is created
+     */
+    public static Spanned onShortsComponentCreated(Spanned dislike) {
+        return ReturnYouTubeDislike.onShortsComponentCreated(dislike);
+    }
+
+    /**
+     * Injection point
+     *
      * Called when the like/dislike button is clicked
      *
      * @param vote -1 (dislike), 0 (none) or 1 (like)
      */
     public static void sendVote(int vote) {
-        for (ReturnYouTubeDislike.Vote v : ReturnYouTubeDislike.Vote.values()) {
-            if (v.value == vote) {
-                ReturnYouTubeDislike.sendVote(v);
-                return;
-            }
-        }
+        ReturnYouTubeDislike.sendVote(vote);
     }
 }

app/src/main/java/app/revanced/integrations/patches/SpoofSignatureVerificationPatch.java

@@ -0,0 +1,83 @@
+package app.revanced.integrations.patches;
+
+import android.widget.Toast;
+
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+public class SpoofSignatureVerificationPatch {
+    /**
+     * Protobuf parameters used by the player.
+     * Known issue: video preview not showing when using the seekbar.
+     */
+    private static final String PROTOBUF_PARAMETER_GENERAL = "CgIQBg";
+
+    /**
+     * Protobuf parameter of shorts and YouTube stories.
+     * Known issue: captions are positioned on upper area in the player.
+     */
+    private static final String PROTOBUF_PARAMETER_SHORTS = "8AEB"; // "8AEByAMTuAQP"
+
+    /**
+     * Target Protobuf parameters.
+     * Used by the generic player.
+     */
+    private static final String PROTOBUF_PARAMETER_TARGET = "YADI";
+
+    /**
+     * Injection point.
+     *
+     * @param originalValue originalValue protobuf parameter
+     */
+    public static String overrideProtobufParameter(String originalValue) {
+        try {
+            if (!SettingsEnum.SIGNATURE_SPOOFING.getBoolean()) {
+                return originalValue;
+            }
+            LogHelper.printDebug(() -> "Original protobuf parameter value: " + originalValue);
+            if (originalValue.startsWith(PROTOBUF_PARAMETER_TARGET) || originalValue.isEmpty()) {
+                return PROTOBUF_PARAMETER_SHORTS;
+            }
+        } catch (Exception ex) {
+            LogHelper.printException(() -> "overrideProtobufParameter failure", ex);
+        }
+
+        return originalValue;
+    }
+
+
+    /**
+     * Injection point. Runs off the main thread.
+     * <p>
+     * Used to check the response code of video playback requests made by YouTube.
+     * Response code of interest is 403 that indicate a signature verification failure for the current request
+     *
+     * @param responseCode HTTP status code of the completed YouTube connection
+     */
+    public static void onResponse(int responseCode) {
+        try {
+            if (responseCode < 400 || responseCode >= 500) {
+                return; // everything normal
+            }
+            LogHelper.printDebug(() -> "YouTube HTTP status code: " + responseCode);
+
+            if (SettingsEnum.SIGNATURE_SPOOFING.getBoolean()) {
+                return;  // already enabled
+            }
+
+            SettingsEnum.SIGNATURE_SPOOFING.saveValue(true);
+            ReVancedUtils.runOnMainThread(() -> {
+                Toast.makeText(
+                        ReVancedUtils.getContext(),
+                        "Spoofing app signature to prevent playback issues", Toast.LENGTH_LONG
+                ).show();
+                // it would be great if the video could be forcefully reloaded, but currently there is no code to do this
+            });
+
+        } catch (Exception ex) {
+            LogHelper.printException(() -> "onResponse failure", ex);
+        }
+    }
+
+}

app/src/main/java/app/revanced/integrations/patches/VideoBufferPatch.java

@@ -1,26 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public class VideoBufferPatch {
-
-    public static int getMaxBuffer() {
-        int confVal = SettingsEnum.MAX_BUFFER.getInt();
-        if (confVal < 1) confVal = 1;
-        return confVal;
-    }
-
-    public static int getPlaybackBuffer() {
-        int confVal = SettingsEnum.PLAYBACK_MAX_BUFFER.getInt();
-        if (confVal < 1) confVal = 1;
-        return confVal;
-    }
-
-    public static int getReBuffer() {
-        int confVal = SettingsEnum.MAX_PLAYBACK_BUFFER_AFTER_REBUFFER.getInt();
-        if (confVal < 1) confVal = 1;
-        return confVal;
-    }
-
-
-}

app/src/main/java/app/revanced/integrations/patches/VideoInformation.java

@@ -36,7 +36,7 @@ public final class VideoInformation {
             seekMethod = thisRef.getClass().getMethod(SEEK_METHOD_NAME, Long.TYPE);
             seekMethod.setAccessible(true);
         } catch (NoSuchMethodException ex) {
-            LogHelper.printDebug(() -> "Failed to initialize: " + ex.getMessage());
+            LogHelper.printException(() -> "Failed to initialize", ex);
         }
     }
 
@@ -87,7 +87,7 @@ public final class VideoInformation {
                 LogHelper.printDebug(() -> "Seeking to " + millisecond);
                 seekMethod.invoke(playerController.get(), millisecond);
             } catch (Exception ex) {
-                LogHelper.printDebug(() -> "Failed to seek: " + ex.getMessage());
+                LogHelper.printException(() -> "Failed to seek", ex);
             }
         });
     }

app/src/main/java/app/revanced/integrations/patches/playback/quality/RememberVideoQualityPatch.java

@@ -2,19 +2,17 @@ package app.revanced.integrations.patches.playback.quality;
 
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.widget.Toast;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
+import app.revanced.integrations.utils.SharedPrefHelper;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-import app.revanced.integrations.utils.ReVancedUtils;
-import app.revanced.integrations.utils.SharedPrefHelper;
-
 public class RememberVideoQualityPatch {
 
     public static int selectedQuality1 = -2;
@@ -23,37 +21,37 @@ public class RememberVideoQualityPatch {
 
     public static void changeDefaultQuality(int defaultQuality) {
         Context context = ReVancedUtils.getContext();
-        if (isConnectedWifi(context)) {
-            try {
-                SharedPrefHelper.saveString(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "wifi_quality", defaultQuality + "");
-            } catch (Exception ex) {
-                LogHelper.printException(() -> ("Failed to change default WI-FI quality:" + ex));
-                Toast.makeText(context, "Failed to change default WI-FI quality:", Toast.LENGTH_SHORT).show();
-            }
-            LogHelper.printDebug(() -> "Changing default Wi-Fi quality to: " + defaultQuality);
-            Toast.makeText(context, "Changing default Wi-Fi quality to: " + defaultQuality, Toast.LENGTH_SHORT).show();
-        } else if (isConnectedMobile(context)) {
-            try {
-                SharedPrefHelper.saveString(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "mobile_quality", defaultQuality + "");
-            } catch (Exception ex) {
-                LogHelper.printDebug(() -> "Failed to change default mobile data quality" + ex);
-                Toast.makeText(context, "Failed to change default mobile data quality", Toast.LENGTH_SHORT).show();
-            }
-            LogHelper.printDebug(() -> "Changing default mobile data quality to:" + defaultQuality);
-            Toast.makeText(context, "Changing default mobile data quality to:" + defaultQuality, Toast.LENGTH_SHORT).show();
+
+        var networkType = getNetworType(context);
+
+        if (networkType == NetworkType.NONE) {
+            String message = "No internet connection.";
+            LogHelper.printDebug(() -> message);
+            Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
         } else {
-            LogHelper.printDebug(() -> "No internet connection.");
-            Toast.makeText(context, "No internet connection.", Toast.LENGTH_SHORT).show();
+            var preferenceKey = "wifi_quality";
+            var networkTypeMessage = "WIFI";
+
+            if (networkType == NetworkType.MOBILE) {
+                networkTypeMessage = "mobile";
+                preferenceKey = "mobile_quality";
+            }
+
+            SharedPrefHelper.saveString(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, preferenceKey, defaultQuality + "");
+            String message = "Changing default " + networkTypeMessage + " quality to: " + defaultQuality;
+            Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
         }
+
         userChangedQuality = false;
     }
 
     public static int setVideoQuality(Object[] qualities, int quality, Object qInterface, String qIndexMethod) {
-        int preferredQuality;
         Field[] fields;
+
         if (!(newVideo || userChangedQuality) || qInterface == null) {
             return quality;
         }
+
         Class<?> intType = Integer.TYPE;
         ArrayList<Integer> iStreamQualities = new ArrayList<>();
         try {
@@ -88,55 +86,51 @@ public class RememberVideoQualityPatch {
         LogHelper.printDebug(() -> "Quality: " + qualityToLog);
         Context context = ReVancedUtils.getContext();
         if (context == null) {
-            LogHelper.printException(() -> ("Context is null or settings not initialized, returning quality: " + qualityToLog));
+            LogHelper.printException(() -> "Context is null or settings not initialized, returning quality: " + qualityToLog);
             return quality;
         }
-        if (isConnectedWifi(context)) {
-            preferredQuality = SharedPrefHelper.getInt(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "wifi_quality", -2);
-            LogHelper.printDebug(() -> "Wi-Fi connection detected, preferred quality: " + preferredQuality);
-        } else if (isConnectedMobile(context)) {
-            preferredQuality = SharedPrefHelper.getInt(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "mobile_quality", -2);
-            LogHelper.printDebug(() -> "Mobile data connection detected, preferred quality: " + preferredQuality);
-        } else {
+        var networkType = getNetworType(context);
+        if (networkType == NetworkType.NONE) {
             LogHelper.printDebug(() -> "No Internet connection!");
             return quality;
-        }
-        if (preferredQuality == -2) {
-            return quality;
-        }
-        for (int streamQuality2 : iStreamQualities) {
-            final int indexToLog = index;
-            LogHelper.printDebug(() -> "Quality at index " + indexToLog + ": " + streamQuality2);
-            index++;
-        }
-        for (Integer iStreamQuality : iStreamQualities) {
-            int streamQuality3 = iStreamQuality;
-            if (streamQuality3 <= preferredQuality) {
-                quality = streamQuality3;
+        } else {
+            var preferenceKey = "wifi_quality";
+            if (networkType == NetworkType.MOBILE) preferenceKey = "mobile_quality";
+
+            int preferredQuality = SharedPrefHelper.getInt(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, preferenceKey, -2);
+            if (preferredQuality == -2) return quality;
+
+            for (int streamQuality2 : iStreamQualities) {
+                final int indexToLog = index;
+                LogHelper.printDebug(() -> "Quality at index " + indexToLog + ": " + streamQuality2);
+                index++;
+            }
+            for (Integer iStreamQuality : iStreamQualities) {
+                int streamQuality3 = iStreamQuality;
+                if (streamQuality3 <= preferredQuality) {
+                    quality = streamQuality3;
+                }
+            }
+            if (quality == -2) return quality;
+
+            int qualityIndex = iStreamQualities.indexOf(quality);
+            final int qualityToLog2 = quality;
+            LogHelper.printDebug(() -> "Index of quality " + qualityToLog2 + " is " + qualityIndex);
+            try {
+                Class<?> cl = qInterface.getClass();
+                Method m = cl.getMethod(qIndexMethod, Integer.TYPE);
+                LogHelper.printDebug(() -> "Method is: " + qIndexMethod);
+                m.invoke(qInterface, iStreamQualities.get(qualityIndex));
+                LogHelper.printDebug(() -> "Quality changed to: " + qualityIndex);
+                return qualityIndex;
+            } catch (Exception ex) {
+                LogHelper.printException(() -> "Failed to set quality", ex);
+                return qualityIndex;
             }
-        }
-        if (quality == -2) {
-            return quality;
-        }
-        int qualityIndex = iStreamQualities.indexOf(quality);
-        final int qualityToLog2 = quality;
-        LogHelper.printDebug(() -> "Index of quality " + qualityToLog2 + " is " + qualityIndex);
-        try {
-            Class<?> cl = qInterface.getClass();
-            Method m = cl.getMethod(qIndexMethod, Integer.TYPE);
-            LogHelper.printDebug(() -> "Method is: " + qIndexMethod);
-            m.invoke(qInterface, iStreamQualities.get(qualityIndex));
-            LogHelper.printDebug(() -> "Quality changed to: " + qualityIndex);
-            return qualityIndex;
-        } catch (Exception ex) {
-            LogHelper.printException(() -> ("Failed to set quality"), ex);
-            Toast.makeText(context, "Failed to set quality", Toast.LENGTH_SHORT).show();
-            return qualityIndex;
         }
     }
 
     public static void userChangedQuality(int selectedQuality) {
-        // Do not remember a **new** quality if REMEMBER_VIDEO_QUALITY is false
         if (!SettingsEnum.REMEMBER_VIDEO_QUALITY_LAST_SELECTED.getBoolean()) return;
 
         selectedQuality1 = selectedQuality;
@@ -147,19 +141,23 @@ public class RememberVideoQualityPatch {
         newVideo = true;
     }
 
-    private static NetworkInfo getNetworkInfo(Context context) {
+    private static NetworkType getNetworType(Context context) {
         ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        return cm.getActiveNetworkInfo();
+        var networkInfo = cm.getActiveNetworkInfo();
+
+        if (networkInfo == null || !networkInfo.isConnected()) {
+            return NetworkType.NONE;
+        } else {
+            var type = networkInfo.getType();
+
+            return type == ConnectivityManager.TYPE_MOBILE || type == ConnectivityManager.TYPE_BLUETOOTH ? NetworkType.MOBILE : NetworkType.OTHER;
+        }
     }
 
-    private static boolean isConnectedWifi(Context context) {
-        NetworkInfo info = getNetworkInfo(context);
-        return info != null && info.isConnected() && info.getType() == 1;
-    }
-
-    private static boolean isConnectedMobile(Context context) {
-        NetworkInfo info = getNetworkInfo(context);
-        return info != null && info.isConnected() && info.getType() == 0;
+    enum NetworkType {
+        MOBILE,
+        OTHER,
+        NONE
     }
 
 }

app/src/main/java/app/revanced/integrations/patches/playback/speed/RememberPlaybackRatePatch.java

@@ -1,32 +0,0 @@
-package app.revanced.integrations.patches.playback.speed;
-
-import static app.revanced.integrations.utils.SharedPrefHelper.SharedPrefNames.REVANCED_PREFS;
-import static app.revanced.integrations.utils.SharedPrefHelper.getFloat;
-import static app.revanced.integrations.utils.SharedPrefHelper.saveFloat;
-
-import android.widget.Toast;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-import app.revanced.integrations.utils.ReVancedUtils;
-
-
-public final class RememberPlaybackRatePatch {
-    private static final String REMEMBERED_PLAYBACK_RATE_PREFERENCE_KEY = "revanced_remember_playback_rate_last_value";
-
-    public static void rememberPlaybackRate(final float selectedPlaybackRate) {
-        if (!SettingsEnum.REMEMBER_PLAYBACK_RATE_SELECTED.getBoolean()) return;
-
-        Toast.makeText(ReVancedUtils.getContext(), "Playback rate will be remembered", Toast.LENGTH_SHORT).show();
-
-        LogHelper.printDebug(() -> "Remembering playback rate: " + selectedPlaybackRate);
-        saveFloat(REVANCED_PREFS, REMEMBERED_PLAYBACK_RATE_PREFERENCE_KEY, selectedPlaybackRate);
-    }
-
-    public static float getRememberedPlaybackRate() {
-        final var playbackRateOverride = getFloat(REVANCED_PREFS, REMEMBERED_PLAYBACK_RATE_PREFERENCE_KEY, -2f);
-
-        LogHelper.printDebug(() -> "Overriding playback rate: " + playbackRateOverride);
-        return playbackRateOverride;
-    }
-}

app/src/main/java/app/revanced/integrations/patches/playback/speed/RememberPlaybackSpeedPatch.java

@@ -0,0 +1,83 @@
+package app.revanced.integrations.patches.playback.speed;
+
+import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+public final class RememberPlaybackSpeedPatch {
+
+    /**
+     * The current playback speed
+     */
+    private static float currentPlaybackSpeed = getLastRememberedPlaybackSpeed();
+
+    private final static float DEFAULT_PLAYBACK_SPEED = (float) SettingsEnum.REMEMBER_PLAYBACK_SPEED_LAST_SELECTED_VALUE.getDefaultValue();
+
+    @Nullable
+    private static String currentVideoId;
+
+    private static void showToast(final String message) {
+        Toast.makeText(ReVancedUtils.getContext(), message, Toast.LENGTH_LONG).show();
+    }
+
+    private static float getLastRememberedPlaybackSpeed() {
+        return SettingsEnum.REMEMBER_PLAYBACK_SPEED_LAST_SELECTED_VALUE.getFloat();
+    }
+
+    private static void rememberPlaybackSpeed() {
+        SettingsEnum.REMEMBER_PLAYBACK_SPEED_LAST_SELECTED_VALUE.saveValue(currentPlaybackSpeed);
+    }
+
+    private static boolean rememberLastSelectedPlaybackSpeed() {
+        return SettingsEnum.REMEMBER_PLAYBACK_SPEED_LAST_SELECTED.getBoolean();
+    }
+
+    /**
+     * Injection point.
+     * Called when a new video loads.
+     */
+    public static void newVideoLoaded(@NonNull String videoId) {
+        if (videoId.equals(currentVideoId)) {
+            return;
+        }
+
+        currentVideoId = videoId;
+        currentPlaybackSpeed = getLastRememberedPlaybackSpeed();
+    }
+
+    /**
+     * Injection point.
+     * Called when a playback speed is selected.
+     *
+     * @param playbackSpeed The playback speed to set.
+     */
+    public static void setPlaybackSpeed(final float playbackSpeed) {
+        LogHelper.printDebug(() -> "Playback speed changed to: " + playbackSpeed);
+
+        currentPlaybackSpeed = playbackSpeed;
+
+        if (rememberLastSelectedPlaybackSpeed()) {
+            rememberPlaybackSpeed();
+
+            showToast("Remembering playback speed: " + playbackSpeed + "x");
+        } else {
+            if (getLastRememberedPlaybackSpeed() == DEFAULT_PLAYBACK_SPEED) return;
+
+            showToast("Applying playback speed: " + playbackSpeed + "x");
+        }
+    }
+
+    /**
+     * Injection point.
+     * Called when playback first starts,
+     * and also called immediately after the user selects a new video speed.
+     *
+     * @return The currently set playback speed.
+     */
+    public static float getCurrentPlaybackSpeed() {
+        return currentPlaybackSpeed;
+    }
+}