From 531b3630592c1d830c1c64ca3c2579020d771c2f Mon Sep 17 00:00:00 2001 From: Tony Mantler Date: Fri, 28 Feb 2014 16:44:39 -0800 Subject: [PATCH] Get rid of Account#name b/13249115 Change-Id: I810237961f429e1f082925c0c6423ca808d4c8f0 --- .../android/email/preferences/EmailPreferenceMigrator.java | 4 ++-- src/com/android/email/provider/FolderPickerActivity.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/email/preferences/EmailPreferenceMigrator.java b/src/com/android/email/preferences/EmailPreferenceMigrator.java index b8e54f52c..034a6fa02 100644 --- a/src/com/android/email/preferences/EmailPreferenceMigrator.java +++ b/src/com/android/email/preferences/EmailPreferenceMigrator.java @@ -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 { diff --git a/src/com/android/email/provider/FolderPickerActivity.java b/src/com/android/email/provider/FolderPickerActivity.java index 2ec625be6..8e0598b24 100644 --- a/src/com/android/email/provider/FolderPickerActivity.java +++ b/src/com/android/email/provider/FolderPickerActivity.java @@ -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);