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

Prevent NPE in account/folder query when they no longer exist 

Change-Id: I65d72bae84d26142ba37b365effe1d9655de1e2c
This commit is contained in:
Marc Blank 2012-04-23 08:42:41 -07:00
parent 7072612991
commit 264d514075
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
email2/src/com/android/email/provider/EmailProvider.java
View File

@ -2412,18 +2412,19 @@ outer:
String protocol = "eas";
if (mailbox != null) {
protocol = Account.getProtocol(context, mailbox.mAccountKey);
}
// "load more" is valid for IMAP/POP3
if (HostAuth.SCHEME_IMAP.equals(protocol) || HostAuth.SCHEME_POP3.equals(protocol)) {
values.put(UIProvider.FolderColumns.LOAD_MORE_URI,
uiUriString("uiloadmore", mailboxId));
} else {
// For EAS, allow settings
int caps = UIProvider.FolderCapabilities.SUPPORTS_SETTINGS;
if ((mailbox.mFlags & Mailbox.FLAG_ACCEPTS_MOVED_MAIL) != 0) {
caps |= UIProvider.FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES;
// "load more" is valid for IMAP/POP3
if (HostAuth.SCHEME_IMAP.equals(protocol) ||
HostAuth.SCHEME_POP3.equals(protocol)) {
values.put(UIProvider.FolderColumns.LOAD_MORE_URI,
uiUriString("uiloadmore", mailboxId));
} else {
// For EAS, allow settings
int caps = UIProvider.FolderCapabilities.SUPPORTS_SETTINGS;
if ((mailbox.mFlags & Mailbox.FLAG_ACCEPTS_MOVED_MAIL) != 0) {
caps |= UIProvider.FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES;
}
values.put(UIProvider.FolderColumns.CAPABILITIES, caps);
}
values.put(UIProvider.FolderColumns.CAPABILITIES, caps);
}
}
StringBuilder sb = genSelect(sFolderListMap, uiProjection, values);
@ -2484,19 +2485,21 @@ outer:
values.put(UIProvider.AccountColumns.CAPABILITIES, POP3_CAPABILITIES);
} else {
Account account = Account.restoreAccountWithId(getContext(), accountId);
String easVersion = account.mProtocolVersion;
Double easVersionDouble = 2.5D;
if (easVersion != null) {
try {
easVersionDouble = Double.parseDouble(easVersion);
} catch (NumberFormatException e) {
// Stick with 2.5
if (account != null) {
String easVersion = account.mProtocolVersion;
Double easVersionDouble = 2.5D;
if (easVersion != null) {
try {
easVersionDouble = Double.parseDouble(easVersion);
} catch (NumberFormatException e) {
// Stick with 2.5
}
}
if (easVersionDouble >= 12.0D) {
values.put(UIProvider.AccountColumns.CAPABILITIES, EAS_12_CAPABILITIES);
} else {
values.put(UIProvider.AccountColumns.CAPABILITIES, EAS_2_CAPABILITIES);
}
}
if (easVersionDouble >= 12.0D) {
values.put(UIProvider.AccountColumns.CAPABILITIES, EAS_12_CAPABILITIES);
} else {
values.put(UIProvider.AccountColumns.CAPABILITIES, EAS_2_CAPABILITIES);
}
}
values.put(UIProvider.AccountColumns.SETTINGS_INTENT_URI,