diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java index c6328dbceb0af518411fd05aa9c97b4280f161eb..fba4af36657b466b541c90f855cb1eec5366f934 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java @@ -262,6 +262,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment @Override public boolean onPreferenceChange(Preference preference, Object newValue) { + if (false) // Suppress the "addresses not encrypted" warning (not applicable to Brave's sync model). if (mSyncService.isUsingExplicitPassphrase() && preference .getKey() @@ -451,6 +452,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment */ private void updateSyncPreferences() { String signedInAccountName = + mGoogleActivityControls != null ? "" : // We want the next `if` to be always false. CoreAccountInfo.getEmailFrom(getIdentityManager().getPrimaryAccountInfo()); // May happen if account is removed from the device while this screen is shown. if (signedInAccountName == null) {