am 16e4608a: am ac37c5c1: Change Exchange username validation to exclude bare backslash

Merge commit '16e4608ab577fa234c680383fc8488ce98be60af'

* commit '16e4608ab577fa234c680383fc8488ce98be60af':
  Change Exchange username validation to exclude bare backslash
This commit is contained in:
Marc Blank 2009-09-17 09:47:02 -07:00 committed by Android Git Automerger
commit e846a54238

View File

@ -196,6 +196,11 @@ public class AccountSetupExchange extends Activity implements OnClickListener,
outState.putParcelable(EXTRA_ACCOUNT, mAccount); outState.putParcelable(EXTRA_ACCOUNT, mAccount);
} }
private boolean usernameFieldValid(EditText usernameView) {
return Utility.requiredFieldValid(usernameView) &&
!usernameView.getText().toString().equals("\\");
}
/** /**
* Prepare a cached dialog with current values (e.g. account name) * Prepare a cached dialog with current values (e.g. account name)
*/ */
@ -240,7 +245,7 @@ public class AccountSetupExchange extends Activity implements OnClickListener,
* NOTE: Does it make sense to extract & combine with similar code in AccountSetupIncoming? * NOTE: Does it make sense to extract & combine with similar code in AccountSetupIncoming?
*/ */
private void validateFields() { private void validateFields() {
boolean enabled = Utility.requiredFieldValid(mUsernameView) boolean enabled = usernameFieldValid(mUsernameView)
&& Utility.requiredFieldValid(mPasswordView) && Utility.requiredFieldValid(mPasswordView)
&& Utility.requiredFieldValid(mServerView); && Utility.requiredFieldValid(mServerView);
if (enabled) { if (enabled) {