chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java - Issue 1101373002: [Sync] Fix passphrase prompt for legacy accounts

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java

Issue 1101373002: [Sync] Fix passphrase prompt for legacy accounts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix lint Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseDialogFragment.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java

index 60cd03f450b99fad7018eeea71edb58d83f1050a..0f8338a77a99681402133930021a91ac0b531a70 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java

@@ -502,15 +502,7 @@ public class AccountManagementFragment extends PreferenceFragment

}

if (profileSyncService.isPassphraseRequiredForDecryption()) {

- switch (profileSyncService.getPassphraseType()) {

- case IMPLICIT_PASSPHRASE:

- return res.getString(R.string.sync_need_password);

nyquist 2015/04/28 00:36:33 Can this string be deleted now?

- case FROZEN_IMPLICIT_PASSPHRASE: // Falling through intentionally.

- case CUSTOM_PASSPHRASE:

- return res.getString(R.string.sync_need_passphrase);

- default:

- break;

- }

+ return res.getString(R.string.sync_need_passphrase);

}