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

Merge change 26913 into eclair

Browse Source 
* changes:
  Don't drop local mailboxes if we created them.
This commit is contained in:
Android (Google) Code Review 2009-09-25 13:15:00 -04:00
commit 0d6e69ce8a
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/email/MessagingController.java
View File

@ -227,20 +227,23 @@ public class MessagingController implements Runnable {
private static final int COLUMN_ID = 0; private static final int COLUMN_ID = 0;
private static final int COLUMN_DISPLAY_NAME = 1; private static final int COLUMN_DISPLAY_NAME = 1;
private static final int COLUMN_ACCOUNT_KEY = 2; private static final int COLUMN_ACCOUNT_KEY = 2;
private static final int COLUMN_TYPE = 3;
private static final String[] PROJECTION = new String[] { private static final String[] PROJECTION = new String[] {
EmailContent.RECORD_ID, EmailContent.RECORD_ID,
MailboxColumns.DISPLAY_NAME, MailboxColumns.ACCOUNT_KEY, MailboxColumns.DISPLAY_NAME, MailboxColumns.ACCOUNT_KEY, MailboxColumns.TYPE,
}; };
long mId; long mId;
String mDisplayName; String mDisplayName;
long mAccountKey; long mAccountKey;
int mType;
public LocalMailboxInfo(Cursor c) { public LocalMailboxInfo(Cursor c) {
mId = c.getLong(COLUMN_ID); mId = c.getLong(COLUMN_ID);
mDisplayName = c.getString(COLUMN_DISPLAY_NAME); mDisplayName = c.getString(COLUMN_DISPLAY_NAME);
mAccountKey = c.getLong(COLUMN_ACCOUNT_KEY); mAccountKey = c.getLong(COLUMN_ACCOUNT_KEY);
mType = c.getInt(COLUMN_TYPE);
} }
} }
@ -304,12 +307,24 @@ public class MessagingController implements Runnable {
// Drops first, to make things smaller rather than larger // Drops first, to make things smaller rather than larger
HashSet<String> localsToDrop = new HashSet<String>(localFolderNames); HashSet<String> localsToDrop = new HashSet<String>(localFolderNames);
localsToDrop.removeAll(remoteFolderNames); localsToDrop.removeAll(remoteFolderNames);
// TODO drop all attachment files too
for (String localNameToDrop : localsToDrop) { for (String localNameToDrop : localsToDrop) {
LocalMailboxInfo localInfo = localFolders.get(localNameToDrop); LocalMailboxInfo localInfo = localFolders.get(localNameToDrop);
Uri uri = ContentUris.withAppendedId( // Exclusion list - never delete local special folders, irrespective
EmailContent.Mailbox.CONTENT_URI, localInfo.mId); // of server-side existence.
mContext.getContentResolver().delete(uri, null, null); switch (localInfo.mType) {
case Mailbox.TYPE_INBOX:
case Mailbox.TYPE_DRAFTS:
case Mailbox.TYPE_OUTBOX:
case Mailbox.TYPE_SENT:
case Mailbox.TYPE_TRASH:
break;
default:
// TODO drop all attachment files too
Uri uri = ContentUris.withAppendedId(
EmailContent.Mailbox.CONTENT_URI, localInfo.mId);
mContext.getContentResolver().delete(uri, null, null);
break;
}
} }
// Now do the adds // Now do the adds