From a505fac5d3f990a40efb0380a5d3b3a2564b89c4 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sat, 3 Oct 2020 19:01:12 +0200 Subject: [PATCH] Release 86.0.4240.70 --- CHANGELOG.md | 4 ++ build/RELEASE | 2 +- ...dd-history-support-in-incognito-mode.patch | 8 +-- build/patches/Disable-safe-browsing.patch | 17 ++++++- .../Disable-sync-services-menu-entry.patch | 8 +-- build/patches/Enable-DoH.patch | 49 +++++++++++++++---- 6 files changed, 68 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index adabf661..a4ac7801 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 86.0.4240.70 +* fixed crash on unused menu item tap (fixes https://github.com/bromite/bromite/issues/760) +* fixed issue on new installations without DoH configuration (fixes https://github.com/bromite/bromite/issues/761) + # 86.0.4240.66 * switch to upstream UI for DoH URL customization * remove weblayer dependency on Play Services diff --git a/build/RELEASE b/build/RELEASE index ffaba5b3..9037b8ad 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -86.0.4240.66 +86.0.4240.70 diff --git a/build/patches/Add-history-support-in-incognito-mode.patch b/build/patches/Add-history-support-in-incognito-mode.patch index 4eb7cab7..5bc60730 100644 --- a/build/patches/Add-history-support-in-incognito-mode.patch +++ b/build/patches/Add-history-support-in-incognito-mode.patch @@ -103,7 +103,7 @@ old mode 100644 new mode 100755 --- a/chrome/browser/history/history_tab_helper.cc +++ b/chrome/browser/history/history_tab_helper.cc -@@ -26,6 +26,9 @@ +@@ -28,6 +28,9 @@ #if defined(OS_ANDROID) #include "chrome/browser/android/background_tab_manager.h" @@ -113,7 +113,7 @@ new mode 100755 #else #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" -@@ -227,6 +230,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { +@@ -238,6 +241,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { history::HistoryService* HistoryTabHelper::GetHistoryService() { Profile* profile = Profile::FromBrowserContext(web_contents()->GetBrowserContext()); @@ -127,7 +127,7 @@ new mode 100755 if (profile->IsOffTheRecord()) return NULL; -@@ -234,6 +244,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { +@@ -245,6 +255,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { profile, ServiceAccessType::IMPLICIT_ACCESS); } @@ -176,7 +176,7 @@ new mode 100755 #if BUILDFLAG(ENABLE_FEED_IN_CHROME) #include "components/feed/core/common/pref_names.h" #endif // BUILDFLAG(ENABLE_FEED_IN_CHROME) -@@ -1015,6 +1016,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1014,6 +1015,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry); variations::VariationsService::RegisterProfilePrefs(registry); feed::prefs::RegisterFeedSharedProfilePrefs(registry); diff --git a/build/patches/Disable-safe-browsing.patch b/build/patches/Disable-safe-browsing.patch index 3bb2ca97..ec64d408 100644 --- a/build/patches/Disable-safe-browsing.patch +++ b/build/patches/Disable-safe-browsing.patch @@ -7,7 +7,7 @@ Contains Android-specific fixes to remove Safe Browsing Disable CrowdDeny feature --- .../res/xml/google_services_preferences.xml | 20 ------ - .../java/res/xml/privacy_preferences.xml | 5 -- + .../java/res/xml/privacy_preferences.xml | 11 --- .../res/xml/sync_and_services_preferences.xml | 20 ------ .../privacy/settings/PrivacySettings.java | 55 ++------------ .../sync/settings/GoogleServicesSettings.java | 10 +-- @@ -71,7 +71,7 @@ Disable CrowdDeny feature .../native_file_system_file_writer_impl.cc | 50 +------------ .../native_file_system_file_writer_impl.h | 14 +--- .../native_file_system_permission_context.h | 6 -- - 65 files changed, 183 insertions(+), 665 deletions(-) + 65 files changed, 183 insertions(+), 671 deletions(-) diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml --- a/chrome/android/java/res/xml/google_services_preferences.xml @@ -122,6 +122,19 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi +- + +@@ -34,9 +34,4 @@ + android:summary="@string/clear_browsing_data_summary" + android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment" + android:order="5"/> - SetString(prefs::kDnsOverHttpsMode, +- SecureDnsConfig::kModeAutomatic); ++ SecureDnsConfig::kModeSecure); + } else if (entries.count("dns-over-https@2")) { + // The user has "Disabled" selected. + local_state_->SetString(prefs::kDnsOverHttpsMode, +@@ -327,22 +327,7 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration( + check_parental_controls = false; + } + +- // Check parental controls last because it can be expensive and should only be +- // checked if necessary for the otherwise-determined mode. + if (check_parental_controls) { +- if (ShouldDisableDohForParentalControls()) { +- forced_management_mode = +- SecureDnsConfig::ManagementMode::kDisabledParentalControls; +- secure_dns_mode = net::DnsConfig::SecureDnsMode::OFF; +- mode_details = +- SecureDnsModeDetailsForHistogram::kOffByDetectedParentalControls; +- +- // If parental controls had not previously been checked, need to update +- // network service. +- if (!parental_controls_checked_) +- update_network_service = true; +- } +- + parental_controls_checked_ = true; + } + diff --git a/chrome/browser/privacy/java/src/org/chromium/chrome/browser/privacy/secure_dns/SecureDnsBridge.java b/chrome/browser/privacy/java/src/org/chromium/chrome/browser/privacy/secure_dns/SecureDnsBridge.java --- a/chrome/browser/privacy/java/src/org/chromium/chrome/browser/privacy/secure_dns/SecureDnsBridge.java +++ b/chrome/browser/privacy/java/src/org/chromium/chrome/browser/privacy/secure_dns/SecureDnsBridge.java @@ -31,12 +67,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc // Provides a mechanism to remove providers from the dropdown list in the // settings UI. Separate multiple provider ids with commas. See the -@@ -274,11 +274,11 @@ const base::FeatureParam kDnsOverHttpsDisabledProvidersParam{ - // Set whether fallback to insecure DNS is allowed by default. This setting may - // be overridden for individual transactions. - const base::FeatureParam kDnsOverHttpsFallbackParam{&kDnsOverHttps, -- "Fallback", true}; -+ "Fallback", false}; +@@ -278,7 +278,7 @@ const base::FeatureParam kDnsOverHttpsFallbackParam{&kDnsOverHttps, // Sets whether the DoH setting is displayed in the settings UI. const base::FeatureParam kDnsOverHttpsShowUiParam{&kDnsOverHttps,