Merge "Get rid of Account#name" into ub-mail-master
This commit is contained in:
commit
4b73ce73bf
|
@ -106,7 +106,7 @@ public class EmailPreferenceMigrator extends BasePreferenceMigrator {
|
||||||
|
|
||||||
if (ecAccountCursor == null) {
|
if (ecAccountCursor == null) {
|
||||||
LogUtils.e(LOG_TAG, "Null old account cursor for mailbox %s",
|
LogUtils.e(LOG_TAG, "Null old account cursor for mailbox %s",
|
||||||
LogUtils.sanitizeName(LOG_TAG, account.name));
|
LogUtils.sanitizeName(LOG_TAG, account.getEmailAddress()));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -115,7 +115,7 @@ public class EmailPreferenceMigrator extends BasePreferenceMigrator {
|
||||||
ecAccount.restore(ecAccountCursor);
|
ecAccount.restore(ecAccountCursor);
|
||||||
} else {
|
} else {
|
||||||
LogUtils.e(LOG_TAG, "Couldn't load old account for mailbox %s",
|
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;
|
continue;
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
@ -98,7 +98,7 @@ public class FolderPickerActivity extends Activity implements FolderPickerCallba
|
||||||
} else {
|
} else {
|
||||||
// In this case, we're coming from Settings
|
// In this case, we're coming from Settings
|
||||||
uiAccount = i.getParcelableExtra(EmailProvider.PICKER_UI_ACCOUNT);
|
uiAccount = i.getParcelableExtra(EmailProvider.PICKER_UI_ACCOUNT);
|
||||||
mAccountName = uiAccount.name;
|
mAccountName = uiAccount.getDisplayName();
|
||||||
mAccountId = Long.parseLong(uiAccount.uri.getLastPathSegment());
|
mAccountId = Long.parseLong(uiAccount.uri.getLastPathSegment());
|
||||||
mMailboxType = i.getIntExtra(EmailProvider.PICKER_MAILBOX_TYPE, -1);
|
mMailboxType = i.getIntExtra(EmailProvider.PICKER_MAILBOX_TYPE, -1);
|
||||||
headerId = i.getIntExtra(EmailProvider.PICKER_HEADER_ID, 0);
|
headerId = i.getIntExtra(EmailProvider.PICKER_HEADER_ID, 0);
|
||||||
|
|
Loading…
Reference in New Issue