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

Set acct sync status to "initial sync needed" until inbox exists

Browse Source 
* Notify on account when mailboxes are added

Change-Id: I8b78c37b5305a28a261a82308bb5bf88c0728fdc
This commit is contained in:
Marc Blank 2012-04-10 09:52:59 -07:00
parent ea181b0bce
commit 157a9bd57d
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1027,6 +1027,11 @@ public class EmailProvider extends ContentProvider {
break; break;
} }
} }
// Notify the account when a new mailbox is added
Long accountId = values.getAsLong(MailboxColumns.ACCOUNT_KEY);
if (accountId != null && accountId.longValue() > 0) {
notifyUI(UIPROVIDER_ACCOUNT_NOTIFIER, id);
}
//$FALL-THROUGH$ //$FALL-THROUGH$
case ACCOUNT: case ACCOUNT:
case HOSTAUTH: case HOSTAUTH:
@ -2486,13 +2491,6 @@ outer:
getExternalUriStringEmail2("compose", id)); getExternalUriStringEmail2("compose", id));
values.put(UIProvider.AccountColumns.MIME_TYPE, EMAIL_APP_MIME_TYPE); values.put(UIProvider.AccountColumns.MIME_TYPE, EMAIL_APP_MIME_TYPE);
// Put the settings columns values
long mailboxId = Mailbox.findMailboxOfType(getContext(), accountId, Mailbox.TYPE_INBOX);
if (mailboxId != Mailbox.NO_MAILBOX) {
values.put(UIProvider.AccountColumns.SettingsColumns.DEFAULT_INBOX,
uiUriString("uifolder", mailboxId));
}
Preferences prefs = Preferences.getPreferences(getContext()); Preferences prefs = Preferences.getPreferences(getContext());
values.put(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE, values.put(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE,
prefs.getConfirmDelete() ? "1" : "0"); prefs.getConfirmDelete() ? "1" : "0");
@ -2506,6 +2504,15 @@ outer:
int textZoom = prefs.getTextZoom(); int textZoom = prefs.getTextZoom();
values.put(UIProvider.AccountColumns.SettingsColumns.MESSAGE_TEXT_SIZE, values.put(UIProvider.AccountColumns.SettingsColumns.MESSAGE_TEXT_SIZE,
textZoomToUiValue(textZoom)); textZoomToUiValue(textZoom));
// Set default inbox, if we've got an inbox; otherwise, say initial sync needed
long mailboxId = Mailbox.findMailboxOfType(getContext(), accountId, Mailbox.TYPE_INBOX);
if (mailboxId != Mailbox.NO_MAILBOX) {
values.put(UIProvider.AccountColumns.SettingsColumns.DEFAULT_INBOX,
uiUriString("uifolder", mailboxId));
} else {
values.put(UIProvider.AccountColumns.SYNC_STATUS,
UIProvider.SyncStatus.INITIAL_SYNC_NEEDED);
}
StringBuilder sb = genSelect(sAccountListMap, uiProjection, values); StringBuilder sb = genSelect(sAccountListMap, uiProjection, values);
sb.append(" FROM " + Account.TABLE_NAME + " WHERE " + AccountColumns.ID + "=?"); sb.append(" FROM " + Account.TABLE_NAME + " WHERE " + AccountColumns.ID + "=?");