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

Merge "Get rid of Account#name" into ub-mail-master

This commit is contained in:
Tony Mantler 2014-03-03 21:08:31 +00:00 committed by Android (Google) Code Review
parent e6b1575a45 531b363059
commit 4b73ce73bf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/email/preferences/EmailPreferenceMigrator.java
View File

@ -106,7 +106,7 @@ public class EmailPreferenceMigrator extends BasePreferenceMigrator {
if (ecAccountCursor == null) {
LogUtils.e(LOG_TAG, "Null old account cursor for mailbox %s",
LogUtils.sanitizeName(LOG_TAG, account.name));
LogUtils.sanitizeName(LOG_TAG, account.getEmailAddress()));
continue;
}
@ -115,7 +115,7 @@ public class EmailPreferenceMigrator extends BasePreferenceMigrator {
ecAccount.restore(ecAccountCursor);
} else {
LogUtils.e(LOG_TAG, "Couldn't load old account for mailbox %s",
LogUtils.sanitizeName(LOG_TAG, account.name));
LogUtils.sanitizeName(LOG_TAG, account.getEmailAddress()));
continue;
}
} finally {

2
src/com/android/email/provider/FolderPickerActivity.java
View File

@ -98,7 +98,7 @@ public class FolderPickerActivity extends Activity implements FolderPickerCallba
} else {
// In this case, we're coming from Settings
uiAccount = i.getParcelableExtra(EmailProvider.PICKER_UI_ACCOUNT);
mAccountName = uiAccount.name;
mAccountName = uiAccount.getDisplayName();
mAccountId = Long.parseLong(uiAccount.uri.getLastPathSegment());
mMailboxType = i.getIntExtra(EmailProvider.PICKER_MAILBOX_TYPE, -1);
headerId = i.getIntExtra(EmailProvider.PICKER_HEADER_ID, 0);