Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a162d5820e |
+163
-39
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,203 @@
|
||||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Wed, 15 May 2019 17:08:35 +0200
|
||||
Subject: Remove recent tabs signin
|
||||
|
||||
---
|
||||
.../chrome/browser/ntp/RecentTabsManager.java | 13 +---
|
||||
.../chrome/browser/signin/SigninManager.java | 74 ++--------------------
|
||||
2 files changed, 8 insertions(+), 79 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
|
||||
@@ -357,18 +357,7 @@ public class RecentTabsManager implements AndroidSyncSettingsObserver, SignInSta
|
||||
*/
|
||||
@PromoState
|
||||
int getPromoType() {
|
||||
- if (!ChromeSigninController.get().isSignedIn()) {
|
||||
- if (!SigninManager.get().isSignInAllowed()) {
|
||||
- return PromoState.PROMO_NONE;
|
||||
- }
|
||||
- return PromoState.PROMO_SIGNIN_PERSONALIZED;
|
||||
- }
|
||||
-
|
||||
- if (AndroidSyncSettings.get().isSyncEnabled()
|
||||
- && AndroidSyncSettings.get().isChromeSyncEnabled() && !mForeignSessions.isEmpty()) {
|
||||
- return PromoState.PROMO_NONE;
|
||||
- }
|
||||
- return PromoState.PROMO_SYNC;
|
||||
+ return PromoState.PROMO_NONE;
|
||||
}
|
||||
|
||||
void recordRecentTabMetrics() {
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
|
||||
@@ -28,11 +28,7 @@ import org.chromium.base.task.PostTask;
|
||||
import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
|
||||
import org.chromium.chrome.browser.externalauth.UserRecoverableErrorHandler;
|
||||
import org.chromium.chrome.browser.sync.SyncUserDataWiper;
|
||||
-import org.chromium.components.signin.AccountIdProvider;
|
||||
import org.chromium.components.signin.AccountManagerFacade;
|
||||
-import org.chromium.components.signin.AccountTrackerService;
|
||||
-import org.chromium.components.signin.ChromeSigninController;
|
||||
-import org.chromium.components.sync.AndroidSyncSettings;
|
||||
import org.chromium.content_public.browser.UiThreadTaskTraits;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -48,7 +44,7 @@ import java.util.List;
|
||||
* <p/>
|
||||
* See chrome/browser/signin/signin_manager_android.h for more details.
|
||||
*/
|
||||
-public class SigninManager implements AccountTrackerService.OnSystemAccountsSeededListener {
|
||||
+public class SigninManager {
|
||||
private static final String TAG = "SigninManager";
|
||||
|
||||
/**
|
||||
@@ -181,8 +177,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
|
||||
private final long mNativeSigninManagerAndroid;
|
||||
private final Context mContext;
|
||||
- private final AccountTrackerService mAccountTrackerService;
|
||||
- private final AndroidSyncSettings mAndroidSyncSettings;
|
||||
private final ObserverList<SignInStateObserver> mSignInStateObservers = new ObserverList<>();
|
||||
private final ObserverList<SignInAllowedObserver> mSignInAllowedObservers =
|
||||
new ObserverList<>();
|
||||
@@ -226,25 +220,17 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
}
|
||||
|
||||
private SigninManager() {
|
||||
- this(ContextUtils.getApplicationContext(),
|
||||
- IdentityServicesProvider.getAccountTrackerService(), AndroidSyncSettings.get());
|
||||
+ this(ContextUtils.getApplicationContext());
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
- SigninManager(Context context, AccountTrackerService accountTrackerService,
|
||||
- AndroidSyncSettings androidSyncSettings) {
|
||||
+ SigninManager(Context context) {
|
||||
ThreadUtils.assertOnUiThread();
|
||||
assert context != null;
|
||||
- assert accountTrackerService != null;
|
||||
- assert androidSyncSettings != null;
|
||||
mContext = context;
|
||||
- mAccountTrackerService = accountTrackerService;
|
||||
- mAndroidSyncSettings = androidSyncSettings;
|
||||
|
||||
mNativeSigninManagerAndroid = nativeInit();
|
||||
mSigninAllowedByPolicy = nativeIsSigninAllowedByPolicy(mNativeSigninManagerAndroid);
|
||||
-
|
||||
- mAccountTrackerService.addSystemAccountsSeededListener(this);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -280,8 +266,7 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
* Returns true if signin can be started now.
|
||||
*/
|
||||
public boolean isSignInAllowed() {
|
||||
- return !mFirstRunCheckIsPending && mSignInState == null && mSigninAllowedByPolicy
|
||||
- && ChromeSigninController.get().getSignedInUser() == null && isSigninSupported();
|
||||
+ return false;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -296,15 +281,14 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
* Google Play Services installed.
|
||||
*/
|
||||
public boolean isSigninSupported() {
|
||||
- return !ApiCompatibilityUtils.isDemoUser(mContext)
|
||||
- && !ExternalAuthUtils.getInstance().isGooglePlayServicesMissing(mContext);
|
||||
+ return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Whether force sign-in is enabled by policy.
|
||||
*/
|
||||
public boolean isForceSigninEnabled() {
|
||||
- return nativeIsForceSigninEnabled(mNativeSigninManagerAndroid);
|
||||
+ return false;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -338,27 +322,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
}
|
||||
|
||||
/**
|
||||
- * Continue pending sign in after system accounts have been seeded into AccountTrackerService.
|
||||
- */
|
||||
- @Override
|
||||
- public void onSystemAccountsSeedingComplete() {
|
||||
- if (mSignInState != null && mSignInState.mBlockedOnAccountSeeding) {
|
||||
- mSignInState.mBlockedOnAccountSeeding = false;
|
||||
- progressSignInFlowCheckPolicy();
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
- * Clear pending sign in when system accounts in AccountTrackerService were refreshed.
|
||||
- */
|
||||
- @Override
|
||||
- public void onSystemAccountsChanged() {
|
||||
- if (mSignInState != null) {
|
||||
- abortSignIn();
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
* Starts the sign-in flow, and executes the callback when finished.
|
||||
*
|
||||
* If an activity is provided, it is considered an "interactive" sign-in and the user can be
|
||||
@@ -413,19 +376,7 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
}
|
||||
|
||||
private void progressSignInFlowSeedSystemAccounts() {
|
||||
- if (mAccountTrackerService.checkAndSeedSystemAccounts()) {
|
||||
- progressSignInFlowCheckPolicy();
|
||||
- } else if (AccountIdProvider.getInstance().canBeUsed()) {
|
||||
- mSignInState.mBlockedOnAccountSeeding = true;
|
||||
- } else {
|
||||
- Activity activity = mSignInState.mActivity;
|
||||
- UserRecoverableErrorHandler errorHandler = activity != null
|
||||
- ? new UserRecoverableErrorHandler.ModalDialog(activity, !isForceSigninEnabled())
|
||||
- : new UserRecoverableErrorHandler.SystemNotification();
|
||||
- ExternalAuthUtils.getInstance().canUseGooglePlayServices(errorHandler);
|
||||
- Log.w(TAG, "Cancelling the sign-in process as Google Play services is unavailable");
|
||||
- abortSignIn();
|
||||
- }
|
||||
+ mSignInState.mBlockedOnAccountSeeding = true;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -489,12 +440,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
// Tell the native side that sign-in has completed.
|
||||
nativeOnSignInCompleted(mNativeSigninManagerAndroid, mSignInState.mAccount.name);
|
||||
|
||||
- // Cache the signed-in account name. This must be done after the native call, otherwise
|
||||
- // sync tries to start without being signed in natively and crashes.
|
||||
- ChromeSigninController.get().setSignedInAccountName(mSignInState.mAccount.name);
|
||||
- mAndroidSyncSettings.updateAccount(mSignInState.mAccount);
|
||||
- mAndroidSyncSettings.enableChromeSync();
|
||||
-
|
||||
if (mSignInState.mCallback != null) {
|
||||
mSignInState.mCallback.onSignInComplete();
|
||||
}
|
||||
@@ -670,16 +615,11 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
// Should be set at beginning of sign-out flow.
|
||||
assert mSignOutState != null;
|
||||
|
||||
- ChromeSigninController.get().setSignedInAccountName(null);
|
||||
- mAndroidSyncSettings.updateAccount(null);
|
||||
-
|
||||
if (mSignOutState.mManagementDomain != null) {
|
||||
wipeProfileData();
|
||||
} else {
|
||||
wipeGoogleServiceWorkerCaches();
|
||||
}
|
||||
-
|
||||
- mAccountTrackerService.invalidateAccountSeedStatus(true);
|
||||
}
|
||||
|
||||
private void wipeProfileData() {
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -21,6 +21,7 @@ Disable-data-saver.patch
|
||||
Skip-the-first-run-and-metrics.patch
|
||||
Disable-signin-and-data-saver-preferences.patch
|
||||
Disable-signin-data-reduction-promos.patch
|
||||
Remove-recent-tabs-signin.patch
|
||||
Remove-background-sync-and-translate-menu-options.patch
|
||||
Disable-unused-permissions.patch
|
||||
Never-send-any-crash-upload-data.patch
|
||||
|
||||
Reference in New Issue
Block a user