ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am ac37c5c1: Change Exchange username validation to exclude bare backslash

Browse Source 
Merge commit 'ac37c5c15a3fd4f91f264800966da8e28f338c87' into eclair-plus-aosp

* commit 'ac37c5c15a3fd4f91f264800966da8e28f338c87':
  Change Exchange username validation to exclude bare backslash
This commit is contained in:
Marc Blank 2009-09-15 18:10:12 -07:00 committed by Android Git Automerger
commit 16e4608ab5
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/email/activity/setup/AccountSetupExchange.java
View File

@ -50,7 +50,7 @@ import java.net.URISyntaxException;
* User (login) * User (login)
* Password * Password
*/ */
public class AccountSetupExchange extends Activity implements OnClickListener, public class AccountSetupExchange extends Activity implements OnClickListener,
OnCheckedChangeListener { OnCheckedChangeListener {
private static final String EXTRA_ACCOUNT = "account"; private static final String EXTRA_ACCOUNT = "account";
private static final String EXTRA_MAKE_DEFAULT = "makeDefault"; private static final String EXTRA_MAKE_DEFAULT = "makeDefault";
@ -88,7 +88,7 @@ public class AccountSetupExchange extends Activity implements OnClickListener,
} }
/** /**
* For now, we'll simply replicate outgoing, for the purpose of satisfying the * For now, we'll simply replicate outgoing, for the purpose of satisfying the
* account settings flow. * account settings flow.
*/ */
public static void actionEditOutgoingSettings(Activity fromActivity, Account account) public static void actionEditOutgoingSettings(Activity fromActivity, Account account)
@ -174,7 +174,7 @@ public class AccountSetupExchange extends Activity implements OnClickListener,
if (uri.getHost() != null) { if (uri.getHost() != null) {
mServerView.setText(uri.getHost()); mServerView.setText(uri.getHost());
} }
boolean ssl = uri.getScheme().contains("ssl"); boolean ssl = uri.getScheme().contains("ssl");
mSslSecurityView.setChecked(ssl); mSslSecurityView.setChecked(ssl);
mTrustCertificatesView.setChecked(uri.getScheme().contains("tssl")); mTrustCertificatesView.setChecked(uri.getScheme().contains("tssl"));
@ -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)
*/ */
@ -237,10 +242,10 @@ public class AccountSetupExchange extends Activity implements OnClickListener,
/** /**
* Check the values in the fields and decide if it makes sense to enable the "next" button * Check the values in the fields and decide if it makes sense to enable the "next" button
* 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) {
@ -273,9 +278,9 @@ public class AccountSetupExchange extends Activity implements OnClickListener,
} }
} }
} }
/** /**
* Attempt to create a URI from the fields provided. Throws URISyntaxException if there's * Attempt to create a URI from the fields provided. Throws URISyntaxException if there's
* a problem with the user input. * a problem with the user input.
* @return a URI built from the account setup fields * @return a URI built from the account setup fields
*/ */