Browse Source

Update to 84.0.4147.125-1; reverse channel to "stable"; fix desktop site problem; disable homepage

master
wchen342 2 years ago
parent
commit
1812d02585
Signed by untrusted user: wchen342 GPG Key ID: 720B70365E800508
  1. 6
      CHANGELOG.md
  2. 2
      android_flags.gn
  3. 2
      build.sh
  4. 2
      misc/android_studio_setup.sh
  5. 2
      patches/Bromite/Add-exit-menu-item.patch
  6. 4
      patches/Bromite/Add-option-to-not-persist-tabs-across-sessions.patch
  7. 4
      patches/Bromite/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch
  8. 4
      patches/Bromite/Remove-account-permissions-from-manifest.patch
  9. 6
      patches/Unobtainium/kill-GCM.patch
  10. 2
      patches/series
  11. 4
      patches/src-fix/fix-prefs.patch
  12. 2
      patches/src-fix/fix-safe-browsing-prefs.patch
  13. 2
      patches/ungoogled-chromium-android/Add-folder-button-bookmark.patch
  14. 19
      patches/ungoogled-chromium-android/Disable-homepage-by-default.patch
  15. 19
      patches/ungoogled-chromium-android/Enable-ProactivelySwapBrowsingInstance.patch
  16. 4
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.cast.patch
  17. 2
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch
  18. 12
      patches/ungoogled-chromium-android/enable-update-notification.patch

6
CHANGELOG.md

@ -1,3 +1,9 @@
# 84.0.4147.125-1
* All versions:
* The package names are now `org.ungoogled.chromium.stable`/`org.ungoogled.chromium.extensions.stable` due to [#53](https://git.droidware.info/wchen342/ungoogled-chromium-android/issues/53) / [#24](https://github.com/ungoogled-software/ungoogled-chromium-android/issues/24).
* Fix [#26](https://github.com/ungoogled-software/ungoogled-chromium-android/issues/26).
* Disable Google homepage by default when first installed.
# 84.0.4147.105-1
* Upstream update

2
android_flags.gn

@ -1,4 +1,4 @@
android_channel="default"
android_channel="stable"
android_ndk_root = "//third_party/android_ndk"
android_ndk_version = "r20b"
android_ndk_major_version = 20

2
build.sh

@ -8,7 +8,7 @@ chrome_target=chrome_public_apk
mono_target=monochrome_public_apk
webview_target=system_webview_apk
chromium_version=84.0.4147.105
chromium_version=84.0.4147.125
ungoogled_chromium_revision=1
# Argument parser from https://stackoverflow.com/questions/192249/how-do-i-parse-command-line-arguments-in-bash/29754866#29754866

2
misc/android_studio_setup.sh

@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -eux -o pipefail
chromium_version=84.0.4147.105
chromium_version=84.0.4147.125
chrome_target=chrome_public_apk
mono_target=monochrome_public_apk
webview_target=system_webview_apk

2
patches/Bromite/Add-exit-menu-item.patch

@ -49,7 +49,7 @@ Corrected Exit functionality
@Override
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -2447,6 +2447,9 @@ To change this setting, <ph name="BEGIN_
@@ -2446,6 +2446,9 @@ To change this setting, <ph name="BEGIN_
<message name="IDS_MENU_SETTINGS" desc="Menu item for opening browser settings. [CHAR-LIMIT=27]">
Settings
</message>

4
patches/Bromite/Add-option-to-not-persist-tabs-across-sessions.patch

@ -38,7 +38,7 @@ Subject: Add option to not persist tabs across sessions
android:key="do_not_track"
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -1149,8 +1149,10 @@ public class ChromeTabbedActivity
@@ -1172,8 +1172,10 @@ public class ChromeTabbedActivity
boolean hadCipherData =
CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
@ -103,7 +103,7 @@ Subject: Add option to not persist tabs across sessions
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -3220,6 +3220,12 @@ Only you can see what your camera is loo
@@ -3219,6 +3219,12 @@ Only you can see what your camera is loo
<message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
IMAGE
</message>

4
patches/Bromite/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch

@ -43,7 +43,7 @@ Subject: Add user setting for DNS-over-HTTPS (DoH) custom URL
"java/res/xml/homepage_preferences.xml",
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -1370,6 +1370,8 @@ chrome_java_sources = [
@@ -1373,6 +1373,8 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java",
"java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetAdapter.java",
"java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetContent.java",
@ -480,7 +480,7 @@ Subject: Add user setting for DNS-over-HTTPS (DoH) custom URL
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -599,6 +599,17 @@ CHAR-LIMIT guidelines:
@@ -598,6 +598,17 @@ CHAR-LIMIT guidelines:
Chrome Passwords
</message>

4
patches/Bromite/Remove-account-permissions-from-manifest.patch

@ -42,7 +42,7 @@ Subject: Remove all sync and account permissions/features from manifest
{% block extra_uses_permissions %}
{% endblock %}
@@ -860,16 +852,6 @@ by a child template that "extends" this
@@ -866,16 +858,6 @@ by a child template that "extends" this
android:resource="@xml/file_paths" />
</provider>
@ -59,7 +59,7 @@ Subject: Remove all sync and account permissions/features from manifest
<!-- Broadcast receiver that will be notified of account changes -->
<receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver">
<intent-filter>
@@ -938,14 +920,6 @@ by a child template that "extends" this
@@ -944,14 +926,6 @@ by a child template that "extends" this
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false" />

6
patches/Unobtainium/kill-GCM.patch

@ -41,7 +41,7 @@ Subject: kill GCM
"java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
"java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
"java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java",
@@ -1383,11 +1382,6 @@ chrome_java_sources = [
@@ -1386,11 +1385,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/services/AndroidChildAccountHelper.java",
"java/src/org/chromium/chrome/browser/services/AndroidEduOwnerCheckCallback.java",
"java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java",
@ -78,7 +78,7 @@ Subject: kill GCM
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
<uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
@@ -968,50 +963,9 @@ by a child template that "extends" this
@@ -974,50 +969,9 @@ by a child template that "extends" this
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false" />
@ -129,7 +129,7 @@ Subject: kill GCM
<receiver android:name="com.google.ipc.invalidation.ticl.android2.AndroidInternalScheduler$AlarmReceiver"
android:exported="false"/>
<receiver android:name="com.google.ipc.invalidation.external.client.contrib.AndroidListener$AlarmReceiver"
@@ -1038,28 +992,10 @@ by a child template that "extends" this
@@ -1044,28 +998,10 @@ by a child template that "extends" this
android:exported="false"
android:permission="android.permission.BIND_JOB_SERVICE"/>

2
patches/series

@ -30,6 +30,8 @@ ungoogled-chromium-android/Add-folder-button-bookmark.patch
ungoogled-chromium-android/Mark-http-as-dangerous-mixed-content-warning.patch
ungoogled-chromium-android/flag-enable-process-sharing.patch
ungoogled-chromium-android/enable-update-notification.patch
ungoogled-chromium-android/Enable-ProactivelySwapBrowsingInstance.patch
ungoogled-chromium-android/Disable-homepage-by-default.patch
Bromite/Add-exit-menu-item.patch
Bromite/Add-flag-to-disable-WebGL.patch
Bromite/Add-flags-to-disable-device-motion-orientation-APIs.patch

4
patches/src-fix/fix-prefs.patch

@ -47,8 +47,8 @@ Subject: fix build error with prefs.h
public void onConfirm(boolean wipeData) {
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoUtil.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoUtil.java
@@ -39,8 +39,7 @@ public class SigninPromoUtil {
public static boolean launchSigninPromoIfNeeded(final Activity activity) {
@@ -44,8 +44,7 @@ public class SigninPromoUtil {
SigninPreferencesManager preferencesManager = SigninPreferencesManager.getInstance();
int currentMajorVersion = ChromeVersionInfo.getProductMajorVersion();
- boolean wasSignedIn = TextUtils.isEmpty(

2
patches/src-fix/fix-safe-browsing-prefs.patch

@ -25,7 +25,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
"java/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceFactory.java",
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -1355,7 +1355,6 @@ chrome_java_sources = [
@@ -1358,7 +1358,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/resources/ResourceMapper.java",
"java/src/org/chromium/chrome/browser/rlz/RevenueStats.java",
"java/src/org/chromium/chrome/browser/rlz/RlzPingHandler.java",

2
patches/ungoogled-chromium-android/Add-folder-button-bookmark.patch

@ -178,7 +178,7 @@ Subject: Add new folder button to bookmark activity
if (!mIsCreatingFolder) {
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -2511,6 +2511,9 @@ To change this setting, <ph name="BEGIN_
@@ -2510,6 +2510,9 @@ To change this setting, <ph name="BEGIN_
<message name="IDS_BOOKMARK_ACTION_BAR_EDIT_FOLDER" desc="Button text for editing current folder action on the bookmark action bar [CHAR-LIMIT=32]">
Edit folder
</message>

19
patches/ungoogled-chromium-android/Disable-homepage-by-default.patch

@ -0,0 +1,19 @@
From: Wengling Chen <[email protected]>
Date: Tue, 11 Aug 2020 16:07:07 -0400
Subject: Disable google homepage by default
---
chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
@@ -167,7 +167,7 @@ public class HomepageManager implements
* @see #isHomepageEnabled
*/
private boolean getPrefHomepageEnabled() {
- return mSharedPreferencesManager.readBoolean(ChromePreferenceKeys.HOMEPAGE_ENABLED, true);
+ return mSharedPreferencesManager.readBoolean(ChromePreferenceKeys.HOMEPAGE_ENABLED, false);
}
/**

19
patches/ungoogled-chromium-android/Enable-ProactivelySwapBrowsingInstance.patch

@ -0,0 +1,19 @@
From: Wengling Chen <[email protected]>
Date: Tue, 11 Aug 2020 16:07:07 -0400
Subject: Enable experimental ProactivelySwapBrowsingInstance feature
---
content/public/common/content_features.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc
@@ -459,7 +459,7 @@ const base::Feature kPrioritizeBootstrap
// HTTP(S) navigations when the BrowsingInstance doesn't contain any other
// windows.
const base::Feature kProactivelySwapBrowsingInstance{
- "ProactivelySwapBrowsingInstance", base::FEATURE_DISABLED_BY_DEFAULT};
+ "ProactivelySwapBrowsingInstance", base::FEATURE_ENABLED_BY_DEFAULT};
// Reduce the amount of information in the default 'referer' header for
// cross-origin requests.

4
patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.cast.patch

@ -1377,7 +1377,7 @@ Subject: Remove dependency on com.google.android.gms.cast
<!-- Note: All activities directly or indirectly derived from ChromeActivity
must specify android:hardwareAccelerated="false".
@@ -701,16 +695,6 @@ by a child template that "extends" this
@@ -707,16 +701,6 @@ by a child template that "extends" this
</intent-filter>
</activity>
@ -1394,7 +1394,7 @@ Subject: Remove dependency on com.google.android.gms.cast
<!-- This activity is used to restart the main Chrome process. Should never be exported. -->
<activity android:name="org.chromium.chrome.browser.BrowserRestartActivity"
android:launchMode="singleInstance"
@@ -1157,18 +1141,6 @@ by a child template that "extends" this
@@ -1163,18 +1147,6 @@ by a child template that "extends" this
{% endif %}
{% block extra_application_definitions %}

2
patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch

@ -102,7 +102,7 @@ Subject: Remove dependency on
MediaRouteProvider cafProvider = CafMediaRouteProvider.create(manager);
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -775,15 +775,6 @@ by a child template that "extends" this
@@ -781,15 +781,6 @@ by a child template that "extends" this
</intent-filter>
</activity>

12
patches/ungoogled-chromium-android/enable-update-notification.patch

@ -239,7 +239,7 @@
+}
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -510,6 +510,7 @@ chrome_java_sources = [
@@ -512,6 +512,7 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java",
"java/src/org/chromium/chrome/browser/dom_distiller/TabDistillabilityProvider.java",
"java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java",
@ -247,7 +247,7 @@
"java/src/org/chromium/chrome/browser/download/DownloadActivity.java",
"java/src/org/chromium/chrome/browser/download/DownloadBroadcastManager.java",
"java/src/org/chromium/chrome/browser/download/DownloadController.java",
@@ -1079,6 +1080,7 @@ chrome_java_sources = [
@@ -1081,6 +1082,7 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateController.java",
"java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java",
"java/src/org/chromium/chrome/browser/omaha/inline/NoopInlineUpdateController.java",
@ -382,7 +382,7 @@
}
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -490,6 +490,7 @@ const base::Feature kImmersiveUiMode{"Im
@@ -491,6 +491,7 @@ const base::Feature kImmersiveUiMode{"Im
const base::Feature kInlineUpdateFlow{"InlineUpdateFlow",
base::FEATURE_DISABLED_BY_DEFAULT};
@ -412,7 +412,7 @@
return std::make_unique<UpdateNotificationConfig>();
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -1114,7 +1114,7 @@ by a child template that "extends" this
@@ -1120,7 +1120,7 @@ by a child template that "extends" this
<service android:name="org.chromium.chrome.browser.tracing.TracingNotificationService"
android:exported="false"/>
@ -423,7 +423,7 @@
<meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDER"
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1570,7 +1570,7 @@ To change this setting, <ph name="BEGIN_
@@ -1569,7 +1569,7 @@ To change this setting, <ph name="BEGIN_
Update Chrome
</message>
<message name="IDS_UPDATE_NOTIFICATION_TEXT_BODY_DEFAULT" desc="Default text showing in the update notification body, kindly telling user to update to the latest version of Chrome.">
@ -590,7 +590,7 @@
+}
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2826,10 +2826,9 @@ const char kUsageStatsDescription[] =
@@ -2832,10 +2832,9 @@ const char kUsageStatsDescription[] =
"to websites in order to enforce user-defined time limits.";
const char kUsageStatsName[] = "Share Usage Stats with Digital Wellbeing";

Loading…
Cancel
Save