chore: Merge branch dev to main (#642)

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -70,7 +70,7 @@ body:
 
         Before creating a new bug report, please keep the following in mind:
 
-        - **Do not submit a duplicate bug report**: You can review existing bug reports [here](https://github.com/ReVanced/revanced-integrations/labels/Bug%20report).
+        - **Do not submit a duplicate bug report**: Search for existing bug reports [here](https://github.com/ReVanced/revanced-integrations/issues?q=label%3A%22Bug+report%22).
         - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
   - type: textarea
     attributes:
@@ -101,7 +101,7 @@ body:
       label: Acknowledgements
       description: Your bug report will be closed if you don't follow the checklist below.
       options:
-        - label: This issue is not a duplicate of an existing bug report.
+        - label: I have checked all open and closed bug reports and this is not a duplicate.
           required: true
         - label: I have chosen an appropriate title.
           required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -70,7 +70,7 @@ body:
 
         Before creating a new feature request, please keep the following in mind:
 
-        - **Do not submit a duplicate feature request**: You can review existing feature requests [here](https://github.com/ReVanced/revanced-integrations/labels/Feature%20request).
+        - **Do not submit a duplicate feature request**: Search for existing feature requests [here](https://github.com/ReVanced/revanced-integrations/issues?q=label%3A%22Feature+request%22).
         - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
   - type: textarea
     attributes:
@@ -97,7 +97,7 @@ body:
       label: Acknowledgements
       description: Your feature request will be closed if you don't follow the checklist below.
       options:
-        - label: This issue is not a duplicate of an existing feature request.
+        - label: I have checked all open and closed feature requests and this is not a duplicate.
           required: true
         - label: I have chosen an appropriate title.
           required: true

CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.9.2-dev.3](https://github.com/ReVanced/revanced-integrations/compare/v1.9.2-dev.2...v1.9.2-dev.3) (2024-05-28)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof client:** Disable AV1 if not supported by spoofing an older iOS device ([#644](https://github.com/ReVanced/revanced-integrations/issues/644)) ([e28edba](https://github.com/ReVanced/revanced-integrations/commit/e28edbadbf4097911979d88b964c89743f32e0b7))
+
+## [1.9.2-dev.2](https://github.com/ReVanced/revanced-integrations/compare/v1.9.2-dev.1...v1.9.2-dev.2) (2024-05-27)
+
+
+### Bug Fixes
+
+* **YouTube - Restore old video quality menu:** Do not show error toast if using an old version of YT ([#640](https://github.com/ReVanced/revanced-integrations/issues/640)) ([2227b45](https://github.com/ReVanced/revanced-integrations/commit/2227b45020ce5813db9f59e549840e7c785f5569))
+
+## [1.9.2-dev.1](https://github.com/ReVanced/revanced-integrations/compare/v1.9.1...v1.9.2-dev.1) (2024-05-25)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof client:** Improve Android spoofing ([#641](https://github.com/ReVanced/revanced-integrations/issues/641)) ([baf967e](https://github.com/ReVanced/revanced-integrations/commit/baf967e12ae64f617c59a5d51af3a3982a140d5d))
+
 ## [1.9.1](https://github.com/ReVanced/revanced-integrations/compare/v1.9.0...v1.9.1) (2024-05-24)
 
 

app/src/main/java/app/revanced/integrations/shared/Utils.java

@@ -249,6 +249,25 @@ public static <T extends View> T getChildView(@NonNull ViewGroup viewGroup, bool
         return null;
     }
 
+    @Nullable
+    public static ViewParent getParentView(@NonNull View view, int nthParent) {
+        ViewParent parent = view.getParent();
+
+        int currentDepth = 0;
+        while (++currentDepth < nthParent && parent != null) {
+            parent = parent.getParent();
+        }
+
+        if (currentDepth == nthParent) {
+            return parent;
+        }
+
+        final int currentDepthLog = currentDepth;
+        Logger.printDebug(() -> "Could not find parent view of depth: " + nthParent
+                + " and instead found at: " + currentDepthLog + " view: " + view);
+        return null;
+    }
+
     public static void restartApp(@NonNull Context context) {
         String packageName = context.getPackageName();
         Intent intent = context.getPackageManager().getLaunchIntentForPackage(packageName);

app/src/main/java/app/revanced/integrations/youtube/patches/playback/quality/RestoreOldVideoQualityMenuPatch.java

@@ -3,9 +3,11 @@
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.widget.ListView;
 
 import app.revanced.integrations.shared.Logger;
+import app.revanced.integrations.shared.Utils;
 import app.revanced.integrations.youtube.patches.components.VideoQualityMenuFilterPatch;
 import app.revanced.integrations.youtube.settings.Settings;
 
@@ -26,23 +28,43 @@ public static void onFlyoutMenuCreate(RecyclerView recyclerView) {
         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);
-                    View advancedQualityView = ((ViewGroup) recyclerView.getChildAt(0)).getChildAt(3);
-                    if (advancedQualityView != null) {
-                        // Click the "Advanced" quality menu to show the "old" quality menu.
-                        advancedQualityView.setSoundEffectsEnabled(false);
-                        advancedQualityView.performClick();
-                    }
+                if (!VideoQualityMenuFilterPatch.isVideoQualityMenuVisible || recyclerView.getChildCount() == 0) {
+                    return;
                 }
+                VideoQualityMenuFilterPatch.isVideoQualityMenuVisible = false;
+
+                ViewParent quickQualityViewParent = Utils.getParentView(recyclerView, 3);
+                if (!(quickQualityViewParent instanceof ViewGroup)) {
+                    return;
+                }
+
+                View firstChild = recyclerView.getChildAt(0);
+                if (!(firstChild instanceof ViewGroup)) {
+                    return;
+                }
+
+                ViewGroup advancedQualityParentView = (ViewGroup) firstChild;
+                if (advancedQualityParentView.getChildCount() < 4) {
+                    return;
+                }
+
+                View advancedQualityView = advancedQualityParentView.getChildAt(3);
+                if (advancedQualityView == null) {
+                    return;
+                }
+
+                ((ViewGroup) quickQualityViewParent).setVisibility(View.GONE);
+
+                // Click the "Advanced" quality menu to show the "old" quality menu.
+                advancedQualityView.setSoundEffectsEnabled(false);
+                advancedQualityView.performClick();
             } catch (Exception ex) {
                 Logger.printException(() -> "onFlyoutMenuCreate failure", ex);
             }
         });
     }
 
+
     /**
      * Injection point.
      *

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

@@ -6,6 +6,8 @@
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
+
 import androidx.annotation.NonNull;
 
 import app.revanced.integrations.youtube.patches.components.PlaybackSpeedMenuFilterPatch;
@@ -115,24 +117,36 @@ public static void onFlyoutMenuCreate(RecyclerView recyclerView) {
                 if (!PlaybackSpeedMenuFilterPatch.isPlaybackSpeedMenuVisible || recyclerView.getChildCount() == 0) {
                     return;
                 }
-                ViewGroup PlaybackSpeedParentView = (ViewGroup) recyclerView.getChildAt(0);
-                if (PlaybackSpeedParentView == null || PlaybackSpeedParentView.getChildCount() != 8) {
+
+                View firstChild = recyclerView.getChildAt(0);
+                if (!(firstChild instanceof ViewGroup)) {
+                    return;
+                }
+                ViewGroup PlaybackSpeedParentView = (ViewGroup) firstChild;
+                if (PlaybackSpeedParentView.getChildCount() != 8) {
                     return;
                 }
 
                 PlaybackSpeedMenuFilterPatch.isPlaybackSpeedMenuVisible = false;
-                ViewGroup parentView3rd = (ViewGroup) recyclerView.getParent().getParent().getParent();
-                ViewGroup parentView4th = (ViewGroup) parentView3rd.getParent();
+
+                ViewParent parentView3rd = Utils.getParentView(recyclerView, 3);
+                if (!(parentView3rd instanceof ViewGroup)) {
+                    return;
+                }
+                ViewParent parentView4th = parentView3rd.getParent();
+                if (!(parentView4th instanceof ViewGroup)) {
+                    return;
+                }
 
                 // Dismiss View [R.id.touch_outside] is the 1st ChildView of the 4th ParentView.
                 // This only shows in phone layout.
-                final var touchInsidedView = parentView4th.getChildAt(0);
+                final var touchInsidedView = ((ViewGroup) parentView4th).getChildAt(0);
                 touchInsidedView.setSoundEffectsEnabled(false);
                 touchInsidedView.performClick();
 
                 // In tablet layout there is no Dismiss View, instead we just hide all two parent views.
-                parentView3rd.setVisibility(View.GONE);
-                parentView4th.setVisibility(View.GONE);
+                ((ViewGroup) parentView3rd).setVisibility(View.GONE);
+                ((ViewGroup) 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.