Merge branch 'dev' into revanced-extended

Author: inotia00

README.md

@@ -134,19 +134,19 @@ See the [documentation](https://github.com/inotia00/revanced-documentation#readm
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `Change package name` | Changes the package name for Reddit to the name specified in patch options. | 2024.17.0 ~ 2025.12.0 |
-| `Custom branding name for Reddit` | Changes the Reddit app name to the name specified in patch options. | 2024.17.0 ~ 2025.12.0 |
-| `Disable screenshot popup` | Adds an option to disable the popup that appears when taking a screenshot. | 2024.17.0 ~ 2025.12.0 |
-| `Hide Recently Visited shelf` | Adds an option to hide the Recently Visited shelf in the sidebar. | 2024.17.0 ~ 2025.12.0 |
-| `Hide ads` | Adds options to hide ads. | 2024.17.0 ~ 2025.12.0 |
-| `Hide navigation buttons` | Adds options to hide buttons in the navigation bar. | 2024.17.0 ~ 2025.12.0 |
-| `Hide recommended communities shelf` | Adds an option to hide the recommended communities shelves in subreddits. | 2024.17.0 ~ 2025.12.0 |
-| `Open links directly` | Adds an option to skip over redirection URLs in external links. | 2024.17.0 ~ 2025.12.0 |
-| `Open links externally` | Adds an option to always open links in your browser instead of in the in-app-browser. | 2024.17.0 ~ 2025.12.0 |
-| `Premium icon` | Unlocks premium app icons. | 2024.17.0 ~ 2025.12.0 |
-| `Remove subreddit dialog` | Adds options to remove the NSFW community warning and notifications suggestion dialogs by dismissing them automatically. | 2024.17.0 ~ 2025.12.0 |
-| `Sanitize sharing links` | Adds an option to sanitize sharing links by removing tracking query parameters. | 2024.17.0 ~ 2025.12.0 |
-| `Settings for Reddit` | Applies mandatory patches to implement ReVanced Extended settings into the application. | 2024.17.0 ~ 2025.12.0 |
+| `Change package name` | Changes the package name for Reddit to the name specified in patch options. | 2024.17.0 ~ 2025.12.1 |
+| `Custom branding name for Reddit` | Changes the Reddit app name to the name specified in patch options. | 2024.17.0 ~ 2025.12.1 |
+| `Disable screenshot popup` | Adds an option to disable the popup that appears when taking a screenshot. | 2024.17.0 ~ 2025.12.1 |
+| `Hide Recently Visited shelf` | Adds an option to hide the Recently Visited shelf in the sidebar. | 2024.17.0 ~ 2025.12.1 |
+| `Hide ads` | Adds options to hide ads. | 2024.17.0 ~ 2025.12.1 |
+| `Hide navigation buttons` | Adds options to hide buttons in the navigation bar. | 2024.17.0 ~ 2025.12.1 |
+| `Hide recommended communities shelf` | Adds an option to hide the recommended communities shelves in subreddits. | 2024.17.0 ~ 2025.12.1 |
+| `Open links directly` | Adds an option to skip over redirection URLs in external links. | 2024.17.0 ~ 2025.12.1 |
+| `Open links externally` | Adds an option to always open links in your browser instead of in the in-app-browser. | 2024.17.0 ~ 2025.12.1 |
+| `Premium icon` | Unlocks premium app icons. | 2024.17.0 ~ 2025.12.1 |
+| `Remove subreddit dialog` | Adds options to remove the NSFW community warning and notifications suggestion dialogs by dismissing them automatically. | 2024.17.0 ~ 2025.12.1 |
+| `Sanitize sharing links` | Adds an option to sanitize sharing links by removing tracking query parameters. | 2024.17.0 ~ 2025.12.1 |
+| `Settings for Reddit` | Applies mandatory patches to implement ReVanced Extended settings into the application. | 2024.17.0 ~ 2025.12.1 |
 </details>
 
 
@@ -200,7 +200,7 @@ Example:
       "com.reddit.frontpage": [
         "2024.17.0",
         "2025.05.1",
-        "2025.12.0"
+        "2025.12.1"
       ]
     },
     "options": []

extensions/shared/src/main/java/app/revanced/extension/reddit/patches/RemoveSubRedditDialogPatch.java

@@ -2,7 +2,10 @@
 
 import static app.revanced.extension.shared.utils.StringRef.str;
 
+import android.app.Dialog;
 import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -34,6 +37,35 @@ public static boolean spoofHasBeenVisitedStatus(boolean hasBeenVisited) {
         return Settings.REMOVE_NSFW_DIALOG.get() || hasBeenVisited;
     }
 
+    public static void dismissNSFWDialog(Object customDialog) {
+        if (Settings.REMOVE_NSFW_DIALOG.get() &&
+                customDialog instanceof Dialog dialog) {
+            Window window = dialog.getWindow();
+            if (window != null) {
+                WindowManager.LayoutParams params = window.getAttributes();
+                params.height = 0;
+                params.width = 0;
+
+                // Change the size of dialog to 0.
+                window.setAttributes(params);
+
+                // Disable dialog's background dim.
+                window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+
+                // Hide DecorView.
+                View decorView = window.getDecorView();
+                decorView.setVisibility(View.GONE);
+
+                // Dismiss dialog.
+                dialog.dismiss();
+            }
+        }
+    }
+
+    public static boolean removeNSFWDialog() {
+        return Settings.REMOVE_NSFW_DIALOG.get();
+    }
+
     public static boolean spoofLoggedInStatus(boolean isLoggedIn) {
         return !Settings.REMOVE_NOTIFICATION_DIALOG.get() && isLoggedIn;
     }

extensions/shared/src/main/java/app/revanced/extension/reddit/patches/ScreenshotPopupPatch.java

@@ -5,7 +5,7 @@
 @SuppressWarnings("unused")
 public class ScreenshotPopupPatch {
 
-    public static boolean disableScreenshotPopup() {
-        return Settings.DISABLE_SCREENSHOT_POPUP.get();
+    public static Boolean disableScreenshotPopup(Boolean original) {
+        return Settings.DISABLE_SCREENSHOT_POPUP.get() ? Boolean.FALSE : original;
     }
 }

extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/PlayerPatch.java

@@ -183,8 +183,8 @@ private static void clickDescriptionView(@NonNull ViewGroup descriptionViewGroup
         // The type of descriptionView can be either ViewGroup or TextView. (A/B tests)
         // If the type of descriptionView is TextView, longer delay is required.
         final long delayMillis = descriptionView instanceof TextView
-                ? 500
-                : 100;
+                ? 750
+                : 200;
 
         Utils.runOnMainThreadDelayed(() -> Utils.clickView(descriptionView), delayMillis);
     }

extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/PatchStatus.java

@@ -9,6 +9,11 @@ public static boolean ImageSearchButton() {
         return false;
     }
 
+    // Modified by a patch. Do not touch.
+    public static boolean OldSeekbarThumbnailsDefaultBoolean() {
+        return false;
+    }
+
     public static boolean OldSplashAnimation() {
         // Replace this with true if the Restore old splash animation (Custom branding icon) succeeds
         return false;
@@ -40,23 +45,22 @@ public static boolean SponsorBlock() {
         return false;
     }
 
-    public static String SpoofAppVersionDefaultString() {
-        return "18.17.43";
-    }
-
     public static boolean ToolBarComponents() {
         // Replace this with true if the Toolbar components patch succeeds
         return false;
     }
 
-    // Modified by a patch. Do not touch.
-    public static String RVXMusicPackageName() {
-        return "com.google.android.apps.youtube.music";
+    public static long PatchedTime() {
+        return 0L;
+    }
+
+    public static String SpoofAppVersionDefaultString() {
+        return "18.17.43";
     }
 
     // Modified by a patch. Do not touch.
-    public static boolean OldSeekbarThumbnailsDefaultBoolean() {
-        return false;
+    public static String RVXMusicPackageName() {
+        return "com.google.android.apps.youtube.music";
     }
 
 }