From 2a6c0d3a818dc59cd7ec5ec8b52d3d31ba52e861 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Thu, 10 Nov 2022 13:54:39 +0100 Subject: [PATCH] patch for 107.0.5304.107 --- .../Remove-signin-and-sync-integrations.patch | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/build/patches/Remove-signin-and-sync-integrations.patch b/build/patches/Remove-signin-and-sync-integrations.patch index 79f35674..1e723733 100644 --- a/build/patches/Remove-signin-and-sync-integrations.patch +++ b/build/patches/Remove-signin-and-sync-integrations.patch @@ -84,7 +84,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/firstrun/MobileFreProgress.java | 4 +- .../router/discovery/access_code/BUILD.gn | 1 - .../browser/password_manager/android/BUILD.gn | 4 - - ...sswordManagerErrorMessageHelperBridge.java | 13 - + ...sswordManagerErrorMessageHelperBridge.java | 22 +- .../PasswordManagerHelper.java | 121 +-------- ...swordSyncControllerDelegateBridgeImpl.java | 7 - chrome/browser/privacy/BUILD.gn | 1 - @@ -120,7 +120,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../ProfileOAuth2TokenServiceDelegate.java | 52 ---- .../net/HttpNegotiateAuthenticator.java | 88 +------ .../chromoting/base/OAuthTokenFetcher.java | 2 - - 101 files changed, 91 insertions(+), 2555 deletions(-) + 101 files changed, 92 insertions(+), 2563 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn @@ -3588,7 +3588,23 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom import org.chromium.components.prefs.PrefService; import org.chromium.components.signin.AccountManagerFacadeProvider; import org.chromium.components.signin.base.CoreAccountInfo; -@@ -81,17 +80,5 @@ public class PasswordManagerErrorMessageHelperBridge { +@@ -49,14 +48,8 @@ public class PasswordManagerErrorMessageHelperBridge { + */ + @CalledByNative + static boolean shouldShowErrorUi() { ++ if ((true)) return false; + Profile profile = Profile.getLastUsedRegularProfile(); +- final CoreAccountInfo primaryAccountInfo = +- IdentityServicesProvider.get().getIdentityManager(profile).getPrimaryAccountInfo( +- ConsentLevel.SIGNIN); +- // It is possible that the account is removed from Chrome between the password manager +- // calling the Google Play Services backend and Chrome receiving the reply. In that +- // case, the error is no longer relevant/fixable. +- if (primaryAccountInfo == null) return false; + + if (ChromeFeatureList.getFieldTrialParamByFeatureAsBoolean( + ChromeFeatureList.UNIFIED_PASSWORD_MANAGER_ERROR_MESSAGES, +@@ -91,18 +84,5 @@ public class PasswordManagerErrorMessageHelperBridge { */ @CalledByNative static void startUpdateAccountCredentialsFlow(WindowAndroid windowAndroid) { @@ -3596,8 +3612,9 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom - final CoreAccountInfo primaryAccountInfo = - IdentityServicesProvider.get().getIdentityManager(profile).getPrimaryAccountInfo( - ConsentLevel.SIGNIN); -- // It's not possible to call updateCredentials without an account. -- assert primaryAccountInfo != null; +- // If the account has been removed before calling this method, there are no credentials to +- // update. +- if (primaryAccountInfo == null) return; - final Activity activity = windowAndroid.getActivity().get(); - AccountManagerFacadeProvider.getInstance().updateCredentials( - CoreAccountInfo.getAndroidAccountFrom(primaryAccountInfo), activity, (success) -> {