From 57263538c79f5a561c449229ac8e068c641285d3 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Fri, 7 Nov 2025 09:14:21 +0200
Subject: [PATCH] fix(YouTube - Check watch history domain name resolution):
 Fix false positive warning message if the internet connection fails halfway
 into the DNS check

---
 .../patches/CheckWatchHistoryDomainNameResolutionPatch.java | 6 +++++-
 patches/src/main/resources/addresources/values/strings.xml  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/CheckWatchHistoryDomainNameResolutionPatch.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/CheckWatchHistoryDomainNameResolutionPatch.java
index 23321c0e5..d12eabc0b 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/CheckWatchHistoryDomainNameResolutionPatch.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/CheckWatchHistoryDomainNameResolutionPatch.java
@@ -61,7 +61,11 @@ public class CheckWatchHistoryDomainNameResolutionPatch {
                 // Prevent this false positive by verify youtube.com resolves.
                 // If youtube.com does not resolve, then it's not a watch history domain resolving error
                 // because the entire app will not work since no domains are resolving.
-                if (!domainResolvesToValidIP("youtube.com")
+                String domainYouTube = "youtube.com";
+                if (!domainResolvesToValidIP(domainYouTube)
+                        || domainResolvesToValidIP(HISTORY_TRACKING_ENDPOINT)
+                        // Check multiple times, so a false positive from a flaky connection is almost impossible.
+                        || !domainResolvesToValidIP(domainYouTube)
                         || domainResolvesToValidIP(HISTORY_TRACKING_ENDPOINT)) {
                     return;
                 }
diff --git a/patches/src/main/resources/addresources/values/strings.xml b/patches/src/main/resources/addresources/values/strings.xml
index 9e8937059..bf2a45a87 100644
--- a/patches/src/main/resources/addresources/values/strings.xml
+++ b/patches/src/main/resources/addresources/values/strings.xml
@@ -45,7 +45,7 @@ Second \"item\" text"</string>
             <string name="revanced_check_environment_not_near_patch_time_invalid">APK build date is corrupted</string>
         </patch>
         <patch id="misc.dns.checkWatchHistoryDomainNameResolutionPatch">
-            <string name="revanced_check_watch_history_domain_name_dialog_title">Warning</string>
+            <string name="revanced_check_watch_history_domain_name_dialog_title">ReVanced Notice</string>
             <string name="revanced_check_watch_history_domain_name_dialog_message">Your watch history is not being saved.&lt;br>&lt;br>This most likely is caused by a DNS ad blocker or network proxy.&lt;br>&lt;br>To fix this, whitelist &lt;b>s.youtube.com&lt;/b> or turn off all DNS blockers and proxies.</string>
             <string name="revanced_check_watch_history_domain_name_dialog_ignore">Do not show again</string>
         </patch>