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

DO NOT MERGE Remove all password trim() calls

Browse Source 
* Initial account setup screen, password entry field
* When passing the entered password from incoming->outgoing
* When restoring store URI's from HostAuth

This will satisfy the users who insist on leading/trailing spaces
in their IMAP or EAS password.  Not supported by POP3 (no quoting).

Bug: 2981433
Change-Id: I16c00bf96382899abb54cb75fcd44cf0f140a660
This commit is contained in:
Andy Stadler 2011-01-20 11:30:20 -08:00
parent 808d0f38a6
commit ecffd551cc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/email/activity/setup/AccountSetupBasics.java
View File

@ -350,7 +350,7 @@ public class AccountSetupBasics extends Activity
private void finishAutoSetup() { private void finishAutoSetup() {
String email = mEmailView.getText().toString().trim(); String email = mEmailView.getText().toString().trim();
String password = mPasswordView.getText().toString().trim(); String password = mPasswordView.getText().toString();
String[] emailParts = email.split("@"); String[] emailParts = email.split("@");
String user = emailParts[0]; String user = emailParts[0];
String domain = emailParts[1]; String domain = emailParts[1];
@ -468,7 +468,7 @@ public class AccountSetupBasics extends Activity
*/ */
private void onManualSetup(boolean allowAutoDiscover) { private void onManualSetup(boolean allowAutoDiscover) {
String email = mEmailView.getText().toString().trim(); String email = mEmailView.getText().toString().trim();
String password = mPasswordView.getText().toString().trim(); String password = mPasswordView.getText().toString();
String[] emailParts = email.split("@"); String[] emailParts = email.split("@");
String user = emailParts[0].trim(); String user = emailParts[0].trim();
String domain = emailParts[1].trim(); String domain = emailParts[1].trim();

2
src/com/android/email/activity/setup/AccountSetupIncoming.java
View File

@ -348,7 +348,7 @@ public class AccountSetupIncoming extends Activity implements OnClickListener {
URI uri = new URI( URI uri = new URI(
oldUri.getScheme(), oldUri.getScheme(),
mUsernameView.getText().toString().trim() + ":" mUsernameView.getText().toString().trim() + ":"
+ mPasswordView.getText().toString().trim(), + mPasswordView.getText().toString(),
oldUri.getHost(), oldUri.getHost(),
oldUri.getPort(), oldUri.getPort(),
null, null,

4
src/com/android/email/provider/EmailContent.java
View File

@ -2266,8 +2266,8 @@ public abstract class EmailContent {
String userInfo = null; String userInfo = null;
if ((mFlags & FLAG_AUTHENTICATE) != 0) { if ((mFlags & FLAG_AUTHENTICATE) != 0) {
String trimUser = (mLogin != null) ? mLogin.trim() : ""; String trimUser = (mLogin != null) ? mLogin.trim() : "";
String trimPassword = (mPassword != null) ? mPassword.trim() : ""; String password = (mPassword != null) ? mPassword : "";
userInfo = trimUser + ":" + trimPassword; userInfo = trimUser + ":" + password;
} }
String address = (mAddress != null) ? mAddress.trim() : null; String address = (mAddress != null) ? mAddress.trim() : null;
String path = (mDomain != null) ? "/" + mDomain : null; String path = (mDomain != null) ? "/" + mDomain : null;