From 4eff892d172c880025b609cbe3c4093c2cfdd494 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Tue, 28 Jul 2020 10:15:39 +0200 Subject: [PATCH] Release 84.0.4147.106 --- CHANGELOG.md | 4 + build/RELEASE | 2 +- .../Add-an-always-incognito-mode.patch | 4 +- build/patches/Add-exit-menu-item.patch | 15 +++- .../Add-menu-item-to-view-source.patch | 2 +- .../Disable-smart-selection-by-default.patch | 2 +- build/patches/Remove-help-menu-item.patch | 2 +- ...e-signin-and-data-saver-integrations.patch | 4 +- .../Restore-Search-Ready-Omnibox-flag.patch | 2 +- ...tings-for-cookies-javascript-and-ads.patch | 77 +++++++++++-------- 10 files changed, 70 insertions(+), 44 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a7d849b..f2c31923 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 84.0.4147.106 +* fixed bug with Javascript site settings not showing +* add exit menu item to overview menu (fixes https://github.com/bromite/bromite/issues/619) + # 84.0.4147.95 * show warnings for TLSv1.0/TLSv1.1 connections (fixes https://github.com/bromite/bromite/issues/645) * fix bug with unconfigured DoH (fixes https://github.com/bromite/bromite/issues/646) diff --git a/build/RELEASE b/build/RELEASE index e09f7176..aa14b81b 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -84.0.4147.95 +84.0.4147.106 diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 0d39c8d8..caca5abf 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -139,7 +139,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; import org.chromium.chrome.browser.IntentHandler.TabOpenType; import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl; -@@ -1514,6 +1515,9 @@ public abstract class ChromeActivity +@@ -1517,6 +1518,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -370,7 +370,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -337,7 +337,7 @@ const base::Feature kCCTExternalLinkHandling{"CCTExternalLinkHandling", +@@ -338,7 +338,7 @@ const base::Feature kCCTExternalLinkHandling{"CCTExternalLinkHandling", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kCCTIncognito{"CCTIncognito", diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index d2c22baf..e24af174 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -4,11 +4,11 @@ Subject: Add exit menu item Corrected Exit functionality --- - chrome/android/java/res/menu/main_menu.xml | 2 ++ + chrome/android/java/res/menu/main_menu.xml | 4 ++++ .../src/org/chromium/chrome/browser/ChromeActivity.java | 2 ++ .../chrome/browser/init/ChromeLifetimeController.java | 6 +++++- .../browser/ui/android/strings/android_chrome_strings.grd | 3 +++ - 4 files changed, 12 insertions(+), 1 deletion(-) + 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml @@ -22,10 +22,19 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re +@@ -104,6 +106,8 @@ + android:title="@string/menu_group_tabs" /> + ++ + + + diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java -@@ -1993,6 +1993,8 @@ public abstract class ChromeActivity +@@ -1996,6 +1996,8 @@ public abstract class ChromeActivity AddToHomescreenCoordinator.showForAppMenu( this, getWindowAndroid(), getModalDialogManager(), currentTab.getWebContents()); RecordUserAction.record("MobileMenuAddToHomescreen"); diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index 1d53312d..9ab1fd98 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -40,7 +40,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java -@@ -2002,6 +2002,8 @@ public abstract class ChromeActivity +@@ -2005,6 +2005,8 @@ public abstract class ChromeActivity } catch (ActivityNotFoundException e) { Toast.makeText(context, R.string.open_webapk_failed, Toast.LENGTH_SHORT).show(); } diff --git a/build/patches/Disable-smart-selection-by-default.patch b/build/patches/Disable-smart-selection-by-default.patch index 19bfef41..750574d9 100644 --- a/build/patches/Disable-smart-selection-by-default.patch +++ b/build/patches/Disable-smart-selection-by-default.patch @@ -15,7 +15,7 @@ leak information through the TextClassifier set by OEM, if any diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -380,7 +380,7 @@ const base::Feature kChromeSharingHubV15{"ChromeSharingHubV15", +@@ -381,7 +381,7 @@ const base::Feature kChromeSharingHubV15{"ChromeSharingHubV15", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kChromeSmartSelection{"ChromeSmartSelection", diff --git a/build/patches/Remove-help-menu-item.patch b/build/patches/Remove-help-menu-item.patch index 7e08f4dc..7543373b 100644 --- a/build/patches/Remove-help-menu-item.patch +++ b/build/patches/Remove-help-menu-item.patch @@ -25,7 +25,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java -@@ -1924,15 +1924,6 @@ public abstract class ChromeActivity +@@ -1927,15 +1927,6 @@ public abstract class ChromeActivity final Tab currentTab = getActivityTab(); diff --git a/build/patches/Remove-signin-and-data-saver-integrations.patch b/build/patches/Remove-signin-and-data-saver-integrations.patch index 242e3270..70423e44 100644 --- a/build/patches/Remove-signin-and-data-saver-integrations.patch +++ b/build/patches/Remove-signin-and-data-saver-integrations.patch @@ -169,7 +169,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. @Nullable private ChromeFullscreenManager mFullscreenManager; -@@ -872,28 +867,6 @@ public abstract class ChromeActivity +@@ -875,28 +870,6 @@ public abstract class ChromeActivity private void createContextReporterIfNeeded() { if (!mStarted) return; // Sync state reporting should work only in started state. if (mContextReporter != null || getActivityTab() == null) return; @@ -198,7 +198,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. } @Override -@@ -959,13 +932,6 @@ public abstract class ChromeActivity +@@ -962,13 +935,6 @@ public abstract class ChromeActivity if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) { GSAAccountChangeListener.getInstance().disconnect(); } diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index 42fad71f..88935f0d 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -100,7 +100,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kSearchEnginePromoExistingDevice, &kSearchEnginePromoNewDevice, &kServiceManagerForBackgroundPrefetch, -@@ -550,6 +551,9 @@ const base::Feature kRevampedContextMenu{"RevampedContextMenu", +@@ -551,6 +552,9 @@ const base::Feature kRevampedContextMenu{"RevampedContextMenu", const base::Feature kScrollToExpandPaymentHandler{ "ScrollToExpandPaymentHandler", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch index c43591a1..1de6953a 100644 --- a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch +++ b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch @@ -4,9 +4,9 @@ Subject: Show site settings for cookies, javascript and ads Avoid displaying info about intrusive ads --- - .../site_settings/SingleWebsiteSettings.java | 50 +++++++++---------- - .../browser_ui/site_settings/Website.java | 20 ++++++++ - 2 files changed, 44 insertions(+), 26 deletions(-) + .../site_settings/SingleWebsiteSettings.java | 62 +++++++++---------- + .../browser_ui/site_settings/Website.java | 20 ++++++ + 2 files changed, 49 insertions(+), 33 deletions(-) diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java @@ -19,35 +19,19 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c // Website permissions (if adding new, see hasPermissionsPreferences and resetSite below) // All permissions from the permissions preference category must be listed here. private static final String[] PERMISSION_PREFERENCE_KEYS = { -@@ -350,7 +351,26 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -349,8 +350,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment + setUpSoundPreference(preference); } else if (i == ContentSettingException.Type.JAVASCRIPT) { setUpJavascriptPreference(preference); ++ } else if (i == ContentSettingException.Type.COOKIE) { ++ setUpCookiePreference(preference); } else { - setUpListPreference(preference, mSite.getContentSettingPermission(i)); -+ // some Bromite-specific overrides for the defaults -+ @ContentSettingValues -+ @Nullable -+ Integer permission = mSite.getContentSettingPermission(i); -+ // initialize cookie and javascript with the category global defaults -+ if (permission == null) { -+ if (i == ContentSettingException.Type.COOKIE) -+ permission = WebsitePreferenceBridge.isCategoryEnabled( -+ getSiteSettingsClient().getBrowserContextHandle(), -+ ContentSettingsType.COOKIES) -+ ? ContentSettingValues.ALLOW -+ : ContentSettingValues.BLOCK; -+ else if (i == ContentSettingException.Type.JAVASCRIPT) -+ permission = WebsitePreferenceBridge.isCategoryEnabled( -+ getSiteSettingsClient().getBrowserContextHandle(), -+ ContentSettingsType.JAVASCRIPT) -+ ? ContentSettingValues.ALLOW -+ : ContentSettingValues.BLOCK; -+ } + setUpListPreference(preference, permission); } return; } -@@ -666,19 +686,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -666,19 +669,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment } private void setUpAdsInformationalBanner() { @@ -69,15 +53,44 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } private SiteSettingsCategory getWarningCategory() { -@@ -767,6 +776,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment - // TODO(crbug.com/735110): Figure out if this is the correct thing to do - here we are - // effectively treating non-ALLOW values as BLOCK. - int index = (value == ContentSettingValues.ALLOW ? 0 : 1); +@@ -831,13 +823,29 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment + @Nullable + Integer currentValue = + mSite.getContentSettingPermission(ContentSettingException.Type.JAVASCRIPT); +- // If Javascript is blocked by default, then always show a Javascript permission. +- // To do this, set it to the default value (blocked). +- if ((currentValue == null) +- && !WebsitePreferenceBridge.isCategoryEnabled( +- getSiteSettingsClient().getBrowserContextHandle(), +- ContentSettingsType.JAVASCRIPT)) { +- currentValue = ContentSettingValues.BLOCK; ++ // Always show the Javascript permission ++ if (currentValue == null) { ++ currentValue = WebsitePreferenceBridge.isCategoryEnabled( ++ getSiteSettingsClient().getBrowserContextHandle(), ++ ContentSettingsType.JAVASCRIPT) ++ ? ContentSettingValues.ALLOW ++ : ContentSettingValues.BLOCK; ++ } ++ setUpListPreference(preference, currentValue); ++ } + - listPreference.setValueIndex(index); - listPreference.setOnPreferenceChangeListener(this); - listPreference.setSummary("%s"); -@@ -855,22 +865,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment ++ private void setUpCookiePreference(Preference preference) { ++ @ContentSettingValues ++ @Nullable ++ Integer currentValue = ++ mSite.getContentSettingPermission(ContentSettingException.Type.COOKIE); ++ // Always show the cookies permission ++ if (currentValue == null) { ++ currentValue = WebsitePreferenceBridge.isCategoryEnabled( ++ getSiteSettingsClient().getBrowserContextHandle(), ++ ContentSettingsType.COOKIES) ++ ? ContentSettingValues.ALLOW ++ : ContentSettingValues.BLOCK; + } + setUpListPreference(preference, currentValue); + } +@@ -855,22 +863,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment setUpListPreference(preference, null); return; }