From c6060f0d793c276194957a680df36db0af6f641d Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Sun, 15 Nov 2020 16:21:49 +0100 Subject: [PATCH] [wip] patch before wiggle --- .../Add-an-always-incognito-mode.patch | 2 +- .../Add-bookmark-import-export-actions.patch | 15 ++++-- ...dd-custom-tab-intents-privacy-option.patch | 19 ++------ ...dd-history-support-in-incognito-mode.patch | 20 ++------ ...-to-not-persist-tabs-across-sessions.patch | 15 +----- .../Disable-sync-services-menu-entry.patch | 35 ++++++++++++-- ...cklisted-URLs-upon-bookmark-creation.patch | 20 +++++--- .../patches/Remove-google_services_gcm.patch | 46 ++++++++++++++++++- ...moval-of-an-option-to-block-autoplay.patch | 9 ++-- .../Show-site-settings-for-cookies.patch | 3 +- ...romium-Disable-translate-integration.patch | 13 ++++++ 11 files changed, 132 insertions(+), 65 deletions(-) diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 4b65d59a..7332d40f 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -44,7 +44,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi android:summary="@string/preload_pages_summary" android:persistent="false" android:order="1"/> -+ 0.5 - 0.5 - -+ Allow custom tab intents from applications -+ When disabled, all custom tab intents will be processed as regular navigation instead -+ - - 5 - diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml @@ -30,7 +17,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi android:key="do_not_track" android:title="@string/do_not_track_title" android:order="3"/> -+ -+ Clears history and autocompletions in the address bar. Your Google Account may have other forms of browsing history at <link>myactivity.google.com</link>. -diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb ---- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb -+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb -@@ -1142,4 +1142,6 @@ I dati della sessione in incognito vengono cancellati da Chrome soltanto quando - Chiudi tutte le schede - Generali - Menu scheda feed chiuso -- -\ No newline at end of file -+Abilita la cronologia nelle sessioni in incognito -+Abilita la registrazione della navigazione nella cronologia anche per le sessioni in incognito -+ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc diff --git a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch index 740141b4..dd729951 100644 --- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch +++ b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch @@ -10,19 +10,6 @@ Subject: Add option to not persist tabs across sessions .../ui/android/strings/android_chrome_strings.grd | 6 ++++++ 5 files changed, 27 insertions(+), 3 deletions(-) -diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml ---- a/chrome/android/java/res/values/values.xml -+++ b/chrome/android/java/res/values/values.xml -@@ -31,6 +31,9 @@ - - 15 - -+ Close tabs on exit -+ Don\'t persist tabs between browsing sessions -+ - - 0 - 1 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml @@ -30,7 +17,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi android:title="@string/always_incognito_title" android:summary="@string/always_incognito_summary" android:defaultValue="false" /> -+ +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java +@@ -255,24 +255,6 @@ public class SyncSettingsUtils { + return res.getString(R.string.sync_data_types_off); + } + +- boolean syncEnabled = AndroidSyncSettings.get().isSyncEnabled(); +- if (syncEnabled) { +- if (!profileSyncService.isSyncActive()) { +- return res.getString(R.string.sync_setup_progress); +- } +- +- if (profileSyncService.isPassphraseRequiredForPreferredDataTypes()) { +- return res.getString(R.string.sync_need_passphrase); +- } +- +- if (profileSyncService.isTrustedVaultKeyRequiredForPreferredDataTypes()) { +- return profileSyncService.isEncryptEverythingEnabled() +- ? context.getString(R.string.sync_error_card_title) +- : context.getString(R.string.sync_passwords_error_card_title); +- } +- +- return context.getString(R.string.sync_and_services_summary_sync_on); +- } + return context.getString(R.string.sync_is_disabled); + } + -- 2.17.1 diff --git a/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch b/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch index 642cdaa9..c18ef8c6 100644 --- a/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch +++ b/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch @@ -3,8 +3,8 @@ Date: Fri, 21 Aug 2020 22:39:23 +0200 Subject: Remove blocklisted URLs upon bookmark creation --- - .../chrome/browser/app/ChromeActivity.java | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) + .../chrome/browser/app/ChromeActivity.java | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java @@ -18,7 +18,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabDelegateFactory; -@@ -251,6 +253,7 @@ public abstract class ChromeActivity +@@ -206,6 +208,10 @@ import org.chromium.ui.modaldialog.ModalDialogManager; + import org.chromium.ui.widget.Toast; + import org.chromium.url.Origin; + import org.chromium.webapk.lib.client.WebApkNavigationClient; ++import org.chromium.url.GURL; + + import java.util.ArrayList; + import java.util.List; +@@ -251,6 +257,7 @@ public abstract class ChromeActivity private UmaSessionStats mUmaSessionStats; private ContextReporter mContextReporter; @@ -26,7 +34,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv private boolean mPartnerBrowserRefreshNeeded; -@@ -1230,6 +1233,11 @@ public abstract class ChromeActivity +@@ -1230,6 +1237,11 @@ public abstract class ChromeActivity mCompositorViewHolder = null; } @@ -38,7 +46,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv onDestroyInternal(); if (mDidAddPolicyChangeListener) { -@@ -1466,6 +1474,13 @@ public abstract class ChromeActivity +@@ -1466,6 +1478,13 @@ public abstract class ChromeActivity return; } @@ -47,7 +55,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv + mMostVisitedSites = + SuggestionsDependencyFactory.getInstance().createMostVisitedSites(Profile.getLastUsedRegularProfile()); + } -+ mMostVisitedSites.removeBlocklistedUrl(tabToBookmark.getOriginalUrl()); ++ mMostVisitedSites.removeBlocklistedUrl(new GURL(tabToBookmark.getOriginalUrl())); + // Note we get user bookmark ID over just a bookmark ID here: Managed bookmarks can't be // edited. If the current URL is only bookmarked by managed bookmarks, this will return diff --git a/build/patches/Remove-google_services_gcm.patch b/build/patches/Remove-google_services_gcm.patch index 8c1435b9..a47937f8 100644 --- a/build/patches/Remove-google_services_gcm.patch +++ b/build/patches/Remove-google_services_gcm.patch @@ -3,9 +3,51 @@ Date: Sun, 3 May 2020 12:15:33 +0200 Subject: Remove google_services_gcm --- - third_party/android_deps/BUILD.gn | 18 ------------------ - 1 file changed, 18 deletions(-) + .../browser/language/AppLocaleUtils.java | 19 ------------------- + third_party/android_deps/BUILD.gn | 18 ------------------ + 2 files changed, 37 deletions(-) +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java +@@ -8,11 +8,6 @@ import android.content.Context; + import android.preference.PreferenceManager; + import android.text.TextUtils; + +-import com.google.android.play.core.splitcompat.SplitCompat; +-import com.google.android.play.core.splitinstall.SplitInstallManager; +-import com.google.android.play.core.splitinstall.SplitInstallManagerFactory; +-import com.google.android.play.core.splitinstall.SplitInstallRequest; +- + import org.chromium.base.BundleUtils; + import org.chromium.base.ContextUtils; + import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; +@@ -75,25 +70,11 @@ public class AppLocaleUtils { + * @param context Activity context to enable downloaded language splits on. + */ + public static void maybeInstallActivitySplitCompat(Context context) { +- if (GlobalAppLocaleController.getInstance().isOverridden() && BundleUtils.isBundle()) { +- SplitCompat.installActivity(context); +- } + } + + /** + * For bundle builds ensure that the language split for languageName is download. + */ + private static void ensureLaguageSplitInstalled(String languageName) { +- SplitInstallManager splitInstallManager = +- SplitInstallManagerFactory.create(ContextUtils.getApplicationContext()); +- +- // TODO(perrier): check if languageName is already installed. https://crbug.com/1103806 +- if (languageName != null) { +- SplitInstallRequest installRequest = +- SplitInstallRequest.newBuilder() +- .addLanguage(Locale.forLanguageTag(languageName)) +- .build(); +- splitInstallManager.startInstall(installRequest); +- } + } + } diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn --- a/third_party/android_deps/BUILD.gn +++ b/third_party/android_deps/BUILD.gn diff --git a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch index a7412776..3bcf0cd8 100644 --- a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch +++ b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch @@ -256,7 +256,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c + private void setUpAutoplayPreference(Preference preference) { + @ContentSettingValues + @Nullable -+ Integer currentValue = mSite.getContentSettingPermission(ContentSettingsType.AUTOPLAY); ++ Integer currentValue = mSite.getContentSetting( ++ getSiteSettingsClient().getBrowserContextHandle(), ContentSettingsType.AUTOPLAY); + // In order to always show the autoplay permission, set it up with the default value if it + // doesn't have a current value. + if (currentValue == null) { @@ -353,7 +354,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } else if (type == ContentSettingsType.NOTIFICATIONS) { WebsitePreferenceBridgeJni.get().getNotificationOrigins(browserContextHandle, list); + } else if (type == ContentSettingsType.AUTOPLAY) { -+ WebsitePreferenceBridgeJni.get().getAutoplayOrigins(browserContextHandle, list); ++ WebsitePreferenceBridgeJni.get().getAutoplayOrigins( ++ browserContextHandle, list, false); } else if (type == ContentSettingsType.PROTECTED_MEDIA_IDENTIFIER) { WebsitePreferenceBridgeJni.get().getProtectedMediaIdentifierOrigins( browserContextHandle, list); @@ -375,7 +377,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c BrowserContextHandle browserContextHandle, Object list, boolean managedOnly); void getMidiOrigins(BrowserContextHandle browserContextHandle, Object list); void getNotificationOrigins(BrowserContextHandle browserContextHandle, Object list); -+ void getAutoplayOrigins(BrowserContextHandle browserContextHandle, Object list); ++ void getAutoplayOrigins( ++ BrowserContextHandle browserContextHandle, Object list, boolean managedOnly); void getNfcOrigins(BrowserContextHandle browserContextHandle, Object list); void getProtectedMediaIdentifierOrigins( BrowserContextHandle browserContextHandle, Object list); diff --git a/build/patches/Show-site-settings-for-cookies.patch b/build/patches/Show-site-settings-for-cookies.patch index 75843755..40357a23 100644 --- a/build/patches/Show-site-settings-for-cookies.patch +++ b/build/patches/Show-site-settings-for-cookies.patch @@ -67,7 +67,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c + @ContentSettingValues + @Nullable + Integer currentValue = -+ mSite.getContentSettingPermission(ContentSettingsType.COOKIES); ++ mSite.getContentSetting( ++ getSiteSettingsClient().getBrowserContextHandle(), ContentSettingsType.COOKIES); + // Always show the cookies permission + if (currentValue == null) { + currentValue = WebsitePreferenceBridge.isCategoryEnabled( diff --git a/build/patches/ungoogled-chromium-Disable-translate-integration.patch b/build/patches/ungoogled-chromium-Disable-translate-integration.patch index 8a9cff96..2c736377 100644 --- a/build/patches/ungoogled-chromium-Disable-translate-integration.patch +++ b/build/patches/ungoogled-chromium-Disable-translate-integration.patch @@ -18,6 +18,19 @@ diff --git a/chrome/android/java/res/xml/languages_preferences.xml b/chrome/andr android:layout="@layout/languages_preference" android:widgetLayout="@layout/accept_languages_list" /> +- +- + +diff --git a/chrome/android/java/res/xml/languages_detailed_preferences.xml b/chrome/android/java/res/xml/languages_detailed_preferences.xml +--- a/chrome/android/java/res/xml/languages_detailed_preferences.xml ++++ b/chrome/android/java/res/xml/languages_detailed_preferences.xml +@@ -11,9 +11,4 @@ + android:layout="@layout/languages_preference" + android:widgetLayout="@layout/accept_languages_list" /> + -