fix(Default Video Quality): Video quality is not changeable if defaul…

…t ones is already set YT-Advanced/RVX_BUG_CENTER#16 YT-Advanced/ReX-patches#80
YT-Advanced · Feb 13, 2024 · 6656f1a · 6656f1a
1 parent e6a20ba
commit 6656f1a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 14 deletions.
diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/video/VideoQualityPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/video/VideoQualityPatch.java
@@ -3,6 +3,7 @@
 import static app.revanced.integrations.youtube.utils.StringRef.str;
 import static app.revanced.integrations.youtube.utils.VideoHelpers.getCurrentQuality;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.lang.reflect.Field;
@@ -18,13 +19,30 @@ public class VideoQualityPatch {
     private static final SettingsEnum mobileQualitySetting = SettingsEnum.DEFAULT_VIDEO_QUALITY_MOBILE;
     private static final SettingsEnum wifiQualitySetting = SettingsEnum.DEFAULT_VIDEO_QUALITY_WIFI;
 
+    private static Boolean useCustomQuality = false;
+    @Nullable
+    private static int customQuality;
+
+    /**
+     * Injection point.
+     *
+     * @param ignoredVideoId id of the current video
+     */
+    public static void initialize(@NonNull String ignoredVideoId) {
+        useCustomQuality = false;
+        customQuality = 0;
+    }
+
     /**
      * The available qualities of the current video in human readable form: [1080, 720, 480]
      */
     @Nullable
     private static List<Integer> videoQualities;
 
     private static void changeDefaultQuality(final int defaultQuality) {
+        // When user manual change the quality, force this quality until video ended.
+        overrideCustomQuality(defaultQuality);
+
         if (!SettingsEnum.ENABLE_SAVE_VIDEO_QUALITY.getBoolean())
             return;
 
@@ -42,6 +60,27 @@ private static void changeDefaultQuality(final int defaultQuality) {
         ReVancedUtils.showToastShort(str("revanced_save_video_quality_" + networkType.getName(), defaultQuality + "p"));
     }
 
+    public static void overrideCustomQuality(final int defaultQuality) {
+        customQuality = defaultQuality;
+        useCustomQuality = true;
+        overrideQuality(defaultQuality);
+    }
+
+    public static void overideDefaultVideoQuality() {
+        final int preferredQuality =
+                ReVancedUtils.getNetworkType() == ReVancedUtils.NetworkType.MOBILE
+                        ? mobileQualitySetting.getInt()
+                        : wifiQualitySetting.getInt();
+
+        if (preferredQuality == -2)
+            return;
+
+        ReVancedUtils.runOnMainThreadDelayed(() -> 
+            setVideoQuality((useCustomQuality) ? customQuality 
+                                               : preferredQuality)
+        , 300);
+    }
+
     /**
      * Injection point.
      * 
@@ -88,18 +127,6 @@ private static void setVideoQuality(int preferredQuality) {
         overrideQuality(preferredQuality);
     }
 
-    public static void forceVideoQuality() {
-        final int preferredQuality =
-                ReVancedUtils.getNetworkType() == ReVancedUtils.NetworkType.MOBILE
-                        ? mobileQualitySetting.getInt()
-                        : wifiQualitySetting.getInt();
-
-        if (preferredQuality == -2)
-            return;
-
-        ReVancedUtils.runOnMainThreadDelayed(() -> setVideoQuality(preferredQuality), 300);
-    }
-
     /**
      * Injection point. New quality menu.
      *
@@ -123,4 +150,4 @@ public static void userChangedQualityIndex(final int selectedQualityIndex) {
 
         changeDefaultQuality(videoQualities.get(selectedQualityIndex));
     }
-}
+}
diff --git a/app/src/main/java/app/revanced/integrations/youtube/utils/VideoHelpers.java b/app/src/main/java/app/revanced/integrations/youtube/utils/VideoHelpers.java
@@ -46,7 +46,7 @@ public static void onQualityChanges(String quality) {
         if (currentQuality == quality)
             return;
         currentQuality = quality;
-        VideoQualityPatch.forceVideoQuality();
+        VideoQualityPatch.overideDefaultVideoQuality();
     }
 
     public static void copyUrl(boolean withTimestamp) {