chore: Release v5.23.0-dev.5 [skip ci]

# [5.23.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.23.0-dev.4...v5.23.0-dev.5) (2025-05-06)

### Bug Fixes

* **Spotify - Unlock Spotify Premium:** Remove pop up premium ads ([#4842](https://github.com/ReVanced/revanced-patches/issues/4842)) ([5028c1a](5028c1acb3))

### Features

* **Pandora:** Add `Disable audio ads` and `Unlimited skips` patch ([#4841](https://github.com/ReVanced/revanced-patches/issues/4841)) ([f4f36ff](f4f36ff273))
* **Prime Video:** Add `Skip ads` patch ([#4824](https://github.com/ReVanced/revanced-patches/issues/4824)) ([f8bdf74](f8bdf744ab))

.github/workflows/pull_strings.yml

@@ -2,7 +2,7 @@ name: Pull strings
 
 on:
   schedule:
-    - cron: "0 */6 * * *"
+    - cron: "0 */12 * * *"
   workflow_dispatch:
 
 jobs:

extensions/all/misc/adb/hide-adb/build.gradle.kts

@@ -0,0 +1,16 @@
+android {
+    namespace = "app.revanced.extension"
+
+    defaultConfig {
+        minSdk = 21
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}
+
+dependencies {
+    compileOnly(libs.annotation)
+}

extensions/all/misc/adb/hide-adb/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/all/misc/adb/hide-adb/src/main/java/app/revanced/extension/all/misc/hide/adb/HideAdbPatch.java

@@ -0,0 +1,28 @@
+package app.revanced.extension.all.misc.hide.adb;
+
+import android.content.ContentResolver;
+import android.provider.Settings;
+
+import java.util.Arrays;
+import java.util.List;
+
+@SuppressWarnings("unused")
+public final class HideAdbPatch {
+    private static final List<String> SPOOF_SETTINGS = Arrays.asList("adb_enabled", "adb_wifi_enabled", "development_settings_enabled");
+
+    public static int getInt(ContentResolver cr, String name) throws Settings.SettingNotFoundException {
+        if (SPOOF_SETTINGS.contains(name)) {
+            return 0;
+        }
+
+        return Settings.Global.getInt(cr, name);
+    }
+
+    public static int getInt(ContentResolver cr, String name, int def) {
+        if (SPOOF_SETTINGS.contains(name)) {
+            return 0;
+        }
+
+        return Settings.Global.getInt(cr, name, def);
+    }
+}

extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/build.gradle.kts

@@ -1,4 +1,11 @@
-android.namespace = "app.revanced.extension"
+android {
+    namespace = "app.revanced.extension"
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}
 
 dependencies {
     compileOnly(libs.annotation)

extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/src/main/java/app/revanced/extension/all/misc/connectivity/wifi/spoof/SpoofWifiPatch.java

@@ -1,4 +1,4 @@
-package app.revanced.extension.all.connectivity.wifi.spoof;
+package app.revanced.extension.all.misc.connectivity.wifi.spoof;
 
 import android.app.PendingIntent;
 import android.content.Context;
@@ -12,7 +12,7 @@ import android.os.Handler;
 
 import androidx.annotation.RequiresApi;
 
-/** @noinspection deprecation, unused */
+@SuppressWarnings({"deprecation", "unused"})
 public class SpoofWifiPatch {
 
     // Used to check what the (real or fake) active network is (take a look at `hasTransport`).

extensions/all/misc/directory/documentsprovider/export-internal-data-documents-provider/build.gradle.kts

@@ -1,3 +1,16 @@
+android {
+    namespace = "app.revanced.extension"
+
+    defaultConfig {
+        minSdk = 21
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}
+
 dependencies {
     compileOnly(libs.annotation)
 }

extensions/all/misc/directory/documentsprovider/export-internal-data-documents-provider/src/main/java/app/revanced/extension/all/misc/directory/documentsprovider/InternalDataDocumentsProvider.java

@@ -1,5 +1,6 @@
 package app.revanced.extension.all.misc.directory.documentsprovider;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ProviderInfo;
@@ -23,6 +24,7 @@ import java.util.Objects;
 /**
  * A DocumentsProvider that allows access to the app's internal data directory.
  */
+@SuppressLint("LongLogTag")
 public class InternalDataDocumentsProvider extends DocumentsProvider {
     private static final String[] rootColumns =
             {"root_id", "mime_types", "flags", "icon", "title", "summary", "document_id"};

extensions/all/misc/screencapture/remove-screen-capture-restriction/build.gradle.kts

@@ -1,4 +1,15 @@
-android.namespace = "app.revanced.extension"
+android {
+    namespace = "app.revanced.extension"
+
+    defaultConfig {
+        minSdk = 21
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}
 
 dependencies {
     compileOnly(libs.annotation)

extensions/all/misc/screencapture/remove-screen-capture-restriction/src/main/java/app/revanced/extension/all/misc/screencapture/removerestriction/RemoveScreenCaptureRestrictionPatch.java

@@ -1,11 +1,12 @@
-package app.revanced.extension.all.screencapture.removerestriction;
+package app.revanced.extension.all.misc.screencapture.removerestriction;
 
 import android.media.AudioAttributes;
 import android.os.Build;
 
 import androidx.annotation.RequiresApi;
 
-public final class RemoveScreencaptureRestrictionPatch {
+@SuppressWarnings("unused")
+public final class RemoveScreenCaptureRestrictionPatch {
     // Member of AudioAttributes.Builder
     @RequiresApi(api = Build.VERSION_CODES.Q)
     public static AudioAttributes.Builder setAllowedCapturePolicy(final AudioAttributes.Builder builder, final int capturePolicy) {

extensions/all/misc/screenshot/remove-screenshot-restriction/build.gradle.kts

@@ -1 +1,16 @@
-android.namespace = "app.revanced.extension"
+android {
+    namespace = "app.revanced.extension"
+
+    defaultConfig {
+        minSdk = 21
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}
+
+dependencies {
+    compileOnly(libs.annotation)
+}

extensions/all/misc/screenshot/remove-screenshot-restriction/src/main/java/app/revanced/extension/all/misc/screenshot/removerestriction/RemoveScreenshotRestrictionPatch.java

@@ -1,8 +1,9 @@
-package app.revanced.extension.all.screenshot.removerestriction;
+package app.revanced.extension.all.misc.screenshot.removerestriction;
 
 import android.view.Window;
 import android.view.WindowManager;
 
+@SuppressWarnings("unused")
 public class RemoveScreenshotRestrictionPatch {
 
     public static void addFlags(Window window, int flags) {

extensions/boostforreddit/stub/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 android {
     namespace = "app.revanced.extension"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24

extensions/music/build.gradle.kts

@@ -1 +1,5 @@
-// Do not remove. Necessary for the extension plugin to be applied to the project.
+android {
+    defaultConfig {
+        minSdk = 26
+    }
+}

extensions/nunl/build.gradle.kts

@@ -0,0 +1,4 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+    compileOnly(project(":extensions:nunl:stub"))
+}

extensions/nunl/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/nunl/src/main/java/app/revanced/extension/nunl/ads/HideAdsPatch.java

@@ -0,0 +1,114 @@
+package app.revanced.extension.nunl.ads;
+
+import nl.nu.performance.api.client.interfaces.Block;
+import nl.nu.performance.api.client.unions.SmallArticleLinkFlavor;
+import nl.nu.performance.api.client.objects.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+public class HideAdsPatch {
+    private static final String[] blockedHeaderBlocks = {
+            "Aanbiedingen (Adverteerders)",
+            "Aangeboden door NUshop"
+    };
+
+    // "Rubrieken" menu links to ads.
+    private static final String[] blockedLinkBlocks = {
+            "Van onze adverteerders"
+    };
+
+    public static void filterAds(List<Block> blocks) {
+        try {
+            ArrayList<Block> cleanedList = new ArrayList<>();
+
+            boolean skipFullHeader = false;
+            boolean skipUntilDivider = false;
+
+            int index = 0;
+            while (index < blocks.size()) {
+                Block currentBlock = blocks.get(index);
+
+                // Because of pagination, we might not see the Divider in front of it.
+                // Just remove it as is and leave potential extra spacing visible on the screen.
+                if (currentBlock instanceof DpgBannerBlock) {
+                    index++;
+                    continue;
+                }
+
+                if (index + 1 < blocks.size()) {
+                    // Filter Divider -> DpgMediaBanner -> Divider.
+                    if (currentBlock instanceof DividerBlock
+                            && blocks.get(index + 1) instanceof DpgBannerBlock) {
+                        index += 2;
+                        continue;
+                    }
+
+                    // Filter Divider -> LinkBlock (... -> LinkBlock -> LinkBlock-> LinkBlock -> Divider).
+                    if (currentBlock instanceof DividerBlock
+                            && blocks.get(index + 1) instanceof LinkBlock linkBlock) {
+                        Link link = linkBlock.getLink();
+                        if (link != null && link.getTitle() != null) {
+                            for (String blockedLinkBlock : blockedLinkBlocks) {
+                                if (blockedLinkBlock.equals(link.getTitle().getText())) {
+                                    skipUntilDivider = true;
+                                    break;
+                                }
+                            }
+                            if (skipUntilDivider) {
+                                index++;
+                                continue;
+                            }
+                        }
+                    }
+                }
+
+                // Skip LinkBlocks with a "flavor" claiming to be "isPartner" (sponsored inline ads).
+                if (currentBlock instanceof LinkBlock linkBlock
+                        && linkBlock.getLink() != null
+                        && linkBlock.getLink().getLinkFlavor() instanceof SmallArticleLinkFlavor smallArticleLinkFlavor
+                        && smallArticleLinkFlavor.isPartner() != null
+                        && smallArticleLinkFlavor.isPartner()) {
+                    index++;
+                    continue;
+                }
+
+                if (currentBlock instanceof DividerBlock) {
+                    skipUntilDivider = false;
+                }
+
+                // Filter HeaderBlock with known ads until next HeaderBlock.
+                if (currentBlock instanceof HeaderBlock headerBlock) {
+                    StyledText headerText = headerBlock.component20();
+                    if (headerText != null) {
+                        skipFullHeader = false;
+                        for (String blockedHeaderBlock : blockedHeaderBlocks) {
+                            if (blockedHeaderBlock.equals(headerText.getText())) {
+                                skipFullHeader = true;
+                                break;
+                            }
+                        }
+                        if (skipFullHeader) {
+                            index++;
+                            continue;
+                        }
+                    }
+                }
+
+                if (!skipFullHeader && !skipUntilDivider) {
+                    cleanedList.add(currentBlock);
+                }
+                index++;
+            }
+
+            // Replace list in-place to not deal with moving the result to the correct register in smali.
+            blocks.clear();
+            blocks.addAll(cleanedList);
+        } catch (Exception ex) {
+            Logger.printException(() -> "filterAds failure", ex);
+        }
+    }
+}

extensions/nunl/stub/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    id(libs.plugins.android.library.get().pluginId)
+}
+
+android {
+    namespace = "app.revanced.extension"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 26
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}

extensions/nunl/stub/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/interfaces/Block.java

@@ -0,0 +1,5 @@
+package nl.nu.performance.api.client.interfaces;
+
+public class Block {
+
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/objects/DividerBlock.java

@@ -0,0 +1,7 @@
+package nl.nu.performance.api.client.objects;
+
+import nl.nu.performance.api.client.interfaces.Block;
+
+public class DividerBlock extends Block  {
+
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/objects/DpgBannerBlock.java

@@ -0,0 +1,7 @@
+package nl.nu.performance.api.client.objects;
+
+import nl.nu.performance.api.client.interfaces.Block;
+
+public class DpgBannerBlock extends Block {
+
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/objects/HeaderBlock.java

@@ -0,0 +1,10 @@
+package nl.nu.performance.api.client.objects;
+
+import nl.nu.performance.api.client.interfaces.Block;
+
+public class HeaderBlock extends Block {
+    // returns title
+    public final StyledText component20() {
+        throw new UnsupportedOperationException("Stub");
+    }
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/objects/Link.java

@@ -0,0 +1,13 @@
+package nl.nu.performance.api.client.objects;
+
+import nl.nu.performance.api.client.unions.LinkFlavor;
+
+public class Link {
+    public final StyledText getTitle() {
+        throw new UnsupportedOperationException("Stub");
+    }
+
+    public final LinkFlavor getLinkFlavor() {
+        throw new UnsupportedOperationException("Stub");
+    }
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/objects/LinkBlock.java

@@ -0,0 +1,10 @@
+package nl.nu.performance.api.client.objects;
+
+import android.os.Parcelable;
+import nl.nu.performance.api.client.interfaces.Block;
+
+public abstract class LinkBlock extends Block implements Parcelable {
+    public final Link getLink() {
+        throw new UnsupportedOperationException("Stub");
+    }
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/objects/StyledText.java

@@ -0,0 +1,7 @@
+package nl.nu.performance.api.client.objects;
+
+public class StyledText  {
+    public final String getText() {
+        throw new UnsupportedOperationException("Stub");
+    }
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/unions/LinkFlavor.java

@@ -0,0 +1,4 @@
+package nl.nu.performance.api.client.unions;
+
+public interface LinkFlavor {
+}

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/unions/SmallArticleLinkFlavor.java

@@ -0,0 +1,7 @@
+package nl.nu.performance.api.client.unions;
+
+public class SmallArticleLinkFlavor implements LinkFlavor {
+    public final Boolean isPartner() {
+        throw new UnsupportedOperationException("Stub");
+    }
+}

extensions/primevideo/build.gradle.kts

@@ -0,0 +1,4 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+    compileOnly(project(":extensions:primevideo:stub"))
+}

extensions/primevideo/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/primevideo/src/main/java/app/revanced/extension/primevideo/ads/SkipAdsPatch.java

@@ -0,0 +1,36 @@
+package app.revanced.extension.primevideo.ads;
+
+import com.amazon.avod.fsm.SimpleTrigger;
+import com.amazon.avod.media.ads.AdBreak;
+import com.amazon.avod.media.ads.internal.state.AdBreakTrigger;
+import com.amazon.avod.media.ads.internal.state.AdEnabledPlayerTriggerType;
+import com.amazon.avod.media.playback.VideoPlayer;
+import com.amazon.avod.media.ads.internal.state.ServerInsertedAdBreakState;
+
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+public final class SkipAdsPatch {
+    public static void enterServerInsertedAdBreakState(ServerInsertedAdBreakState state, AdBreakTrigger trigger, VideoPlayer player) {
+        try {
+            AdBreak adBreak = trigger.getBreak();
+
+            // There are two scenarios when entering the original method:
+            //  1. Player naturally entered an ad break while watching a video.
+            //  2. User is skipped/scrubbed to a position on the timeline. If seek position is past an ad break,
+            //     user is forced to watch an ad before continuing.
+            //
+            // Scenario 2 is indicated by trigger.getSeekStartPosition() != null, so skip directly to the scrubbing
+            // target. Otherwise, just calculate when the ad break should end and skip to there.
+            if (trigger.getSeekStartPosition() != null)
+                player.seekTo(trigger.getSeekTarget().getTotalMilliseconds());
+            else
+                player.seekTo(player.getCurrentPosition() + adBreak.getDurationExcludingAux().getTotalMilliseconds());
+
+            // Send "end of ads" trigger to state machine so everything doesn't get whacky.
+            state.doTrigger(new SimpleTrigger(AdEnabledPlayerTriggerType.NO_MORE_ADS_SKIP_TRANSITION));
+        } catch (Exception ex) {
+            Logger.printException(() -> "Failed skipping ads", ex);
+        }
+    }
+}

extensions/primevideo/stub/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    id(libs.plugins.android.library.get().pluginId)
+}
+
+android {
+    namespace = "app.revanced.extension"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 21
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}

extensions/primevideo/stub/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/primevideo/stub/src/main/java/com/amazon/avod/fsm/SimpleTrigger.java

@@ -0,0 +1,6 @@
+package com.amazon.avod.fsm;
+
+public final class SimpleTrigger<T> implements Trigger<T> {
+    public SimpleTrigger(T triggerType) {
+    }
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/fsm/StateBase.java

@@ -0,0 +1,7 @@
+package com.amazon.avod.fsm;
+
+public abstract class StateBase<S, T> {
+    // This method orginally has protected access (modified in patch code).
+    public void doTrigger(Trigger<T> trigger) {
+    }
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/fsm/Trigger.java

@@ -0,0 +1,4 @@
+package com.amazon.avod.fsm;
+
+public interface Trigger<T> {
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/TimeSpan.java

@@ -0,0 +1,7 @@
+package com.amazon.avod.media;
+
+public final class TimeSpan {
+    public long getTotalMilliseconds() {
+        throw new UnsupportedOperationException();
+    }
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/ads/AdBreak.java

@@ -0,0 +1,7 @@
+package com.amazon.avod.media.ads;
+
+import com.amazon.avod.media.TimeSpan;
+
+public interface AdBreak {
+    TimeSpan getDurationExcludingAux();
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/ads/internal/state/AdBreakState.java

@@ -0,0 +1,4 @@
+package com.amazon.avod.media.ads.internal.state;
+
+public abstract class AdBreakState extends AdEnabledPlaybackState {
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/ads/internal/state/AdBreakTrigger.java

@@ -0,0 +1,18 @@
+package com.amazon.avod.media.ads.internal.state;
+
+import com.amazon.avod.media.ads.AdBreak;
+import com.amazon.avod.media.TimeSpan;
+
+public class AdBreakTrigger {
+    public AdBreak getBreak() {
+        throw new UnsupportedOperationException();
+    }
+
+    public TimeSpan getSeekTarget() {
+        throw new UnsupportedOperationException();
+    }
+
+    public TimeSpan getSeekStartPosition() {
+        throw new UnsupportedOperationException();
+    }
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/ads/internal/state/AdEnabledPlaybackState.java

@@ -0,0 +1,8 @@
+package com.amazon.avod.media.ads.internal.state;
+
+import com.amazon.avod.fsm.StateBase;
+import com.amazon.avod.media.playback.state.PlayerStateType;
+import com.amazon.avod.media.playback.state.trigger.PlayerTriggerType;
+
+public class AdEnabledPlaybackState extends StateBase<PlayerStateType, PlayerTriggerType> {
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/ads/internal/state/AdEnabledPlayerTriggerType.java

@@ -0,0 +1,5 @@
+package com.amazon.avod.media.ads.internal.state;
+
+public enum AdEnabledPlayerTriggerType {
+    NO_MORE_ADS_SKIP_TRANSITION
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/ads/internal/state/ServerInsertedAdBreakState.java

@@ -0,0 +1,4 @@
+package com.amazon.avod.media.ads.internal.state;
+
+public class ServerInsertedAdBreakState extends AdBreakState {
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/playback/VideoPlayer.java

@@ -0,0 +1,7 @@
+package com.amazon.avod.media.playback;
+
+public interface VideoPlayer {
+    long getCurrentPosition();
+
+    void seekTo(long positionMs);
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/playback/state/PlayerStateType.java

@@ -0,0 +1,4 @@
+package com.amazon.avod.media.playback.state;
+
+public interface PlayerStateType {
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/playback/state/trigger/PlayerTriggerType.java

@@ -0,0 +1,4 @@
+package com.amazon.avod.media.playback.state.trigger;
+
+public interface PlayerTriggerType {
+}

extensions/reddit/stub/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 android {
     namespace = "app.revanced.extension"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24

extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java

@@ -20,9 +20,7 @@ import androidx.annotation.RequiresApi;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-/**
- * @noinspection unused
- */
+@SuppressWarnings("unused")
 public class GmsCoreSupport {
     private static final String PACKAGE_NAME_YOUTUBE = "com.google.android.youtube";
     private static final String PACKAGE_NAME_YOUTUBE_MUSIC = "com.google.android.apps.youtube.music";

extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java

@@ -9,6 +9,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.graphics.Color;
 import android.net.ConnectivityManager;
 import android.os.Build;
 import android.os.Bundle;
@@ -356,33 +357,24 @@ public class Utils {
 
     public static Context getContext() {
         if (context == null) {
-            Logger.initializationException(Utils.class, "Context is null, returning null!",  null);
+            Logger.initializationException(Utils.class, "Context is not set by extension hook, returning null",  null);
         }
         return context;
     }
 
     public static void setContext(Context appContext) {
-        // Must initially set context as the language settings needs it.
+        // Must initially set context to check the app language.
         context = appContext;
+        Logger.initializationInfo(Utils.class, "Set context: " + appContext);
 
         AppLanguage language = BaseSettings.REVANCED_LANGUAGE.get();
         if (language != AppLanguage.DEFAULT) {
             // Create a new context with the desired language.
+            Logger.printDebug(() -> "Using app language: " + language);
             Configuration config = appContext.getResources().getConfiguration();
             config.setLocale(language.getLocale());
             context = appContext.createConfigurationContext(config);
         }
-
-        // In some apps like TikTok, the Setting classes can load in weird orders due to cyclic class dependencies.
-        // Calling the regular printDebug method here can cause a Settings context null pointer exception,
-        // even though the context is already set before the call.
-        //
-        // The initialization logger methods do not directly or indirectly
-        // reference the Context or any Settings and are unaffected by this problem.
-        //
-        // Info level also helps debug if a patch hook is called before
-        // the context is set since debug logging is off by default.
-        Logger.initializationInfo(Utils.class, "Set context: " + appContext);
     }
 
     public static void setClipboard(@NonNull String text) {
@@ -808,4 +800,14 @@ public class Utils {
             builder.getContext().setTheme(editTextDialogStyle);
         }
     }
+
+    /**
+     * Parse a color resource or hex code to an int representation of the color.
+     */
+    public static int getColorFromString(String colorString) throws IllegalArgumentException, Resources.NotFoundException {
+        if (colorString.startsWith("#")) {
+            return Color.parseColor(colorString);
+        }
+        return getResourceColor(colorString);
+    }
 }

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/AppLanguage.java

@@ -8,6 +8,9 @@ public enum AppLanguage {
      */
     DEFAULT,
 
+    // Languages codes not included with YouTube, but are translated on Crowdin
+    GA,
+
     // Language codes found in locale_config.xml
     // All region specific variants have been removed.
     AF,

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java

@@ -23,12 +23,17 @@ public class BaseSettings {
 
     public static final EnumSetting<AppLanguage> REVANCED_LANGUAGE = new EnumSetting<>("revanced_language", AppLanguage.DEFAULT, true, "revanced_language_user_dialog_message");
 
+    /**
+     * Use the icons declared in the preferences created during patching. If no icons or styles are declared then this setting does nothing.
+     */
+    public static final BooleanSetting SHOW_MENU_ICONS = new BooleanSetting("revanced_show_menu_icons", TRUE, true);
+
     public static final BooleanSetting SPOOF_VIDEO_STREAMS = new BooleanSetting("revanced_spoof_video_streams", TRUE, true, "revanced_spoof_video_streams_user_dialog_message");
     public static final EnumSetting<AppLanguage> SPOOF_VIDEO_STREAMS_LANGUAGE = new EnumSetting<>("revanced_spoof_video_streams_language", AppLanguage.DEFAULT, new AudioStreamLanguageOverrideAvailability());
     public static final BooleanSetting SPOOF_STREAMING_DATA_STATS_FOR_NERDS = new BooleanSetting("revanced_spoof_streaming_data_stats_for_nerds", TRUE, parent(SPOOF_VIDEO_STREAMS));
     public static final BooleanSetting SPOOF_VIDEO_STREAMS_IOS_FORCE_AVC = new BooleanSetting("revanced_spoof_video_streams_ios_force_avc", FALSE, true,
             "revanced_spoof_video_streams_ios_force_avc_user_dialog_message", new SpoofiOSAvailability());
     // Client type must be last spoof setting due to cyclic references.
-    public static final EnumSetting<ClientType> SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client_type", ClientType.ANDROID_VR, true, parent(SPOOF_VIDEO_STREAMS));
+    public static final EnumSetting<ClientType> SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client_type", ClientType.ANDROID_UNPLUGGED, true, parent(SPOOF_VIDEO_STREAMS));
 
 }

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BooleanSetting.java

@@ -47,6 +47,10 @@ public class BooleanSetting extends Setting<Boolean> {
      */
     public static void privateSetValue(@NonNull BooleanSetting setting, @NonNull Boolean newValue) {
         setting.value = Objects.requireNonNull(newValue);
+
+        if (setting.isSetToDefault()) {
+            setting.removeFromPreferences();
+        }
     }
 
     @Override
@@ -65,10 +69,8 @@ public class BooleanSetting extends Setting<Boolean> {
     }
 
     @Override
-    public void save(@NonNull Boolean newValue) {
-        // Must set before saving to preferences (otherwise importing fails to update UI correctly).
-        value = Objects.requireNonNull(newValue);
-        preferences.saveBoolean(key, newValue);
+    public void saveToPreferences() {
+        preferences.saveBoolean(key, value);
     }
 
     @NonNull

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/EnumSetting.java

@@ -89,10 +89,8 @@ public class EnumSetting<T extends Enum<?>> extends Setting<T> {
     }
 
     @Override
-    public void save(@NonNull T newValue) {
-        // Must set before saving to preferences (otherwise importing fails to update UI correctly).
-        value = Objects.requireNonNull(newValue);
-        preferences.saveEnumAsString(key, newValue);
+    public void saveToPreferences() {
+        preferences.saveEnumAsString(key, value);
     }
 
     @NonNull

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/FloatSetting.java

@@ -55,10 +55,8 @@ public class FloatSetting extends Setting<Float> {
     }
 
     @Override
-    public void save(@NonNull Float newValue) {
-        // Must set before saving to preferences (otherwise importing fails to update UI correctly).
-        value = Objects.requireNonNull(newValue);
-        preferences.saveFloatString(key, newValue);
+    public void saveToPreferences() {
+        preferences.saveFloatString(key, value);
     }
 
     @NonNull

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/IntegerSetting.java

@@ -55,10 +55,8 @@ public class IntegerSetting extends Setting<Integer> {
     }
 
     @Override
-    public void save(@NonNull Integer newValue) {
-        // Must set before saving to preferences (otherwise importing fails to update UI correctly).
-        value = Objects.requireNonNull(newValue);
-        preferences.saveIntegerString(key, newValue);
+    public void saveToPreferences() {
+        preferences.saveIntegerString(key, value);
     }
 
     @NonNull

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/LongSetting.java

@@ -55,10 +55,8 @@ public class LongSetting extends Setting<Long> {
     }
 
     @Override
-    public void save(@NonNull Long newValue) {
-        // Must set before saving to preferences (otherwise importing fails to update UI correctly).
-        value = Objects.requireNonNull(newValue);
-        preferences.saveLongString(key, newValue);
+    public void saveToPreferences() {
+        preferences.saveLongString(key, value);
     }
 
     @NonNull

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java

@@ -14,7 +14,6 @@ import java.util.*;
 
 import static app.revanced.extension.shared.StringRef.str;
 
-@SuppressWarnings("unused")
 public abstract class Setting<T> {
 
     /**
@@ -288,6 +287,13 @@ public abstract class Setting<T> {
      */
     public static void privateSetValueFromString(@NonNull Setting<?> setting, @NonNull String newValue) {
         setting.setValueFromString(newValue);
+
+        // Clear the preference value since default is used, to allow changing
+        // the changing the default for a future release.  Without this after upgrading
+        // the saved value will be whatever was the default when the app was first installed.
+        if (setting.isSetToDefault()) {
+            setting.removeFromPreferences();
+        }
     }
 
     /**
@@ -303,16 +309,45 @@ public abstract class Setting<T> {
     /**
      * Persistently saves the value.
      */
-    public abstract void save(@NonNull T newValue);
+    public final void save(@NonNull T newValue) {
+        if (value.equals(newValue)) {
+            return;
+        }
+
+        // Must set before saving to preferences (otherwise importing fails to update UI correctly).
+        value = Objects.requireNonNull(newValue);
+
+        if (defaultValue.equals(newValue)) {
+            removeFromPreferences();
+        } else {
+            saveToPreferences();
+        }
+    }
+
+    /**
+     * Save {@link #value} to {@link #preferences}.
+     */
+    protected abstract void saveToPreferences();
+
+    /**
+     * Remove {@link #value} from {@link #preferences}.
+     */
+    protected final void removeFromPreferences() {
+        Logger.printDebug(() -> "Clearing stored preference value (reset to default): " + key);
+        preferences.removeKey(key);
+    }
 
     @NonNull
     public abstract T get();
 
     /**
      * Identical to calling {@link #save(Object)} using {@link #defaultValue}.
+     *
+     * @return The newly saved default value.
      */
-    public void resetToDefault() {
+    public T resetToDefault() {
         save(defaultValue);
+        return defaultValue;
     }
 
     /**

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/StringSetting.java

@@ -55,10 +55,8 @@ public class StringSetting extends Setting<String> {
     }
 
     @Override
-    public void save(@NonNull String newValue) {
-        // Must set before saving to preferences (otherwise importing fails to update UI correctly).
-        value = Objects.requireNonNull(newValue);
-        preferences.saveString(key, newValue);
+    public void saveToPreferences() {
+        preferences.saveString(key, value);
     }
 
     @NonNull

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java

@@ -22,12 +22,23 @@ import app.revanced.extension.shared.settings.Setting;
 
 @SuppressWarnings("deprecation")
 public abstract class AbstractPreferenceFragment extends PreferenceFragment {
+
     /**
      * Indicates that if a preference changes,
      * to apply the change from the Setting to the UI component.
      */
     public static boolean settingImportInProgress;
 
+    /**
+     * Prevents recursive calls during preference <-> UI syncing from showing extra dialogs.
+     */
+    private static boolean updatingPreference;
+
+    /**
+     * Used to prevent showing reboot dialog, if user cancels a setting user dialog.
+     */
+    private static boolean showingUserDialogMessage;
+
     /**
      * Confirm and restart dialog button text and title.
      * Set by subclasses if Strings cannot be added as a resource.
@@ -35,13 +46,13 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
     @Nullable
     protected static String restartDialogButtonText, restartDialogTitle, confirmDialogTitle;
 
-    /**
-     * Used to prevent showing reboot dialog, if user cancels a setting user dialog.
-     */
-    private boolean showingUserDialogMessage;
-
     private final SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> {
         try {
+            if (updatingPreference) {
+                Logger.printDebug(() -> "Ignoring preference change as sync is in progress");
+                return;
+            }
+
             Setting<?> setting = Setting.getSettingFromPath(Objects.requireNonNull(str));
             if (setting == null) {
                 return;
@@ -63,16 +74,18 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
                 }
             }
 
+            updatingPreference = true;
             // Apply 'Setting <- Preference', unless during importing when it needs to be 'Setting -> Preference'.
+            // Updating here can can cause a recursive call back into this same method.
             updatePreference(pref, setting, true, settingImportInProgress);
             // Update any other preference availability that may now be different.
             updateUIAvailability();
+            updatingPreference = false;
         } catch (Exception ex) {
             Logger.printException(() -> "OnSharedPreferenceChangeListener failure", ex);
         }
     };
 
-
     /**
      * Initialize this instance, and do any custom behavior.
      * <p>
@@ -81,7 +94,10 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
      * so all app specific {@link Setting} instances are loaded before this method returns.
      */
     protected void initialize() {
-        final var identifier = Utils.getResourceIdentifier("revanced_prefs", "xml");
+        String preferenceResourceName = BaseSettings.SHOW_MENU_ICONS.get()
+                ? "revanced_prefs_icons"
+                : "revanced_prefs";
+        final var identifier = Utils.getResourceIdentifier(preferenceResourceName, "xml");
         if (identifier == 0) return;
         addPreferencesFromResource(identifier);
 
@@ -97,7 +113,9 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
         if (confirmDialogTitle == null) {
             confirmDialogTitle = str("revanced_settings_confirm_user_dialog_title");
         }
+
         showingUserDialogMessage = true;
+
         new AlertDialog.Builder(context)
                 .setTitle(confirmDialogTitle)
                 .setMessage(Objects.requireNonNull(setting.userDialogMessage).toString())
@@ -141,14 +159,16 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
      * @return If the preference is currently set to the default value of the Setting.
      */
     protected boolean prefIsSetToDefault(Preference pref, Setting<?> setting) {
+        Object defaultValue = setting.defaultValue;
         if (pref instanceof SwitchPreference switchPref) {
-            return switchPref.isChecked() == (Boolean) setting.defaultValue;
+            return switchPref.isChecked() == (Boolean) defaultValue;
         }
+        String defaultValueString = defaultValue.toString();
         if (pref instanceof EditTextPreference editPreference) {
-            return editPreference.getText().equals(setting.defaultValue.toString());
+            return editPreference.getText().equals(defaultValueString);
         }
         if (pref instanceof ListPreference listPref) {
-            return listPref.getValue().equals(setting.defaultValue.toString());
+            return listPref.getValue().equals(defaultValueString);
         }
 
         throw new IllegalStateException("Must override method to handle "
@@ -158,16 +178,16 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
     /**
      * Syncs all UI Preferences to any {@link Setting} they represent.
      */
-    private void updatePreferenceScreen(@NonNull PreferenceScreen screen,
+    private void updatePreferenceScreen(@NonNull PreferenceGroup group,
                                         boolean syncSettingValue,
                                         boolean applySettingToPreference) {
         // Alternatively this could iterate thru all Settings and check for any matching Preferences,
         // but there are many more Settings than UI preferences so it's more efficient to only check
         // the Preferences.
-        for (int i = 0, prefCount = screen.getPreferenceCount(); i < prefCount; i++) {
-            Preference pref = screen.getPreference(i);
-            if (pref instanceof PreferenceScreen) {
-                updatePreferenceScreen((PreferenceScreen) pref, syncSettingValue, applySettingToPreference);
+        for (int i = 0, prefCount = group.getPreferenceCount(); i < prefCount; i++) {
+            Preference pref = group.getPreference(i);
+            if (pref instanceof PreferenceGroup subGroup) {
+                updatePreferenceScreen(subGroup, syncSettingValue, applySettingToPreference);
             } else if (pref.hasKey()) {
                 String key = pref.getKey();
                 Setting<?> setting = Setting.getSettingFromPath(key);
@@ -255,7 +275,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
         }
     }
 
-    public static void showRestartDialog(@NonNull final Context context) {
+    public static void showRestartDialog(Context context) {
         Utils.verifyOnMainThread();
         if (restartDialogTitle == null) {
             restartDialogTitle = str("revanced_settings_restart_title");
@@ -263,6 +283,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
         if (restartDialogButtonText == null) {
             restartDialogButtonText = str("revanced_settings_restart");
         }
+
         new AlertDialog.Builder(context)
                 .setMessage(restartDialogTitle)
                 .setPositiveButton(restartDialogButtonText, (dialog, id)

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/NoTitlePreferenceCategory.java

@@ -0,0 +1,54 @@
+package app.revanced.extension.shared.settings.preference;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.preference.PreferenceCategory;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Empty preference category with no title, used to organize and group related preferences together.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class NoTitlePreferenceCategory extends PreferenceCategory {
+
+    public NoTitlePreferenceCategory(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public NoTitlePreferenceCategory(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public NoTitlePreferenceCategory(Context context) {
+        super(context);
+    }
+
+    @Override
+    @SuppressLint("MissingSuperCall")
+    protected View onCreateView(ViewGroup parent) {
+        // Return an zero-height view to eliminate empty title space.
+        return new View(getContext());
+    }
+
+    @Override
+    public CharSequence getTitle() {
+        // Title can be used for sorting. Return the first sub preference title.
+        if (getPreferenceCount() > 0) {
+            return getPreference(0).getTitle();
+        }
+
+        return super.getTitle();
+    }
+
+    @Override
+    public int getTitleRes() {
+        if (getPreferenceCount() > 0) {
+            return getPreference(0).getTitleRes();
+        }
+
+        return super.getTitleRes();
+    }
+}
+

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ResettableEditTextPreference.java

@@ -1,5 +1,7 @@
 package app.revanced.extension.shared.settings.preference;
 
+import static app.revanced.extension.shared.StringRef.str;
+
 import android.app.AlertDialog;
 import android.content.Context;
 import android.os.Bundle;
@@ -8,17 +10,23 @@ import android.util.AttributeSet;
 import android.widget.Button;
 import android.widget.EditText;
 
-import app.revanced.extension.shared.Utils;
-import app.revanced.extension.shared.settings.Setting;
-import app.revanced.extension.shared.Logger;
+import androidx.annotation.Nullable;
 
 import java.util.Objects;
 
-import static app.revanced.extension.shared.StringRef.str;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.Setting;
 
 @SuppressWarnings({"unused", "deprecation"})
 public class ResettableEditTextPreference extends EditTextPreference {
 
+    /**
+     * Setting to reset.
+     */
+    @Nullable
+    private Setting<?> setting;
+
     public ResettableEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
@@ -32,12 +40,22 @@ public class ResettableEditTextPreference extends EditTextPreference {
         super(context);
     }
 
+    public void setSetting(@Nullable Setting<?> setting) {
+        this.setting = setting;
+    }
+
     @Override
     protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
         super.onPrepareDialogBuilder(builder);
         Utils.setEditTextDialogTheme(builder);
 
-        Setting<?> setting = Setting.getSettingFromPath(getKey());
+        if (setting == null) {
+            String key = getKey();
+            if (key != null) {
+                setting = Setting.getSettingFromPath(key);
+            }
+        }
+
         if (setting != null) {
             builder.setNeutralButton(str("revanced_settings_reset"), null);
         }
@@ -54,8 +72,7 @@ public class ResettableEditTextPreference extends EditTextPreference {
         }
         button.setOnClickListener(v -> {
             try {
-                Setting<?> setting = Objects.requireNonNull(Setting.getSettingFromPath(getKey()));
-                String defaultStringValue = setting.defaultValue.toString();
+                String defaultStringValue = Objects.requireNonNull(setting).defaultValue.toString();
                 EditText editText = getEditText();
                 editText.setText(defaultStringValue);
                 editText.setSelection(defaultStringValue.length()); // move cursor to end of text

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java

@@ -66,22 +66,6 @@ public enum ClientType {
             true,
             "Android Creator"
     ),
-    ANDROID_VR(
-            ANDROID_VR_NO_AUTH.id,
-            ANDROID_VR_NO_AUTH.clientName,
-            ANDROID_VR_NO_AUTH.packageName,
-            ANDROID_VR_NO_AUTH.deviceMake,
-            ANDROID_VR_NO_AUTH.deviceModel,
-            ANDROID_VR_NO_AUTH.osName,
-            ANDROID_VR_NO_AUTH.osVersion,
-            ANDROID_VR_NO_AUTH.androidSdkVersion,
-            ANDROID_VR_NO_AUTH.buildId,
-            ANDROID_VR_NO_AUTH.cronetVersion,
-            ANDROID_VR_NO_AUTH.clientVersion,
-            ANDROID_VR_NO_AUTH.requiresAuth,
-            true,
-            "Android VR"
-    ),
     IOS_UNPLUGGED(
             33,
             "IOS_UNPLUGGED",
@@ -112,6 +96,22 @@ public enum ClientType {
             forceAVC()
                     ? "iOS TV Force AVC"
                     : "iOS TV"
+    ),
+    ANDROID_VR_AUTH(
+            ANDROID_VR_NO_AUTH.id,
+            ANDROID_VR_NO_AUTH.clientName,
+            ANDROID_VR_NO_AUTH.packageName,
+            ANDROID_VR_NO_AUTH.deviceMake,
+            ANDROID_VR_NO_AUTH.deviceModel,
+            ANDROID_VR_NO_AUTH.osName,
+            ANDROID_VR_NO_AUTH.osVersion,
+            ANDROID_VR_NO_AUTH.androidSdkVersion,
+            ANDROID_VR_NO_AUTH.buildId,
+            ANDROID_VR_NO_AUTH.cronetVersion,
+            ANDROID_VR_NO_AUTH.clientVersion,
+            ANDROID_VR_NO_AUTH.requiresAuth,
+            true,
+            "Android VR Auth"
     );
 
     private static boolean forceAVC() {

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/SpoofVideoStreamsPatch.java

@@ -107,6 +107,36 @@ public class SpoofVideoStreamsPatch {
         return false;
     }
 
+    /**
+     * Injection point.
+     * Turns off a feature flag that interferes with spoofing.
+     */
+    public static boolean useMediaFetchHotConfigReplacement(boolean original) {
+        if (original) {
+            Logger.printDebug(() -> "useMediaFetchHotConfigReplacement is set on");
+        }
+
+        if (!SPOOF_STREAMING_DATA) {
+            return original;
+        }
+        return false;
+    }
+
+    /**
+     * Injection point.
+     * Turns off a feature flag that interferes with video playback.
+     */
+    public static boolean usePlaybackStartFeatureFlag(boolean original) {
+        if (original) {
+            Logger.printDebug(() -> "usePlaybackStartFeatureFlag is set on");
+        }
+
+        if (!SPOOF_STREAMING_DATA) {
+            return original;
+        }
+        return false;
+    }
+
     /**
      * Injection point.
      */

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/StreamingDataRequest.java

@@ -204,7 +204,7 @@ public class StreamingDataRequest {
                     // but empty response body does.
                     if (connection.getContentLength() == 0) {
                         if (BaseSettings.DEBUG.get() && BaseSettings.DEBUG_TOAST_ON_ERROR.get()) {
-                            Utils.showToastShort("Ignoring empty spoof stream client: " + clientType);
+                            Utils.showToastShort("Debug: Ignoring empty spoof stream client " + clientType);
                         }
                     } else {
                         try (InputStream inputStream = new BufferedInputStream(connection.getInputStream());

extensions/spotify/build.gradle.kts

@@ -0,0 +1,16 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+    compileOnly(project(":extensions:spotify:stub"))
+    compileOnly(libs.annotation)
+}
+
+android {
+    defaultConfig {
+        minSdk = 24
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}

extensions/spotify/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/spotify/src/main/java/app/revanced/extension/spotify/layout/theme/CustomThemePatch.java

@@ -0,0 +1,22 @@
+package app.revanced.extension.spotify.layout.theme;
+
+import android.graphics.Color;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+
+@SuppressWarnings("unused")
+public final class CustomThemePatch {
+
+    /**
+     * Injection point.
+     */
+    public static long getThemeColor(String colorString) {
+        try {
+            return Utils.getColorFromString(colorString);
+        } catch (Exception ex) {
+            Logger.printException(() -> "Invalid custom color: " + colorString, ex);
+            return Color.BLACK;
+        }
+    }
+}

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/privacy/SanitizeSharingLinksPatch.java

@@ -0,0 +1,43 @@
+package app.revanced.extension.spotify.misc.privacy;
+
+import android.net.Uri;
+
+import java.util.List;
+
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+public final class SanitizeSharingLinksPatch {
+
+    /**
+     * Parameters that are considered undesirable and should be stripped away.
+     */
+    private static final List<String> SHARE_PARAMETERS_TO_REMOVE = List.of(
+            "si", // Share tracking parameter.
+            "utm_source" // Share source, such as "copy-link".
+    );
+
+    /**
+     * Injection point.
+     */
+    public static String sanitizeUrl(String url) {
+        try {
+            Uri uri = Uri.parse(url);
+            Uri.Builder builder = uri.buildUpon().clearQuery();
+
+            for (String paramName : uri.getQueryParameterNames()) {
+                if (!SHARE_PARAMETERS_TO_REMOVE.contains(paramName)) {
+                    for (String value : uri.getQueryParameters(paramName)) {
+                        builder.appendQueryParameter(paramName, value);
+                    }
+                }
+            }
+
+            return builder.build().toString();
+        } catch (Exception ex) {
+            Logger.printException(() -> "sanitizeUrl failure", ex);
+
+            return url;
+        }
+    }
+}

extensions/spotify/stub/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    id(libs.plugins.android.library.get().pluginId)
+}
+
+android {
+    namespace = "app.revanced.extension"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 26
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}

extensions/spotify/stub/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/spotify/stub/src/main/java/com/spotify/home/evopage/homeapi/proto/Section.java

@@ -0,0 +1,7 @@
+package com.spotify.home.evopage.homeapi.proto;
+
+public final class Section {
+    public static final int VIDEO_BRAND_AD_FIELD_NUMBER = 20;
+    public static final int IMAGE_BRAND_AD_FIELD_NUMBER = 21;
+    public int featureTypeCase_;
+}

extensions/spotify/stub/src/main/java/com/spotify/remoteconfig/internal/AccountAttribute.java

@@ -0,0 +1,5 @@
+package com.spotify.remoteconfig.internal;
+
+public final class AccountAttribute {
+    public Object value_;
+}

extensions/spotify/stub/src/main/java/com/spotify/useraccount/v1/AccountAttribute.java

@@ -0,0 +1,8 @@
+package com.spotify.useraccount.v1;
+
+/**
+ * Used for target 8.6.98.900. Class is still present in newer app targets.
+ */
+public class AccountAttribute {
+    public Object value_;
+}

extensions/syncforreddit/stub/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 android {
     namespace = "app.revanced.extension"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24

extensions/tiktok/build.gradle.kts

@@ -3,3 +3,14 @@ dependencies {
     compileOnly(project(":extensions:tiktok:stub"))
     compileOnly(libs.annotation)
 }
+
+android {
+    defaultConfig {
+        minSdk = 22
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}

extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/FeedItemsFilter.java

@@ -2,6 +2,7 @@ package app.revanced.extension.tiktok.feedfilter;
 
 import com.ss.android.ugc.aweme.feed.model.Aweme;
 import com.ss.android.ugc.aweme.feed.model.FeedItemList;
+import com.ss.android.ugc.aweme.follow.presenter.FollowFeedList;
 
 import java.util.Iterator;
 import java.util.List;
@@ -13,22 +14,41 @@ public final class FeedItemsFilter {
             new StoryFilter(),
             new ImageVideoFilter(),
             new ViewCountFilter(),
-            new LikeCountFilter()
+            new LikeCountFilter(),
+            new ShopFilter()
     );
 
     public static void filter(FeedItemList feedItemList) {
-        Iterator<Aweme> feedItemListIterator = feedItemList.items.iterator();
-        while (feedItemListIterator.hasNext()) {
-            Aweme item = feedItemListIterator.next();
-            if (item == null) continue;
+        filterFeedList(feedItemList.items, item -> item);
+    }
 
+    public static void filter(FollowFeedList followFeedList) {
+        filterFeedList(followFeedList.mItems, feed -> (feed != null) ? feed.aweme : null);
+    }
+
+    private static <T> void filterFeedList(List<T> list, AwemeExtractor<T> extractor) {
+        // Could be simplified with removeIf() but requires Android 7.0+ while TikTok supports 4.0+.
+        Iterator<T> iterator = list.iterator();
+        while (iterator.hasNext()) {
+            T container = iterator.next();
+            Aweme item = extractor.extract(container);
+            if (item != null && shouldFilter(item)) {
+                iterator.remove();
+            }
+        }
+    }
+
+    private static boolean shouldFilter(Aweme item) {
         for (IFilter filter : FILTERS) {
-                boolean enabled = filter.getEnabled();
-                if (enabled && filter.getFiltered(item)) {
-                    feedItemListIterator.remove();
-                    break;
-                }
+            if (filter.getEnabled() && filter.getFiltered(item)) {
+                return true;
             }
         }
+        return false;
+    }
+
+    @FunctionalInterface
+    interface AwemeExtractor<T> {
+        Aweme extract(T source);
     }
 }

extensions/tiktok/src/main/java/app/revanced/extension/tiktok/feedfilter/ShopFilter.java

@@ -0,0 +1,17 @@
+package app.revanced.extension.tiktok.feedfilter;
+
+import app.revanced.extension.tiktok.settings.Settings;
+import com.ss.android.ugc.aweme.feed.model.Aweme;
+
+public class ShopFilter implements IFilter {
+    private static final String SHOP_INFO = "placeholder_product_id";
+    @Override
+    public boolean getEnabled() {
+        return Settings.HIDE_SHOP.get();
+    }
+
+    @Override
+    public boolean getFiltered(Aweme item) {
+        return item.getShareUrl().contains(SHOP_INFO);
+    }
+}

extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/Settings.java

@@ -11,6 +11,7 @@ import app.revanced.extension.shared.settings.StringSetting;
 public class Settings extends BaseSettings {
     public static final BooleanSetting REMOVE_ADS = new BooleanSetting("remove_ads", TRUE, true);
     public static final BooleanSetting HIDE_LIVE = new BooleanSetting("hide_live", FALSE, true);
+    public static final BooleanSetting HIDE_SHOP = new BooleanSetting("hide_shop", FALSE, true);
     public static final BooleanSetting HIDE_STORY = new BooleanSetting("hide_story", FALSE, true);
     public static final BooleanSetting HIDE_IMAGE = new BooleanSetting("hide_image", FALSE, true);
     public static final StringSetting MIN_MAX_VIEWS = new StringSetting("min_max_views", "0-" + Long.MAX_VALUE, true);

extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/ReVancedPreferenceFragment.java

@@ -9,7 +9,6 @@ import app.revanced.extension.tiktok.settings.preference.categories.DownloadsPre
 import app.revanced.extension.tiktok.settings.preference.categories.FeedFilterPreferenceCategory;
 import app.revanced.extension.tiktok.settings.preference.categories.ExtensionPreferenceCategory;
 import app.revanced.extension.tiktok.settings.preference.categories.SimSpoofPreferenceCategory;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * Preference fragment for ReVanced settings
@@ -21,9 +20,11 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
     protected void syncSettingWithPreference(@NonNull Preference pref,
                                              @NonNull Setting<?> setting,
                                              boolean applySettingToPreference) {
-        if (pref instanceof RangeValuePreference rangeValuePref) {
+        if (pref instanceof RangeValuePreference) {
+            RangeValuePreference rangeValuePref = (RangeValuePreference) pref;
             Setting.privateSetValueFromString(setting, rangeValuePref.getValue());
-        } else if (pref instanceof DownloadPathPreference downloadPathPref) {
+        } else if (pref instanceof DownloadPathPreference) {
+            DownloadPathPreference downloadPathPref = (DownloadPathPreference) pref;
             Setting.privateSetValueFromString(setting, downloadPathPref.getValue());
         } else {
             super.syncSettingWithPreference(pref, setting, applySettingToPreference);
@@ -32,7 +33,7 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
 
     @Override
     protected void initialize() {
-        final var context = getContext();
+        final var context = getActivity();
 
         // Currently no resources can be compiled for TikTok (fails with aapt error).
         // So all TikTok Strings are hard coded in the extension.

extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/FeedFilterPreferenceCategory.java

@@ -26,6 +26,11 @@ public class FeedFilterPreferenceCategory extends ConditionalPreferenceCategory
                 "Remove feed ads", "Remove ads from feed.",
                 Settings.REMOVE_ADS
         ));
+        addPreference(new TogglePreference(
+                context,
+                "Hide TikTok Shop", "Hide TikTok shop from feed.",
+                Settings.HIDE_SHOP
+        ));
         addPreference(new TogglePreference(
                 context,
                 "Hide livestreams", "Hide livestreams from feed.",

extensions/tiktok/src/main/java/app/revanced/extension/tiktok/spoof/sim/SpoofSimPatch.java

@@ -1,37 +1,60 @@
 package app.revanced.extension.tiktok.spoof.sim;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
 import app.revanced.extension.tiktok.settings.Settings;
 
 @SuppressWarnings("unused")
 public class SpoofSimPatch {
 
-    private static final boolean ENABLED = Settings.SIM_SPOOF.get();
+    /**
+     * During app startup native code can be called with no obvious way to set the context.
+     * Cannot check if sim spoofing is enabled or the app will crash since no context is set.
+     */
+    private static boolean isContextNotSet(String fieldSpoofed) {
+        if (Utils.getContext() != null) {
+            return false;
+        }
+
+        Logger.initializationException(SpoofSimPatch.class,
+                "Context is not yet set, cannot spoof: " + fieldSpoofed, null);
+
+        return true;
+    }
 
     public static String getCountryIso(String value) {
-        if (ENABLED) {
+        if (isContextNotSet("countryIso")) return value;
+
+        if (Settings.SIM_SPOOF.get()) {
             String iso = Settings.SIM_SPOOF_ISO.get();
-            Logger.printDebug(() -> "Spoofing sim ISO from: " + value + " to: " + iso);
+            Logger.printDebug(() -> "Spoofing countryIso from: " + value + " to: " + iso);
             return iso;
         }
+
         return value;
     }
 
     public static String getOperator(String value) {
-        if (ENABLED) {
+        if (isContextNotSet("MCC-MNC")) return value;
+
+        if (Settings.SIM_SPOOF.get()) {
             String mcc_mnc = Settings.SIMSPOOF_MCCMNC.get();
             Logger.printDebug(() -> "Spoofing sim MCC-MNC from: " + value + " to: " + mcc_mnc);
             return mcc_mnc;
         }
+
         return value;
     }
 
     public static String getOperatorName(String value) {
-        if (ENABLED) {
+        if (isContextNotSet("operatorName")) return value;
+
+        if (Settings.SIM_SPOOF.get()) {
             String operator = Settings.SIMSPOOF_OP_NAME.get();
-            Logger.printDebug(() -> "Spoofing sim operator from: " + value + " to: " + operator);
+            Logger.printDebug(() -> "Spoofing sim operatorName from: " + value + " to: " + operator);
             return operator;
         }
+
         return value;
     }
 }

extensions/tiktok/stub/build.gradle.kts

@@ -4,14 +4,9 @@ plugins {
 
 android {
     namespace = "app.revanced.extension"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        minSdk = 22
     }
 }

extensions/tiktok/stub/src/main/java/com/ss/android/ugc/aweme/feed/model/Aweme.java

@@ -33,4 +33,8 @@ public class Aweme {
     public AwemeStatistics getStatistics() {
         throw new UnsupportedOperationException("Stub");
     }
+
+    public String getShareUrl() {
+        throw new UnsupportedOperationException("Stub");
+    }
 }

extensions/tiktok/stub/src/main/java/com/ss/android/ugc/aweme/follow/presenter/FollowFeed.java

@@ -0,0 +1,8 @@
+package com.ss.android.ugc.aweme.follow.presenter;
+
+import com.ss.android.ugc.aweme.feed.model.Aweme;
+
+//Dummy class
+public class FollowFeed {
+    public Aweme aweme;
+}

extensions/tiktok/stub/src/main/java/com/ss/android/ugc/aweme/follow/presenter/FollowFeedList.java

@@ -0,0 +1,8 @@
+package com.ss.android.ugc.aweme.follow.presenter;
+
+import java.util.List;
+
+//Dummy class
+public class FollowFeedList {
+    public List<FollowFeed> mItems;
+}

extensions/tumblr/build.gradle.kts

@@ -1,3 +1,9 @@
 dependencies {
     compileOnly(project(":extensions:tumblr:stub"))
 }
+
+android {
+    defaultConfig {
+        minSdk = 26
+    }
+}

extensions/tumblr/stub/build.gradle.kts

@@ -1,17 +1,14 @@
+android.namespace = "app.revanced.extension"
+
 plugins {
     id(libs.plugins.android.library.get().pluginId)
 }
 
 android {
     namespace = "app.revanced.extension"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        minSdk = 26
     }
 }

extensions/twitch/build.gradle.kts

@@ -6,3 +6,14 @@ dependencies {
     compileOnly(libs.annotation)
     compileOnly(libs.appcompat)
 }
+
+android {
+    defaultConfig {
+        minSdk = 21
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}

extensions/twitch/stub/build.gradle.kts

@@ -4,14 +4,9 @@ plugins {
 
 android {
     namespace = "app.revanced.extension"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        minSdk = 21
     }
 }

extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/twifucker/TwiFucker.kt

@@ -163,7 +163,7 @@ internal object TwiFucker {
 
     private fun JSONObject.entryIsWhoToFollow(): Boolean =
         optString("entryId").let {
-            it.startsWith("whoToFollow-") || it.startsWith("who-to-follow-") || it.startsWith("connect-module-")
+            it.startsWith("whoToFollow-") || it.startsWith("who-to-follow-") || it.startsWith("connect-module-") || it.startsWith("who-to-subscribe-")
         }
 
     private fun JSONObject.itemContainsPromotedUser(): Boolean =

extensions/youtube/build.gradle.kts

@@ -1,8 +1,11 @@
-//noinspection GradleDependency
-android.compileSdk = 33
-
 dependencies {
     compileOnly(project(":extensions:shared:library"))
     compileOnly(project(":extensions:youtube:stub"))
     compileOnly(libs.annotation)
 }
+
+android {
+    defaultConfig {
+        minSdk = 26
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/ThemeHelper.java

@@ -2,6 +2,8 @@ package app.revanced.extension.youtube;
 
 import android.app.Activity;
 import android.graphics.Color;
+import android.os.Build;
+import android.view.Window;
 
 import androidx.annotation.Nullable;
 
@@ -45,13 +47,24 @@ public class ThemeHelper {
         return "@color/yt_black3";
     }
 
+    private static int getThemeColor(String resourceName, int defaultColor) {
+        try {
+            return Utils.getColorFromString(resourceName);
+        } catch (Exception ex) {
+            // User entered an invalid custom theme color.
+            // Normally this should never be reached, and no localized strings are needed.
+            Utils.showToastLong("Invalid custom theme color: " + resourceName);
+            return defaultColor;
+        }
+    }
+
     /**
      * @return The dark theme color as specified by the Theme patch (if included),
      *         or the dark mode background color unpatched YT uses.
      */
     public static int getDarkThemeColor() {
         if (darkThemeColor == null) {
-            darkThemeColor = getColorInt(darkThemeResourceName());
+            darkThemeColor = getThemeColor(darkThemeResourceName(), Color.BLACK);
         }
         return darkThemeColor;
     }
@@ -71,18 +84,11 @@ public class ThemeHelper {
      */
     public static int getLightThemeColor() {
         if (lightThemeColor == null) {
-            lightThemeColor = getColorInt(lightThemeResourceName());
+            lightThemeColor = getThemeColor(lightThemeResourceName(), Color.WHITE);
         }
         return lightThemeColor;
     }
 
-    private static int getColorInt(String colorString) {
-        if (colorString.startsWith("#")) {
-            return Color.parseColor(colorString);
-        }
-        return Utils.getResourceColor(colorString);
-    }
-
     public static int getBackgroundColor() {
         return isDarkTheme() ? getDarkThemeColor() : getLightThemeColor();
     }
@@ -96,6 +102,23 @@ public class ThemeHelper {
                 ? "yt_black3"
                 : "yt_white1";
 
-        return getColorInt(colorName);
+        return Utils.getColorFromString(colorName);
+    }
+
+    /**
+     * Sets the system navigation bar color for the activity.
+     * Applies the background color obtained from {@link #getBackgroundColor()} to the navigation bar.
+     * For Android 10 (API 29) and above, enforces navigation bar contrast to ensure visibility.
+     */
+    public static void setNavigationBarColor(@Nullable Window window) {
+        if (window == null) {
+            Logger.printDebug(() -> "Cannot set navigation bar color, window is null");
+            return;
+        }
+
+        window.setNavigationBarColor(getBackgroundColor());
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            window.setNavigationBarContrastEnforced(true);
+        }
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/AccountCredentialsInvalidTextPatch.java

@@ -0,0 +1,28 @@
+package app.revanced.extension.youtube.patches;
+
+import static app.revanced.extension.shared.StringRef.sf;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+
+@SuppressWarnings("unused")
+public class AccountCredentialsInvalidTextPatch {
+
+    /**
+     * Injection point.
+     */
+    public static String getOfflineNetworkErrorString(String original) {
+        try {
+            if (Utils.isNetworkConnected()) {
+                Logger.printDebug(() -> "Network appears to be online, but app is showing offline error");
+                return '\n' + sf("microg_offline_account_login_error").toString();
+            }
+
+            Logger.printDebug(() -> "Network is offline");
+        } catch (Exception ex) {
+            Logger.printException(() -> "getOfflineNetworkErrorString failure", ex);
+        }
+
+        return original;
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BackgroundPlaybackPatch.java

@@ -2,6 +2,7 @@ package app.revanced.extension.youtube.patches;
 
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.PlayerType;
+import app.revanced.extension.youtube.shared.ShortsPlayerState;
 
 @SuppressWarnings("unused")
 public class BackgroundPlaybackPatch {
@@ -23,16 +24,13 @@ public class BackgroundPlaybackPatch {
         // 7. Close the Short
         // 8. Resume playing the regular video
         // 9. Minimize the app (PIP should appear)
-        if (!VideoInformation.lastVideoIdIsShort()) {
-            return true; // Definitely is not a Short.
+        if (ShortsPlayerState.isOpen()) {
+            return false;
         }
 
-        // TODO: Add better hook.
-        // Might be a Shorts, or might be a prior regular video on screen again after a Shorts was closed.
-        // This incorrectly prevents PIP if player is in WATCH_WHILE_MINIMIZED after closing a Shorts,
-        // But there's no way around this unless an additional hook is added to definitively detect
-        // the Shorts player is on screen. This use case is unusual anyways so it's not a huge concern.
-        return !PlayerType.getCurrent().isNoneHiddenOrMinimized();
+        // Check if the video player is opened and it's not playing in the feed.
+        PlayerType current = PlayerType.getCurrent();
+        return !current.isNoneOrHidden() && current != PlayerType.INLINE_MINIMAL;
     }
 
     /**

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeFormFactorPatch.java

@@ -1,9 +1,17 @@
 package app.revanced.extension.youtube.patches;
 
+import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton;
+
+import android.view.View;
+
 import androidx.annotation.Nullable;
 
-import app.revanced.extension.shared.Utils;
+import java.util.Objects;
+
+import app.revanced.extension.shared.Logger;
 import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.shared.NavigationBar;
+import app.revanced.extension.youtube.shared.PlayerType;
 
 @SuppressWarnings("unused")
 public class ChangeFormFactorPatch {
@@ -41,14 +49,57 @@ public class ChangeFormFactorPatch {
 
     @Nullable
     private static final Integer FORM_FACTOR_TYPE = Settings.CHANGE_FORM_FACTOR.get().formFactorType;
+    private static final boolean USING_AUTOMOTIVE_TYPE = Objects.requireNonNull(
+            FormFactor.AUTOMOTIVE.formFactorType).equals(FORM_FACTOR_TYPE);
 
     /**
      * Injection point.
      */
     public static int getFormFactor(int original) {
-        return FORM_FACTOR_TYPE == null
-                ? original
-                : FORM_FACTOR_TYPE;
+        if (FORM_FACTOR_TYPE == null) return original;
+
+        if (USING_AUTOMOTIVE_TYPE) {
+            // Do not change if the player is opening or is opened,
+            // otherwise the video description cannot be opened.
+            PlayerType current = PlayerType.getCurrent();
+            if (current.isMaximizedOrFullscreen() || current == PlayerType.WATCH_WHILE_SLIDING_MINIMIZED_MAXIMIZED) {
+                Logger.printDebug(() -> "Using original form factor for player");
+                return original;
             }
 
+            if (!NavigationBar.isSearchBarActive()) {
+                // Automotive type shows error 400 when opening a channel page and using some explore tab.
+                // This is a bug in unpatched YouTube that occurs on actual Android Automotive devices.
+                // Work around the issue by using the original form factor if not in search and the
+                // navigation back button is present.
+                if (NavigationBar.isBackButtonVisible()) {
+                    Logger.printDebug(() -> "Using original form factor, as back button is visible without search present");
+                    return original;
+                }
+
+                // Do not change library tab otherwise watch history is hidden.
+                // Do this check last since the current navigation button is required.
+                if (NavigationButton.getSelectedNavigationButton() == NavigationButton.LIBRARY) {
+                    return original;
+                }
+            }
+        }
+
+        return FORM_FACTOR_TYPE;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static void navigationTabCreated(NavigationButton button, View tabView) {
+        // On first startup of the app the navigation buttons are fetched and updated.
+        // If the user immediately opens the 'You' or opens a video, then the call to
+        // update the navigtation buttons will use the non automotive form factor
+        // and the explore tab is missing.
+        // Fixing this is not so simple because of the concurrent calls for the player and You tab.
+        // For now, always hide the explore tab.
+        if (USING_AUTOMOTIVE_TYPE && button == NavigationButton.EXPLORE) {
+            tabView.setVisibility(View.GONE);
+        }
+    }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeStartPagePatch.java

@@ -9,6 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
@@ -23,21 +24,30 @@ public final class ChangeStartPagePatch {
         /**
          * Browse id.
          */
+        ALL_SUBSCRIPTIONS("FEchannels", TRUE),
         BROWSE("FEguide_builder", TRUE),
         EXPLORE("FEexplore", TRUE),
         HISTORY("FEhistory", TRUE),
         LIBRARY("FElibrary", TRUE),
         MOVIE("FEstorefront", TRUE),
+        NOTIFICATIONS("FEactivity", TRUE),
+        PLAYLISTS("FEplaylist_aggregation", TRUE),
         SUBSCRIPTIONS("FEsubscriptions", TRUE),
         TRENDING("FEtrending", TRUE),
+        YOUR_CLIPS("FEclips", TRUE),
 
         /**
          * Channel id, this can be used as a browseId.
          */
+        COURSES("UCtFRv9O2AHqOZjjynzrv-xg", TRUE),
+        FASHION("UCrpQ4p1Ql_hG8rKXIKM1MOQ", TRUE),
         GAMING("UCOpNcN46UbXVtpKMrmU4Abg", TRUE),
         LIVE("UC4R8DWoMoI7CAwX8_LjQHig", TRUE),
         MUSIC("UC-9-kyTW8ZkZNDHQJ6FgpwQ", TRUE),
+        NEWS("UCYfdidRxbB8Qhf0Nx7ioOYw", TRUE),
+        SHOPPING("UCkYQyvc_i9hXEo4xic9Hh2g", TRUE),
         SPORTS("UCEgdi0XIXXZ-qJOFPf4JSKw", TRUE),
+        VIRTUAL_REALITY("UCzuqhhs6NWbgTzMuM09WKDQ", TRUE),
 
         /**
          * Playlist id, this can be used as a browseId.
@@ -51,12 +61,12 @@ public final class ChangeStartPagePatch {
         SEARCH("com.google.android.youtube.action.open.search", FALSE),
         SHORTS("com.google.android.youtube.action.open.shorts", FALSE);
 
-        @Nullable
-        final Boolean isBrowseId;
-
         @NonNull
         final String id;
 
+        @Nullable
+        final Boolean isBrowseId;
+
         StartPage(@NonNull String id, @Nullable Boolean isBrowseId) {
             this.id = id;
             this.isBrowseId = isBrowseId;
@@ -72,6 +82,13 @@ public final class ChangeStartPagePatch {
         }
     }
 
+    public static class ChangeStartPageTypeAvailability implements Setting.Availability {
+        @Override
+        public boolean isAvailable() {
+            return Settings.CHANGE_START_PAGE.get() != StartPage.DEFAULT;
+        }
+    }
+
     /**
      * Intent action when YouTube is cold started from the launcher.
      * <p>
@@ -84,6 +101,8 @@ public final class ChangeStartPagePatch {
 
     private static final StartPage START_PAGE = Settings.CHANGE_START_PAGE.get();
 
+    private static final boolean CHANGE_START_PAGE_ALWAYS = Settings.CHANGE_START_PAGE_ALWAYS.get();
+
     /**
      * There is an issue where the back button on the toolbar doesn't work properly.
      * As a workaround for this issue, instead of overriding the browserId multiple times, just override it once.
@@ -95,13 +114,13 @@ public final class ChangeStartPagePatch {
             return original;
         }
 
-        if (appLaunched) {
+        if (!CHANGE_START_PAGE_ALWAYS && appLaunched) {
             Logger.printDebug(() -> "Ignore override browseId as the app already launched");
             return original;
         }
         appLaunched = true;
 
-        Logger.printDebug(() -> "Changing browseId to " + START_PAGE.id);
+        Logger.printDebug(() -> "Changing browseId to: " + START_PAGE.id);
         return START_PAGE.id;
     }
 
@@ -116,14 +135,14 @@ public final class ChangeStartPagePatch {
             return;
         }
 
-        if (appLaunched) {
+        if (!CHANGE_START_PAGE_ALWAYS && appLaunched) {
             Logger.printDebug(() -> "Ignore override intent action as the app already launched");
             return;
         }
         appLaunched = true;
 
-        final String intentAction = START_PAGE.id;
-        Logger.printDebug(() -> "Changing intent action to " + intentAction);
+        String intentAction = START_PAGE.id;
+        Logger.printDebug(() -> "Changing intent action to: " + intentAction);
         intent.setAction(intentAction);
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CustomPlayerOverlayOpacityPatch.java

@@ -17,8 +17,7 @@ public class CustomPlayerOverlayOpacityPatch {
 
         if (opacity < 0 || opacity > 100) {
             Utils.showToastLong(str("revanced_player_overlay_opacity_invalid_toast"));
-            Settings.PLAYER_OVERLAY_OPACITY.resetToDefault();
-            opacity = Settings.PLAYER_OVERLAY_OPACITY.defaultValue;
+            opacity = Settings.PLAYER_OVERLAY_OPACITY.resetToDefault();
         }
 
         PLAYER_OVERLAY_OPACITY_LEVEL = (opacity * 255) / 100;

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableAutoCaptionsPatch.java

@@ -1,20 +1,23 @@
 package app.revanced.extension.youtube.patches;
 
 import app.revanced.extension.youtube.settings.Settings;
-import app.revanced.extension.youtube.shared.PlayerType;
 
 @SuppressWarnings("unused")
 public class DisableAutoCaptionsPatch {
 
+    private static volatile boolean captionsButtonStatus;
+
     /**
-     * Used by injected code. Do not delete.
+     * Injection point.
      */
-    public static boolean captionsButtonDisabled;
-
-    public static boolean autoCaptionsEnabled() {
-        return Settings.AUTO_CAPTIONS.get()
-                // Do not use auto captions for Shorts.
-                && !PlayerType.getCurrent().isNoneHiddenOrSlidingMinimized();
+    public static boolean disableAutoCaptions() {
+        return Settings.DISABLE_AUTO_CAPTIONS.get() && !captionsButtonStatus;
     }
 
+    /**
+     * Injection point.
+     */
+    public static void setCaptionsButtonStatus(boolean status) {
+        captionsButtonStatus = status;
+    }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableResumingStartupShortsPlayerPatch.java

@@ -2,7 +2,7 @@ package app.revanced.extension.youtube.patches;
 
 import app.revanced.extension.youtube.settings.Settings;
 
-/** @noinspection unused*/
+@SuppressWarnings("unused")
 public class DisableResumingStartupShortsPlayerPatch {
 
     /**
@@ -11,4 +11,11 @@ public class DisableResumingStartupShortsPlayerPatch {
     public static boolean disableResumingStartupShortsPlayer() {
         return Settings.DISABLE_RESUMING_SHORTS_PLAYER.get();
     }
+
+    /**
+     * Injection point.
+     */
+    public static boolean disableResumingStartupShortsPlayer(boolean original) {
+        return original && !Settings.DISABLE_RESUMING_SHORTS_PLAYER.get();
+    }
 }