chore(release): 0.118.0-dev.11 [skip ci]

# [0.118.0-dev.11](https://github.com/ReVanced/revanced-integrations/compare/v0.118.0-dev.10...v0.118.0-dev.11) (2023-09-26)

### Bug Fixes

* **YouTube - Client spoof:** fix toast shown if opening paid or age restricted video ([#482](https://github.com/ReVanced/revanced-integrations/issues/482)) ([e72b65b](e72b65b599))

.github/workflows/pull_request.yml

@@ -1,4 +1,4 @@
-name: PR to main
+name: Open a PR to main
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  MESSAGE: merge branch `${{ github.head_ref || github.ref_name }}` to `main`
+  MESSAGE: Merge branch `${{ github.head_ref || github.ref_name }}` to `main`
 
 jobs:
   pull-request:

CHANGELOG.md

@@ -1,3 +1,172 @@
+# [0.118.0-dev.11](https://github.com/ReVanced/revanced-integrations/compare/v0.118.0-dev.10...v0.118.0-dev.11) (2023-09-26)
+
+
+### Bug Fixes
+
+* **YouTube - Client spoof:** fix toast shown if opening paid or age restricted video ([#482](https://github.com/ReVanced/revanced-integrations/issues/482)) ([e72b65b](https://github.com/ReVanced/revanced-integrations/commit/e72b65b599353715a6467463226abc603bc850f7))
+
+# [0.118.0-dev.10](https://github.com/ReVanced/revanced-integrations/compare/v0.118.0-dev.9...v0.118.0-dev.10) (2023-09-26)
+
+
+### Bug Fixes
+
+* **YouTube - Client spoof:** fix storyboard fetched out of order ([#481](https://github.com/ReVanced/revanced-integrations/issues/481)) ([8398774](https://github.com/ReVanced/revanced-integrations/commit/83987747e67541cd44221ede8c4020baba36c7b8))
+
+# [0.118.0-dev.9](https://github.com/ReVanced/revanced-integrations/compare/v0.118.0-dev.8...v0.118.0-dev.9) (2023-09-25)
+
+
+### Bug Fixes
+
+* **YouTube - Client spoof:** Removed unused code ([#480](https://github.com/ReVanced/revanced-integrations/issues/480)) ([e6903bf](https://github.com/ReVanced/revanced-integrations/commit/e6903bff95b485d21773537bbcc162411b616618))
+
+# [0.118.0-dev.8](https://github.com/ReVanced/revanced-integrations/compare/v0.118.0-dev.7...v0.118.0-dev.8) (2023-09-25)
+
+
+### Bug Fixes
+
+* **YouTube - Client spoof:** Display seekbar thumbnails in high quality ([f71c1a0](https://github.com/ReVanced/revanced-integrations/commit/f71c1a0c156b2320e06dd98b3e5b276560d438aa))
+
+# [0.118.0-dev.7](https://github.com/ReVanced/revanced-integrations/compare/v0.118.0-dev.6...v0.118.0-dev.7) (2023-09-25)
+
+
+### Bug Fixes
+
+* Remove parameter from route ([4b0925e](https://github.com/ReVanced/revanced-integrations/commit/4b0925e33762c02e95ef9b1aadcae1038af71a50))
+
+# [0.118.0-dev.6](https://github.com/ReVanced/revanced-integrations/compare/v0.118.0-dev.5...v0.118.0-dev.6) (2023-09-25)
+
+
+### Performance Improvements
+
+* Only request required fields ([d20b768](https://github.com/ReVanced/revanced-integrations/commit/d20b768bc23d167d9f0d2c651c75b3f92944e731))
+* Remove unnecessary api key parameter ([ba5e7d8](https://github.com/ReVanced/revanced-integrations/commit/ba5e7d870ee88ad45c233d914e1e2795de920cb2))
+
+# [0.118.0-dev.5](https://github.com/ReVanced/revanced-integrations/compare/v0.118.0-dev.4...v0.118.0-dev.5) (2023-09-25)
+
+
+### Bug Fixes
+
+* **YouTube - Client spoof:** Restore clipping videos functionality ([2cd1738](https://github.com/ReVanced/revanced-integrations/commit/2cd1738d2494add13c48b64ccc9aad2432b2d8e3))
+* **YouTube - Client spoof:** Restore seekbar thumbnails ([978f630](https://github.com/ReVanced/revanced-integrations/commit/978f630c0267ec2b0d9bb9b5b0b3cdc9abef65ec))
+
+# [0.118.0-dev.4](https://github.com/ReVanced/revanced-integrations/compare/v0.118.0-dev.3...v0.118.0-dev.4) (2023-09-23)
+
+
+### Bug Fixes
+
+* **YouTube - Client spoof:** Do not record feed videos to history by default ([#478](https://github.com/ReVanced/revanced-integrations/issues/478)) ([ef1cca0](https://github.com/ReVanced/revanced-integrations/commit/ef1cca02c165d9c24e64b43fae375ae57bf90a52))
+
+# [0.118.0-dev.3](https://github.com/ReVanced/revanced-integrations/compare/v0.118.0-dev.2...v0.118.0-dev.3) (2023-09-19)
+
+
+### Bug Fixes
+
+* **YouTube:** fix old quality and custom speed not working on tablets ([#477](https://github.com/ReVanced/revanced-integrations/issues/477)) ([2352fa5](https://github.com/ReVanced/revanced-integrations/commit/2352fa542658035c5f4400fb5892217887710e4d))
+
+# [0.118.0-dev.2](https://github.com/ReVanced/revanced-integrations/compare/v0.118.0-dev.1...v0.118.0-dev.2) (2023-09-14)
+
+
+### Features
+
+* **Twitch - Block embedded ads:** Switch from `ttv.lol` to `luminous.dev` ([2c34180](https://github.com/ReVanced/revanced-integrations/commit/2c3418041cf19ae4c1c7b67eda8398578384b753))
+
+# [0.118.0-dev.1](https://github.com/ReVanced/revanced-integrations/compare/v0.117.2-dev.3...v0.118.0-dev.1) (2023-09-14)
+
+
+### Features
+
+* **TU Dortmund:** Add `Show on lockscreen` patch ([#472](https://github.com/ReVanced/revanced-integrations/issues/472)) ([526d66f](https://github.com/ReVanced/revanced-integrations/commit/526d66f6a91e0ed907db609a4adaa97f3239898b))
+
+## [0.117.2-dev.3](https://github.com/ReVanced/revanced-integrations/compare/v0.117.2-dev.2...v0.117.2-dev.3) (2023-09-09)
+
+
+### Bug Fixes
+
+* **YouTube - ReturnYouTubeDislike:** Add debug logging to litho text ([#476](https://github.com/ReVanced/revanced-integrations/issues/476)) ([e3b8e8b](https://github.com/ReVanced/revanced-integrations/commit/e3b8e8be41796d0300c8421e28e5b8cf43ffb25e))
+
+## [0.117.2-dev.2](https://github.com/ReVanced/revanced-integrations/compare/v0.117.2-dev.1...v0.117.2-dev.2) (2023-09-07)
+
+
+### Bug Fixes
+
+* **YouTube - Custom filter:** Use new lines between components instead of commas ([#475](https://github.com/ReVanced/revanced-integrations/issues/475)) ([17ed396](https://github.com/ReVanced/revanced-integrations/commit/17ed39673954a5b571bc1654be20afc235682ca4))
+
+## [0.117.2-dev.1](https://github.com/ReVanced/revanced-integrations/compare/v0.117.1...v0.117.2-dev.1) (2023-09-07)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Always hide redundant 'player audio track' button ([#473](https://github.com/ReVanced/revanced-integrations/issues/473)) ([d86851b](https://github.com/ReVanced/revanced-integrations/commit/d86851baf1ef1993f5ba9543a4a3fe8d50c3a199))
+
+## [0.117.1](https://github.com/ReVanced/revanced-integrations/compare/v0.117.0...v0.117.1) (2023-09-03)
+
+
+### Bug Fixes
+
+* **YouTube - ExternalDownloads:** Trim whitespace from package name ([#469](https://github.com/ReVanced/revanced-integrations/issues/469)) ([61d997e](https://github.com/ReVanced/revanced-integrations/commit/61d997e1db64730c36674445ff5b516a3acb41fb))
+
+## [0.117.1-dev.1](https://github.com/ReVanced/revanced-integrations/compare/v0.117.0...v0.117.1-dev.1) (2023-08-30)
+
+
+### Bug Fixes
+
+* **YouTube - ExternalDownloads:** Trim whitespace from package name ([#469](https://github.com/ReVanced/revanced-integrations/issues/469)) ([61d997e](https://github.com/ReVanced/revanced-integrations/commit/61d997e1db64730c36674445ff5b516a3acb41fb))
+
+# [0.117.0](https://github.com/ReVanced/revanced-integrations/compare/v0.116.2...v0.117.0) (2023-08-27)
+
+
+### Features
+
+* Restore previous release ([dc955d1](https://github.com/ReVanced/revanced-integrations/commit/dc955d1bc2db63efc83d4fd5c7e076ed0867d48b))
+
+# [0.117.0-dev.1](https://github.com/ReVanced/revanced-integrations/compare/v0.116.2...v0.117.0-dev.1) (2023-08-27)
+
+
+### Features
+
+* Restore previous release ([dc955d1](https://github.com/ReVanced/revanced-integrations/commit/dc955d1bc2db63efc83d4fd5c7e076ed0867d48b))
+
+## [0.116.2](https://github.com/ReVanced/revanced-integrations/compare/v0.116.1...v0.116.2) (2023-08-27)
+
+
+### Bug Fixes
+
+* Add back missing class ([6e8d13b](https://github.com/ReVanced/revanced-integrations/commit/6e8d13bfbbdadb8c737e7c183e9badc65fc6d719))
+
+## [0.116.1](https://github.com/ReVanced/revanced-integrations/compare/v0.116.0...v0.116.1) (2023-08-27)
+
+
+### Bug Fixes
+
+* Revert previous release ([a178a22](https://github.com/ReVanced/revanced-integrations/commit/a178a223c283abe420e197d10863d7fe64534f32))
+
+## [0.116.1-dev.1](https://github.com/ReVanced/revanced-integrations/compare/v0.116.0...v0.116.1-dev.1) (2023-08-27)
+
+
+### Bug Fixes
+
+* Revert previous release ([a178a22](https://github.com/ReVanced/revanced-integrations/commit/a178a223c283abe420e197d10863d7fe64534f32))
+
+# [0.116.0](https://github.com/ReVanced/revanced-integrations/compare/v0.115.1...v0.116.0) (2023-08-26)
+
+
+### Bug Fixes
+
+* use correct logging tags ([420b926](https://github.com/ReVanced/revanced-integrations/commit/420b9263b6e1cbb81aeb4985cf454b51912b51f8))
+* **YouTube - Hide Shorts components:** Hide `shorts header` ([#455](https://github.com/ReVanced/revanced-integrations/issues/455)) ([13afac9](https://github.com/ReVanced/revanced-integrations/commit/13afac906a0087ea7bc888c80e293f7b05c0a46e))
+* **YouTube - Litho Filter:** Don't remove the buffer until the thread stops ([#461](https://github.com/ReVanced/revanced-integrations/issues/461)) ([2188607](https://github.com/ReVanced/revanced-integrations/commit/218860734021ef89699de110ec2dcf63412761b9))
+* **YouTube - Player Flyout Menu:** Change 'audio track flyout menu' to show up by default ([#458](https://github.com/ReVanced/revanced-integrations/issues/458)) ([97880ea](https://github.com/ReVanced/revanced-integrations/commit/97880eaf72b0ae746ae3851d51e36039244b01c0))
+
+
+### Features
+
+* **YouTube - Debug:** Logging of layout proto buffer strings ([#456](https://github.com/ReVanced/revanced-integrations/issues/456)) ([769a200](https://github.com/ReVanced/revanced-integrations/commit/769a2006ce8dc934dd5de0acc59ed6aa6985da4f))
+* **YouTube - Hide video action buttons:** Hide individual action buttons ([#451](https://github.com/ReVanced/revanced-integrations/issues/451)) ([8e5ca65](https://github.com/ReVanced/revanced-integrations/commit/8e5ca65286b8b62eaeff3bce5fa1d2fb5a198703))
+* **YouTube:** Add `Alternative thumbnails` patch ([#462](https://github.com/ReVanced/revanced-integrations/issues/462)) ([d354356](https://github.com/ReVanced/revanced-integrations/commit/d354356b2d9052bc0d388633ed9eb0206f7c2058))
+* **YouTube:** Add `Custom player overlay opacity` patch ([#449](https://github.com/ReVanced/revanced-integrations/issues/449)) ([44dccb3](https://github.com/ReVanced/revanced-integrations/commit/44dccb3d658852e92aaf8d17e36dc205f1b3eb05))
+* **YouTube:** Add `Enable tablet layout` patch ([d4570de](https://github.com/ReVanced/revanced-integrations/commit/d4570de0a791bd97c70ac46b84cbff75c6d0b274))
+* **YouTube:** Support version 18.32.39 ([#464](https://github.com/ReVanced/revanced-integrations/issues/464)) ([aa9d892](https://github.com/ReVanced/revanced-integrations/commit/aa9d892cde59c39718529bc40a66b93a1cb78f82))
+
 # [0.116.0-dev.10](https://github.com/ReVanced/revanced-integrations/compare/v0.116.0-dev.9...v0.116.0-dev.10) (2023-08-26)
 
 

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

@@ -154,6 +154,8 @@ public class ReturnYouTubeDislikePatch {
             }
 
             String conversionContextString = conversionContext.toString();
+            LogHelper.printDebug(() -> "conversionContext: " + conversionContextString);
+
             final boolean isSegmentedButton;
             if (conversionContextString.contains("|segmented_like_dislike_button.eml|")) {
                 isSegmentedButton = true;

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

@@ -1,95 +0,0 @@
-package app.revanced.integrations.patches;
-
-import static app.revanced.integrations.utils.ReVancedUtils.containsAny;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.shared.PlayerType;
-import app.revanced.integrations.utils.LogHelper;
-
-public class SpoofSignatureVerificationPatch {
-    /**
-     * Enable/disable all workarounds that are required due to signature spoofing.
-     */
-    private static final boolean WORKAROUND = true;
-
-    /**
-     * Protobuf parameters used for autoplay in scrim.
-     * Prepend this parameter to mute video playback (for autoplay in feed)
-     */
-    private static final String PROTOBUF_PARAMETER_SCRIM = "SAFgAXgB";
-
-    /**
-     * Protobuf parameter also used by
-     * <a href="https://github.com/yt-dlp/yt-dlp/blob/81ca451480051d7ce1a31c017e005358345a9149/yt_dlp/extractor/youtube.py#L3602">yt-dlp</a>
-     * <br>
-     * Known issue: captions are positioned on upper area in the player.
-     */
-    private static final String PROTOBUF_PLAYER_PARAMS = "CgIQBg==";
-
-    /**
-     * Target Protobuf parameters.
-     */
-    private static final String[] PROTOBUF_PARAMETER_TARGETS = {
-            "YAHI", // Autoplay in feed
-            "SAFg"  // Autoplay in scrim
-    };
-
-    /**
-     * Injection point.
-     *
-     * @param originalValue originalValue protobuf parameter
-     */
-    public static String overrideProtobufParameter(String originalValue) {
-        try {
-            if (!SettingsEnum.SPOOF_SIGNATURE_VERIFICATION.getBoolean()) {
-                return originalValue;
-            }
-
-            LogHelper.printDebug(() -> "Original protobuf parameter value: " + originalValue);
-
-            if (!WORKAROUND) return PROTOBUF_PLAYER_PARAMS;
-
-            var isPlayingVideo = originalValue.contains(PROTOBUF_PLAYER_PARAMS);
-            if (isPlayingVideo) return originalValue;
-
-            boolean isPlayingFeed = containsAny(originalValue, PROTOBUF_PARAMETER_TARGETS) && PlayerType.getCurrent() == PlayerType.INLINE_MINIMAL;
-            if (isPlayingFeed) {
-                // Videos in feed won't autoplay with sound.
-                return PROTOBUF_PARAMETER_SCRIM + PROTOBUF_PLAYER_PARAMS;
-            } else {
-                // Spoof the parameter to prevent playback issues.
-                return PROTOBUF_PLAYER_PARAMS;
-            }
-        } catch (Exception ex) {
-            LogHelper.printException(() -> "overrideProtobufParameter failure", ex);
-        }
-
-        return originalValue;
-    }
-
-    /**
-     * Injection point.
-     */
-    public static boolean getSeekbarThumbnailOverrideValue() {
-        return SettingsEnum.SPOOF_SIGNATURE_VERIFICATION.getBoolean();
-    }
-
-    /**
-     * Injection point.
-     *
-     * @param view seekbar thumbnail view.  Includes both shorts and regular videos.
-     */
-    public static void seekbarImageViewCreated(ImageView view) {
-        if (SettingsEnum.SPOOF_SIGNATURE_VERIFICATION.getBoolean()) {
-            view.setVisibility(View.GONE);
-            // Also hide the border around the thumbnail (otherwise a 1 pixel wide bordered frame is visible).
-            ViewGroup parentLayout = (ViewGroup) view.getParent();
-            parentLayout.setPadding(0, 0, 0, 0);
-        }
-    }
-
-}

app/src/main/java/app/revanced/integrations/patches/components/LayoutComponentsFilter.java

@@ -92,8 +92,16 @@ public final class LayoutComponentsFilter extends Filter {
                 "channel_guidelines_entry_banner"
         );
 
+        // The player audio track button does the exact same function as the audio track flyout menu option.
+        // But if the copy url button is shown, these button clashes and the the audio button does not work.
+        // Previously this was a setting to show/hide the player button.
+        // But it was decided it's simpler to always hide this button because:
+        // - it doesn't work with copy video url feature
+        // - the button is rare
+        // - always hiding makes the ReVanced settings simpler and easier to understand
+        // - nobody is going to notice the redundant button is always hidden
         final var audioTrackButton = new StringFilterGroup(
-                SettingsEnum.HIDE_AUDIO_TRACK_BUTTON,
+                null,
                 "multi_feed_icon_button"
         );
 

app/src/main/java/app/revanced/integrations/patches/components/LithoFilterPatch.java

@@ -88,7 +88,7 @@ class StringFilterGroup extends FilterGroup<String> {
 final class CustomFilterGroup extends StringFilterGroup {
 
     public CustomFilterGroup(final SettingsEnum setting, final SettingsEnum filter) {
-        super(setting, filter.getString().split(","));
+        super(setting, filter.getString().split("\\s+"));
     }
 }
 

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

@@ -3,71 +3,44 @@ package app.revanced.integrations.patches.playback.quality;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.LinearLayout;
 import android.widget.ListView;
 
-import androidx.annotation.NonNull;
-
 import app.revanced.integrations.patches.components.VideoQualityMenuFilterPatch;
 import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.utils.LogHelper;
-import com.facebook.litho.ComponentHost;
-import kotlin.Deprecated;
 
-// This patch contains the logic to show the old video quality menu.
-// Two methods are required, because the quality menu is a RecyclerView in the new YouTube version
-// and a ListView in the old one.
+/**
+ * This patch contains the logic to show the old video quality menu.
+ * Two methods are required, because the quality menu is a RecyclerView in the new YouTube version
+ * and a ListView in the old one.
+ */
 public final class OldVideoQualityMenuPatch {
 
-    public static void onFlyoutMenuCreate(final LinearLayout linearLayout) {
+    /**
+     * Injection point.
+     */
+    public static void onFlyoutMenuCreate(RecyclerView recyclerView) {
         if (!SettingsEnum.SHOW_OLD_VIDEO_QUALITY_MENU.getBoolean()) return;
 
-        // The quality menu is a RecyclerView with 3 children. The third child is the "Advanced" quality menu.
-        addRecyclerListener(linearLayout, 3, 2, recyclerView -> {
-            // Check if the current view is the quality menu.
-            if (VideoQualityMenuFilterPatch.isVideoQualityMenuVisible) {
-                VideoQualityMenuFilterPatch.isVideoQualityMenuVisible = false;
-                linearLayout.setVisibility(View.GONE);
+        recyclerView.getViewTreeObserver().addOnDrawListener(() -> {
+            try {
+                // Check if the current view is the quality menu.
+                if (VideoQualityMenuFilterPatch.isVideoQualityMenuVisible) {
+                    VideoQualityMenuFilterPatch.isVideoQualityMenuVisible = false;
+                    ((ViewGroup) recyclerView.getParent().getParent().getParent()).setVisibility(View.GONE);
 
-                // Click the "Advanced" quality menu to show the "old" quality menu.
-                ((ComponentHost) recyclerView.getChildAt(0)).getChildAt(3).performClick();
-                LogHelper.printDebug(() -> "Advanced quality menu in new type of quality menu clicked");
+                    // Click the "Advanced" quality menu to show the "old" quality menu.
+                    ((ViewGroup) recyclerView.getChildAt(0)).getChildAt(3).performClick();
+                }
+            } catch (Exception ex) {
+                LogHelper.printException(() -> "onFlyoutMenuCreate failure", ex);
             }
         });
     }
 
-    public static void addRecyclerListener(@NonNull LinearLayout linearLayout,
-                                           int expectedLayoutChildCount, int recyclerViewIndex,
-                                           @NonNull RecyclerViewGlobalLayoutListener listener) {
-        if (linearLayout.getChildCount() != expectedLayoutChildCount) return;
-
-        var layoutChild = linearLayout.getChildAt(recyclerViewIndex);
-        if (!(layoutChild instanceof RecyclerView)) return;
-        final var recyclerView = (RecyclerView) layoutChild;
-
-        recyclerView.getViewTreeObserver().addOnGlobalLayoutListener(
-                new ViewTreeObserver.OnGlobalLayoutListener() {
-                    @Override
-                    public void onGlobalLayout() {
-                        try {
-                            listener.recyclerOnGlobalLayout(recyclerView);
-                        } catch (Exception ex) {
-                            LogHelper.printException(() -> "addRecyclerListener failure", ex);
-                        } finally {
-                            // Remove the listener because it will be added again.
-                            recyclerView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                        }
-                    }
-                }
-        );
-    }
-
-    public interface RecyclerViewGlobalLayoutListener {
-        void recyclerOnGlobalLayout(@NonNull RecyclerView recyclerView);
-    }
-
-    @Deprecated(message = "This patch is deprecated because the quality menu is not a ListView anymore")
+    /**
+     * Injection point.  Only used if spoofing to an old app version.
+     */
     public static void showOldVideoQualityMenu(final ListView listView) {
         if (!SettingsEnum.SHOW_OLD_VIDEO_QUALITY_MENU.getBoolean()) return;
 

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

@@ -1,23 +1,23 @@
 package app.revanced.integrations.patches.playback.speed;
 
 import android.preference.ListPreference;
+import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
+
 import androidx.annotation.NonNull;
+
+import java.util.Arrays;
+
 import app.revanced.integrations.patches.components.PlaybackSpeedMenuFilterPatch;
 import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;
-import com.facebook.litho.ComponentHost;
-
-import java.util.Arrays;
-
-import static app.revanced.integrations.patches.playback.quality.OldVideoQualityMenuPatch.addRecyclerListener;
 
 public class CustomPlaybackSpeedPatch {
     /**
      * Maximum playback speed, exclusive value.  Custom speeds must be less than this value.
+     * Limit is required otherwise double digit speeds show up out of order in the UI selector.
      */
     public static final float MAXIMUM_PLAYBACK_SPEED = 10;
 
@@ -26,16 +26,6 @@ public class CustomPlaybackSpeedPatch {
      */
     public static float[] customPlaybackSpeeds;
 
-    /**
-     * Minimum value of {@link #customPlaybackSpeeds}
-     */
-    public static float minPlaybackSpeed;
-
-    /**
-     * Maxium value of {@link #customPlaybackSpeeds}
-     */
-    public static float maxPlaybackSpeed;
-
     /**
      * PreferenceList entries and values, of all available playback speeds.
      */
@@ -69,8 +59,6 @@ public class CustomPlaybackSpeedPatch {
                     loadCustomSpeeds();
                     return;
                 }
-                minPlaybackSpeed = Math.min(minPlaybackSpeed, speed);
-                maxPlaybackSpeed = Math.max(maxPlaybackSpeed, speed);
                 customPlaybackSpeeds[i] = speed;
             }
         } catch (Exception ex) {
@@ -106,25 +94,37 @@ public class CustomPlaybackSpeedPatch {
         preference.setEntryValues(preferenceListEntryValues);
     }
 
-    /*
-     * To reduce copy and paste between two similar code paths.
+    /**
+     * Injection point.
      */
-    public static void onFlyoutMenuCreate(final LinearLayout linearLayout) {
-        // The playback rate menu is a RecyclerView with 2 children. The third child is the "Advanced" quality menu.
-        addRecyclerListener(linearLayout, 2, 1, recyclerView -> {
-            if (PlaybackSpeedMenuFilterPatch.isPlaybackSpeedMenuVisible) {
-                PlaybackSpeedMenuFilterPatch.isPlaybackSpeedMenuVisible = false;
+    public static void onFlyoutMenuCreate(RecyclerView recyclerView) {
+        recyclerView.getViewTreeObserver().addOnDrawListener(() -> {
+            try {
+                // For some reason, the custom playback speed flyout panel is activated when the user opens the share panel. (A/B tests)
+                // Check the child count of playback speed flyout panel to prevent this issue.
+                // Child count of playback speed flyout panel is always 8.
+                if (PlaybackSpeedMenuFilterPatch.isPlaybackSpeedMenuVisible
+                        && ((ViewGroup) recyclerView.getChildAt(0)).getChildCount() == 8) {
+                    PlaybackSpeedMenuFilterPatch.isPlaybackSpeedMenuVisible = false;
+                    ViewGroup parentView3rd = (ViewGroup) recyclerView.getParent().getParent().getParent();
+                    ViewGroup parentView4th = (ViewGroup) parentView3rd.getParent();
 
-                if (recyclerView.getChildCount() == 1 && recyclerView.getChildAt(0) instanceof ComponentHost) {
-                    linearLayout.setVisibility(View.GONE);
+                    // Dismiss View [R.id.touch_outside] is the 1st ChildView of the 4th ParentView.
+                    // This only shows in phone layout.
+                    parentView4th.getChildAt(0).performClick();
 
-                    // Close the new Playback speed menu and instead show the old one.
+                    // In tablet layout there is no Dismiss View, instead we just hide all two parent views.
+                    parentView3rd.setVisibility(View.GONE);
+                    parentView4th.setVisibility(View.GONE);
+
+                    // This works without issues for both tablet and phone layouts,
+                    // So no code is needed to check whether the current device is a tablet or phone.
+
+                    // Close the new Playback speed menu and show the old one.
                     showOldPlaybackSpeedMenu();
-
-                    // DismissView [R.id.touch_outside] is the 1st ChildView of the 3rd ParentView.
-                    ((ViewGroup) linearLayout.getParent().getParent().getParent())
-                            .getChildAt(0).performClick();
                 }
+            } catch (Exception ex) {
+                LogHelper.printException(() -> "onFlyoutMenuCreate failure", ex);
             }
         });
     }

app/src/main/java/app/revanced/integrations/patches/spoof/SpoofSignaturePatch.java

@@ -0,0 +1,140 @@
+package app.revanced.integrations.patches.spoof;
+
+import static app.revanced.integrations.patches.spoof.requests.StoryBoardRendererRequester.fetchStoryboardRenderer;
+import static app.revanced.integrations.utils.ReVancedUtils.containsAny;
+
+import androidx.annotation.Nullable;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import app.revanced.integrations.patches.VideoInformation;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.shared.PlayerType;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+/** @noinspection unused*/
+public class SpoofSignaturePatch {
+    /**
+     * Parameter (also used by
+     * <a href="https://github.com/yt-dlp/yt-dlp/blob/81ca451480051d7ce1a31c017e005358345a9149/yt_dlp/extractor/youtube.py#L3602">yt-dlp</a>)
+     * to fix playback issues.
+     */
+    private static final String INCOGNITO_PARAMETERS = "CgIQBg==";
+
+    /**
+     * Parameters causing playback issues.
+     */
+    private static final String[] AUTOPLAY_PARAMETERS = {
+            "YAHI", // Autoplay in feed.
+            "SAFg"  // Autoplay in scrim.
+    };
+
+    /**
+     * Parameter used for autoplay in scrim.
+     * Prepend this parameter to mute video playback (for autoplay in feed).
+     */
+    private static final String SCRIM_PARAMETER = "SAFgAXgB";
+
+    /**
+     * Parameters used in YouTube Shorts.
+     */
+    private static final String SHORTS_PLAYER_PARAMETERS = "8AEB";
+
+    /**
+     * Last video id loaded. Used to prevent reloading the same spec multiple times.
+     */
+    private static volatile String currentVideoId;
+
+    private static volatile Future<StoryboardRenderer> rendererFuture;
+
+    /**
+     * Injection point.
+     *
+     * @param parameters Original protobuf parameter value.
+     */
+    public static String spoofParameter(String parameters) {
+        LogHelper.printDebug(() -> "Original protobuf parameter value: " + parameters);
+
+        if (!SettingsEnum.SPOOF_SIGNATURE.getBoolean()) return parameters;
+
+        // Clip's player parameters contain a lot of information (e.g. video start and end time or whether it loops)
+        // For this reason, the player parameters of a clip are usually very long (150~300 characters).
+        // Clips are 60 seconds or less in length, so no spoofing.
+        var isClip = parameters.length() > 150;
+        if (isClip) return parameters;
+
+
+        // Shorts do not need to be spoofed.
+        if (parameters.startsWith(SHORTS_PLAYER_PARAMETERS)) return parameters;
+
+        boolean isPlayingFeed = PlayerType.getCurrent() == PlayerType.INLINE_MINIMAL && containsAny(parameters, AUTOPLAY_PARAMETERS);
+        if (isPlayingFeed) return SettingsEnum.SPOOF_SIGNATURE_IN_FEED.getBoolean() ?
+                // Prepend the scrim parameter to mute videos in feed.
+                SCRIM_PARAMETER + INCOGNITO_PARAMETERS :
+                // In order to prevent videos that are auto-played in feed to be added to history,
+                // only spoof the parameter if the video is not playing in the feed.
+                // This will cause playback issues in the feed, but it's better than manipulating the history.
+                parameters;
+
+        String videoId = VideoInformation.getVideoId();
+        if (!videoId.equals(currentVideoId)) {
+            currentVideoId = videoId;
+            rendererFuture = ReVancedUtils.submitOnBackgroundThread(() -> fetchStoryboardRenderer(videoId));
+        }
+
+        return INCOGNITO_PARAMETERS;
+    }
+
+    @Nullable
+    private static StoryboardRenderer getRenderer() {
+        if (rendererFuture != null) {
+            try {
+                return rendererFuture.get(5000, TimeUnit.MILLISECONDS);
+            } catch (TimeoutException ex) {
+                LogHelper.printDebug(() -> "Could not get renderer (get timed out)");
+            } catch (ExecutionException | InterruptedException ex) {
+                // Should never happen.
+                LogHelper.printException(() -> "Could not get renderer", ex);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean getSeekbarThumbnailOverrideValue() {
+        return SettingsEnum.SPOOF_SIGNATURE.getBoolean();
+    }
+
+    /**
+     * Injection point.
+     * Called from background threads and from the main thread.
+     */
+    @Nullable
+    public static String getStoryboardRendererSpec(String originalStoryboardRendererSpec) {
+        if (!SettingsEnum.SPOOF_SIGNATURE.getBoolean()) return originalStoryboardRendererSpec;
+
+        StoryboardRenderer renderer = getRenderer();
+        if (renderer == null) return originalStoryboardRendererSpec;
+
+        return renderer.getSpec();
+    }
+
+    /**
+     * Injection point.
+     */
+    public static int getRecommendedLevel(int originalLevel) {
+        if (!SettingsEnum.SPOOF_SIGNATURE.getBoolean()) return originalLevel;
+
+        StoryboardRenderer renderer = getRenderer();
+        if (renderer == null) return originalLevel;
+
+        return renderer.getRecommendedLevel();
+    }
+
+}

app/src/main/java/app/revanced/integrations/patches/spoof/StoryboardRenderer.java

@@ -0,0 +1,32 @@
+package app.revanced.integrations.patches.spoof;
+
+import androidx.annotation.NonNull;
+import org.jetbrains.annotations.NotNull;
+
+public final class StoryboardRenderer {
+    private final String spec;
+    private final int recommendedLevel;
+
+    public StoryboardRenderer(String spec, int recommendedLevel) {
+        this.spec = spec;
+        this.recommendedLevel = recommendedLevel;
+    }
+
+    @NonNull
+    public String getSpec() {
+        return spec;
+    }
+
+    public int getRecommendedLevel() {
+        return recommendedLevel;
+    }
+
+    @NotNull
+    @Override
+    public String toString() {
+        return "StoryboardRenderer{" +
+                "spec='" + spec + '\'' +
+                ", recommendedLevel=" + recommendedLevel +
+                '}';
+    }
+}

app/src/main/java/app/revanced/integrations/patches/spoof/requests/PlayerRoutes.java

@@ -0,0 +1,37 @@
+package app.revanced.integrations.patches.spoof.requests;
+
+import app.revanced.integrations.requests.Requester;
+import app.revanced.integrations.requests.Route;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+
+final class PlayerRoutes {
+    private static final String YT_API_URL = "https://www.youtube.com/youtubei/v1/";
+    static final Route.CompiledRoute POST_STORYBOARD_SPEC_RENDERER = new Route(
+            Route.Method.POST,
+            "player" +
+                    "?fields=storyboards.playerStoryboardSpecRenderer," +
+                    "storyboards.playerLiveStoryboardSpecRenderer"
+    ).compile();
+
+    private PlayerRoutes() {
+    }
+
+    /** @noinspection SameParameterValue*/
+    static HttpURLConnection getPlayerResponseConnectionFromRoute(Route.CompiledRoute route) throws IOException {
+        var connection = Requester.getConnectionFromCompiledRoute(YT_API_URL, route);
+        connection.setRequestProperty("User-Agent", "com.google.android.youtube/18.37.36 (Linux; U; Android 12; GB) gzip");
+        connection.setRequestProperty("X-Goog-Api-Format-Version", "2");
+        connection.setRequestProperty("Content-Type", "application/json");
+        connection.setRequestProperty("Accept-Language", "en-GB, en;q=0.9");
+        connection.setRequestProperty("Pragma", "no-cache");
+        connection.setRequestProperty("Cache-Control", "no-cache");
+        connection.setUseCaches(false);
+        connection.setDoOutput(true);
+        connection.setConnectTimeout(5000);
+        connection.setReadTimeout(5000);
+        return connection;
+    }
+
+}

app/src/main/java/app/revanced/integrations/patches/spoof/requests/StoryBoardRendererRequester.java

@@ -0,0 +1,80 @@
+package app.revanced.integrations.patches.spoof.requests;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import app.revanced.integrations.patches.spoof.StoryboardRenderer;
+import app.revanced.integrations.requests.Requester;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
+import org.json.JSONObject;
+
+import java.net.HttpURLConnection;
+import java.net.SocketTimeoutException;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+
+import static app.revanced.integrations.patches.spoof.requests.PlayerRoutes.POST_STORYBOARD_SPEC_RENDERER;
+
+public class StoryBoardRendererRequester {
+    private static final String INNER_TUBE_BODY =
+            "{" +
+                    "\"context\": " +
+                    "{" +
+                    "\"client\": " +
+                    "{ " +
+                    "\"clientName\": \"ANDROID\", \"clientVersion\": \"18.37.36\", \"platform\": \"MOBILE\", " +
+                    "\"osName\": \"Android\", \"osVersion\": \"12\", \"androidSdkVersion\": 31 " +
+                    "} " +
+                    "}, " +
+                    "\"videoId\": \"%s\"" +
+                    "}";
+
+    private StoryBoardRendererRequester() {
+    }
+
+    @Nullable
+    public static StoryboardRenderer fetchStoryboardRenderer(@NonNull String videoId) {
+        try {
+            ReVancedUtils.verifyOffMainThread();
+            Objects.requireNonNull(videoId);
+
+            final byte[] innerTubeBody = String.format(INNER_TUBE_BODY, videoId).getBytes(StandardCharsets.UTF_8);
+
+            HttpURLConnection connection = PlayerRoutes.getPlayerResponseConnectionFromRoute(POST_STORYBOARD_SPEC_RENDERER);
+            connection.getOutputStream().write(innerTubeBody, 0, innerTubeBody.length);
+
+            final int responseCode = connection.getResponseCode();
+
+            if (responseCode == 200) {
+                final JSONObject playerResponse = Requester.parseJSONObject(connection);
+
+                if (!playerResponse.has("storyboards")) {
+                    // Video is age restricted or paid.
+                    LogHelper.printDebug(() -> "Video has no public storyboard: " + videoId);
+                    return null;
+                }
+                final JSONObject storyboards = playerResponse.getJSONObject("storyboards");
+                final String storyboardsRendererTag = storyboards.has("playerLiveStoryboardSpecRenderer")
+                        ? "playerLiveStoryboardSpecRenderer"
+                        : "playerStoryboardSpecRenderer";
+
+                final var rendererElement = storyboards.getJSONObject(storyboardsRendererTag);
+                StoryboardRenderer renderer = new StoryboardRenderer(
+                        rendererElement.getString("spec"),
+                        rendererElement.getInt("recommendedLevel")
+                );
+                LogHelper.printDebug(() -> "Fetched: " + renderer);
+                return renderer;
+            } else {
+                LogHelper.printException(() -> "API not available: " + responseCode);
+                connection.disconnect();
+            }
+        } catch (SocketTimeoutException ex) {
+            LogHelper.printException(() -> "API timed out", ex);
+        } catch (Exception ex) {
+            LogHelper.printException(() -> "Failed to fetch StoryBoard URL", ex);
+        }
+
+        return null;
+    }
+}

app/src/main/java/app/revanced/integrations/requests/Requester.java

@@ -16,7 +16,11 @@ public class Requester {
     }
 
     public static HttpURLConnection getConnectionFromRoute(String apiUrl, Route route, String... params) throws IOException {
-        String url = apiUrl + route.compile(params).getCompiledRoute();
+        return getConnectionFromCompiledRoute(apiUrl, route.compile(params));
+    }
+
+    public static HttpURLConnection getConnectionFromCompiledRoute(String apiUrl, Route.CompiledRoute route) throws IOException {
+        String url = apiUrl + route.getCompiledRoute();
         HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
         connection.setRequestMethod(route.getMethod().name());
         connection.setRequestProperty("User-agent", System.getProperty("http.agent") + ";revanced");

app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java

@@ -36,8 +36,6 @@ public enum SettingsEnum {
     // Video
     HDR_AUTO_BRIGHTNESS("revanced_hdr_auto_brightness", BOOLEAN, TRUE),
     SHOW_OLD_VIDEO_QUALITY_MENU("revanced_show_old_video_quality_menu", BOOLEAN, TRUE),
-    @Deprecated
-    DEPRECATED_SHOW_OLD_VIDEO_QUALITY_MENU("revanced_show_old_video_menu", BOOLEAN, TRUE),
     REMEMBER_VIDEO_QUALITY_LAST_SELECTED("revanced_remember_video_quality_last_selected", BOOLEAN, TRUE),
     VIDEO_QUALITY_DEFAULT_WIFI("revanced_video_quality_default_wifi", INTEGER, -2),
     VIDEO_QUALITY_DEFAULT_MOBILE("revanced_video_quality_default_mobile", INTEGER, -2),
@@ -97,7 +95,6 @@ public enum SettingsEnum {
     DISABLE_RESUMING_SHORTS_PLAYER("revanced_disable_resuming_shorts_player", BOOLEAN, FALSE),
     HIDE_ALBUM_CARDS("revanced_hide_album_cards", BOOLEAN, FALSE, true),
     HIDE_ARTIST_CARDS("revanced_hide_artist_cards", BOOLEAN, FALSE),
-    HIDE_AUDIO_TRACK_BUTTON("revanced_hide_audio_track_button", BOOLEAN, FALSE),
     HIDE_AUTOPLAY_BUTTON("revanced_hide_autoplay_button", BOOLEAN, TRUE, true),
     HIDE_BREAKING_NEWS("revanced_hide_breaking_news", BOOLEAN, TRUE, true),
     HIDE_CAPTIONS_BUTTON("revanced_hide_captions_button", BOOLEAN, FALSE),
@@ -168,8 +165,10 @@ public enum SettingsEnum {
     EXTERNAL_BROWSER("revanced_external_browser", BOOLEAN, TRUE, true),
     AUTO_REPEAT("revanced_auto_repeat", BOOLEAN, FALSE),
     SEEKBAR_TAPPING("revanced_seekbar_tapping", BOOLEAN, TRUE),
-    SPOOF_SIGNATURE_VERIFICATION("revanced_spoof_signature_verification", BOOLEAN, TRUE, true,
-            "revanced_spoof_signature_verification_user_dialog_message"),
+    SPOOF_SIGNATURE("revanced_spoof_signature_verification_enabled", BOOLEAN, TRUE, true,
+            "revanced_spoof_signature_verification_enabled_user_dialog_message"),
+    SPOOF_SIGNATURE_IN_FEED("revanced_spoof_signature_in_feed_enabled", BOOLEAN, FALSE, false,
+            parents(SPOOF_SIGNATURE)),
 
     // Swipe controls
     SWIPE_BRIGHTNESS("revanced_swipe_brightness", BOOLEAN, TRUE),
@@ -368,13 +367,20 @@ public enum SettingsEnum {
 
         // region Migration
 
-        // TODO: do _not_ delete this SB private user id migration property until sometime in 2024.
+        // Do _not_ delete this SB private user id migration property until sometime in 2024.
         // This is the only setting that cannot be reconfigured if lost,
         // and more time should be given for users who rarely upgrade.
         migrateOldSettingToNew(DEPRECATED_SB_UUID_OLD_MIGRATION_SETTING, SB_PRIVATE_USER_ID);
 
-        // TODO: delete DEPRECATED_SHOW_OLD_VIDEO_QUALITY_MENU (When? anytime).
-        migrateOldSettingToNew(DEPRECATED_SHOW_OLD_VIDEO_QUALITY_MENU, SHOW_OLD_VIDEO_QUALITY_MENU);
+        // This migration may need to remain here for a while.
+        // Older online guides will still reference using commas,
+        // and this code will automatically convert anything the user enters to newline format,
+        // and also migrate any imported older settings that using commas.
+        String componentsToFilter = SettingsEnum.CUSTOM_FILTER_STRINGS.getString();
+        if (componentsToFilter.contains(",")) {
+            LogHelper.printInfo(() -> "Migrating custom filter strings to new line format");
+            SettingsEnum.CUSTOM_FILTER_STRINGS.saveValue(componentsToFilter.replace(",", "\n"));
+        }
 
         // endregion
     }

app/src/main/java/app/revanced/integrations/videoplayer/ExternalDownloadButton.java

@@ -49,7 +49,8 @@ public class ExternalDownloadButton extends BottomControlButton {
         LogHelper.printDebug(() -> "External download button clicked");
 
         final var context = view.getContext();
-        var downloaderPackageName = SettingsEnum.EXTERNAL_DOWNLOADER_PACKAGE_NAME.getString();
+        // Trim string to avoid any accidental whitespace.
+        var downloaderPackageName = SettingsEnum.EXTERNAL_DOWNLOADER_PACKAGE_NAME.getString().trim();
 
         boolean packageEnabled = false;
         try {

app/src/main/java/app/revanced/tudortmund/lockscreen/ShowOnLockscreenPatch.java

@@ -0,0 +1,46 @@
+package app.revanced.tudortmund.lockscreen;
+
+import android.content.Context;
+import android.hardware.display.DisplayManager;
+import android.os.Build;
+import android.view.Display;
+import android.view.Window;
+import androidx.appcompat.app.AppCompatActivity;
+
+import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
+import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
+
+public class ShowOnLockscreenPatch {
+    /**
+     * @noinspection deprecation
+     */
+    public static Window getWindow(AppCompatActivity activity, float brightness) {
+        Window window = activity.getWindow();
+
+        if (brightness >= 0) {
+            // High brightness set, therefore show on lockscreen.
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) activity.setShowWhenLocked(true);
+            else window.addFlags(FLAG_SHOW_WHEN_LOCKED | FLAG_DISMISS_KEYGUARD);
+        } else {
+            // Ignore brightness reset when the screen is turned off.
+            DisplayManager displayManager = (DisplayManager) activity.getSystemService(Context.DISPLAY_SERVICE);
+
+            boolean isScreenOn = false;
+            for (Display display : displayManager.getDisplays()) {
+                if (display.getState() == Display.STATE_OFF) continue;
+
+                isScreenOn = true;
+                break;
+            }
+
+            if (isScreenOn) {
+                // Hide on lockscreen.
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) activity.setShowWhenLocked(false);
+                else window.clearFlags(FLAG_SHOW_WHEN_LOCKED | FLAG_DISMISS_KEYGUARD);
+            }
+        }
+
+        return window;
+    }
+
+}

app/src/main/java/app/revanced/twitch/adblock/LuminousService.java

@@ -0,0 +1,46 @@
+package app.revanced.twitch.adblock;
+
+import app.revanced.twitch.utils.LogHelper;
+import app.revanced.twitch.utils.ReVancedUtils;
+import okhttp3.HttpUrl;
+import okhttp3.Request;
+
+public class LuminousService implements IAdblockService {
+    @Override
+    public String friendlyName() {
+        return ReVancedUtils.getString("revanced_proxy_luminous");
+    }
+
+    @Override
+    public Integer maxAttempts() {
+        return 2;
+    }
+
+    @Override
+    public Boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public Request rewriteHlsRequest(Request originalRequest) {
+        var type = IAdblockService.isVod(originalRequest) ? "vod" : "playlist";
+        var url = HttpUrl.parse("https://eu.luminous.dev/" +
+                type +
+                "/" +
+                IAdblockService.channelName(originalRequest) +
+                ".m3u8" +
+                "%3Fallow_source%3Dtrue%26allow_audio_only%3Dtrue%26fast_bread%3Dtrue"
+        );
+
+        if (url == null) {
+            LogHelper.error("Failed to parse rewritten URL");
+            return null;
+        }
+
+        // Overwrite old request
+        return new Request.Builder()
+                .get()
+                .url(url)
+                .build();
+    }
+}

app/src/main/java/app/revanced/twitch/adblock/PurpleAdblockService.java

@@ -1,14 +1,13 @@
 package app.revanced.twitch.adblock;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import app.revanced.twitch.api.RetrofitClient;
 import app.revanced.twitch.utils.LogHelper;
 import app.revanced.twitch.utils.ReVancedUtils;
 import okhttp3.HttpUrl;
 import okhttp3.Request;
-import okhttp3.ResponseBody;
+
+import java.util.HashMap;
+import java.util.Map;
 
 public class PurpleAdblockService implements IAdblockService {
     private final Map<String, Boolean> tunnels = new HashMap<>() {{
@@ -36,9 +35,13 @@ public class PurpleAdblockService implements IAdblockService {
                 if (!response.isSuccessful()) {
                     LogHelper.error("PurpleAdBlock tunnel $tunnel returned an error: HTTP code %d", response.code());
                     LogHelper.debug(response.message());
-                    if (response.errorBody() != null) {
-                        LogHelper.debug(((ResponseBody) response.errorBody()).string());
+
+                    try (var errorBody = response.errorBody()) {
+                        if (errorBody != null) {
+                            LogHelper.debug(errorBody.string());
+                        }
                     }
+
                     success = false;
                 }
             } catch (Exception ex) {

app/src/main/java/app/revanced/twitch/adblock/TTVLolService.java

@@ -1,70 +0,0 @@
-package app.revanced.twitch.adblock;
-
-import java.util.ArrayList;
-import java.util.Random;
-
-import app.revanced.twitch.utils.LogHelper;
-import app.revanced.twitch.utils.ReVancedUtils;
-import okhttp3.HttpUrl;
-import okhttp3.Request;
-
-public class TTVLolService implements IAdblockService {
-    @Override
-    public String friendlyName() {
-        return ReVancedUtils.getString("revanced_proxy_ttv_lol");
-    }
-
-    // TTV.lol is sometimes unstable
-    @Override
-    public Integer maxAttempts() {
-        return 4;
-    }
-
-    @Override
-    public Boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public Request rewriteHlsRequest(Request originalRequest) {
-
-        var type = "vod";
-        if (!IAdblockService.isVod(originalRequest))
-            type = "playlist";
-
-        var url = HttpUrl.parse("https://api.ttv.lol/" +
-                type + "/" +
-                IAdblockService.channelName(originalRequest) +
-                ".m3u8" + nextQuery()
-        );
-
-        if (url == null) {
-            LogHelper.error("Failed to parse rewritten URL");
-            return null;
-        }
-
-        // Overwrite old request
-        return new Request.Builder()
-                .get()
-                .url(url)
-                .addHeader("X-Donate-To", "https://ttv.lol/donate")
-                .build();
-    }
-
-    private String nextQuery() {
-        return SAMPLE_QUERY.replace("<SESSION>", generateSessionId());
-    }
-
-    private String generateSessionId() {
-        final var chars = "abcdef0123456789".toCharArray();
-
-        var sessionId = new ArrayList<Character>();
-        for (int i = 0; i < 32; i++)
-            sessionId.add(chars[randomSource.nextInt(16)]);
-
-        return sessionId.toString();
-    }
-
-    private final Random randomSource = new Random();
-    private final String SAMPLE_QUERY = "%3Fallow_source%3Dtrue%26fast_bread%3Dtrue%26allow_audio_only%3Dtrue%26p%3D0%26play_session_id%3D<SESSION>%26player_backend%3Dmediaplayer%26warp%3Dfalse%26force_preroll%3Dfalse%26mobile_cellular%3Dfalse";
-}

app/src/main/java/app/revanced/twitch/api/RequestInterceptor.java

@@ -1,21 +1,20 @@
 package app.revanced.twitch.api;
 
-import static app.revanced.twitch.adblock.IAdblockService.channelName;
-import static app.revanced.twitch.adblock.IAdblockService.isVod;
-
 import androidx.annotation.NonNull;
-
-import java.io.IOException;
-
 import app.revanced.twitch.adblock.IAdblockService;
+import app.revanced.twitch.adblock.LuminousService;
 import app.revanced.twitch.adblock.PurpleAdblockService;
-import app.revanced.twitch.adblock.TTVLolService;
 import app.revanced.twitch.settings.SettingsEnum;
 import app.revanced.twitch.utils.LogHelper;
 import app.revanced.twitch.utils.ReVancedUtils;
 import okhttp3.Interceptor;
 import okhttp3.Response;
 
+import java.io.IOException;
+
+import static app.revanced.twitch.adblock.IAdblockService.channelName;
+import static app.revanced.twitch.adblock.IAdblockService.isVod;
+
 public class RequestInterceptor implements Interceptor {
     private IAdblockService activeService = null;
 
@@ -87,8 +86,8 @@ public class RequestInterceptor implements Interceptor {
     private void updateActiveService() {
         var current = SettingsEnum.BLOCK_EMBEDDED_ADS.getString();
 
-        if (current.equals(ReVancedUtils.getString("key_revanced_proxy_ttv_lol")) && !(activeService instanceof TTVLolService))
-            activeService = new TTVLolService();
+        if (current.equals(ReVancedUtils.getString("key_revanced_proxy_luminous")) && !(activeService instanceof LuminousService))
+            activeService = new LuminousService();
         else if (current.equals(ReVancedUtils.getString("key_revanced_proxy_purpleadblock")) && !(activeService instanceof PurpleAdblockService))
             activeService = new PurpleAdblockService();
         else if (current.equals(ReVancedUtils.getString("key_revanced_proxy_disabled")))

app/src/main/java/app/revanced/twitch/settings/SettingsEnum.java

@@ -1,23 +1,21 @@
 package app.revanced.twitch.settings;
 
-import static java.lang.Boolean.FALSE;
-import static java.lang.Boolean.TRUE;
-import static app.revanced.twitch.settings.SettingsEnum.ReturnType.BOOLEAN;
-import static app.revanced.twitch.settings.SettingsEnum.ReturnType.STRING;
-
 import android.content.Context;
 import android.content.SharedPreferences;
-
 import androidx.annotation.NonNull;
-
 import app.revanced.twitch.utils.LogHelper;
 import app.revanced.twitch.utils.ReVancedUtils;
 
+import static app.revanced.twitch.settings.SettingsEnum.ReturnType.BOOLEAN;
+import static app.revanced.twitch.settings.SettingsEnum.ReturnType.STRING;
+import static java.lang.Boolean.FALSE;
+import static java.lang.Boolean.TRUE;
+
 public enum SettingsEnum {
     /* Ads */
     BLOCK_VIDEO_ADS("revanced_block_video_ads", BOOLEAN, TRUE),
     BLOCK_AUDIO_ADS("revanced_block_audio_ads", BOOLEAN, TRUE),
-    BLOCK_EMBEDDED_ADS("revanced_block_embedded_ads", STRING, "ttv-lol"),
+    BLOCK_EMBEDDED_ADS("revanced_block_embedded_ads", STRING, "luminous"),
 
     /* Chat */
     SHOW_DELETED_MESSAGES("revanced_show_deleted_messages", STRING, "cross-out"),

dummy/src/main/java/com/facebook/litho/ComponentHost.java

@@ -1,10 +0,0 @@
-package com.facebook.litho;
-
-import android.content.Context;
-import android.support.v7.widget.RecyclerView;
-
-public final class ComponentHost extends RecyclerView {
-    public ComponentHost(Context context) {
-        super(context);
-    }
-}

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 android.useAndroidX = true
-version = 0.116.0-dev.10
+version = 0.118.0-dev.11