chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java - Issue 2179093002: [Sync] No two error messages at same time

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/sync/ui/PassphraseCreationDialogFragment.java

Issue 2179093002: [Sync] No two error messages at same time (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: git cl format Created 4 years, 5 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/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java

index 1c12753b14cd12650397c204edfab77be1805df3..10b6a539da1bf6fc972fbcb524f50920a5244b8e 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java

@@ -107,10 +107,12 @@ public class PassphraseCreationDialogFragment extends DialogFragment {

String confirmPassphrase = mConfirmPassphrase.getText().toString();

if (!passphrase.equals(confirmPassphrase)) {

+ mEnterPassphrase.setError(null);

mConfirmPassphrase.setError(getString(R.string.sync_passphrases_do_not_match));

mConfirmPassphrase.requestFocus();

return;

} else if (passphrase.isEmpty()) {

+ mConfirmPassphrase.setError(null);

mEnterPassphrase.setError(getString(R.string.sync_passphrase_cannot_be_blank));

mEnterPassphrase.requestFocus();

return;