moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-23 18:02:15 -05:00
Code Issues Releases Wiki Activity

Issue 192

Browse Source 
Keep deleteUid in list until confirmation that message has been
deleted from LocalStore
This commit is contained in:
Daniel Applebaum 2009-01-09 05:03:55 +00:00
parent d0a354ead0
commit a81facc6e7
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/android/email/activity/FolderMessageList.java
View File

@ -761,10 +761,22 @@ public class FolderMessageList extends ExpandableListActivity
} }
mAdapter.removeMessage(holder.message.getFolder().getName(), holder.uid); mAdapter.removeMessage(holder.message.getFolder().getName(), holder.uid);
if (holder.folder.name.equals(mAccount.getTrashFolderName()) == false) {
mAdapter.addOrUpdateMessage(mAccount.getTrashFolderName(), holder.message); mAdapter.addOrUpdateMessage(mAccount.getTrashFolderName(), holder.message);
}
MessagingController.getInstance(getApplication()).deleteMessage(mAccount, MessagingController.getInstance(getApplication()).deleteMessage(mAccount,
holder.message.getFolder().getName(), holder.message, null); holder.message.getFolder().getName(), holder.message,
new MessagingListener() {
@Override
public void messageDeleted(Account account, String folder, Message message) {
if (account != mAccount) {
return;
}
mAdapter.removeDeletedUid(folder, message.getUid());
}
}
);
} }
@ -1226,9 +1238,9 @@ public class FolderMessageList extends ExpandableListActivity
return; return;
} }
FolderInfoHolder holder = getFolder(folder); FolderInfoHolder holder = getFolder(folder);
if (holder != null) { // if (holder != null) {
holder.deletedUids.clear(); // holder.deletedUids.clear();
} // }
mHandler.progress(false); mHandler.progress(false);
mHandler.folderLoading(folder, false); mHandler.folderLoading(folder, false);
// mHandler.folderStatus(folder, null); // mHandler.folderStatus(folder, null);
@ -1257,7 +1269,7 @@ public class FolderMessageList extends ExpandableListActivity
if (holder != null) if (holder != null)
{ {
holder.lastChecked = 0; holder.lastChecked = 0;
holder.deletedUids.clear(); // holder.deletedUids.clear();
} }
mHandler.folderSyncing(null); mHandler.folderSyncing(null);
} }
@ -1365,6 +1377,14 @@ public class FolderMessageList extends ExpandableListActivity
R.drawable.ic_mms_attachment_small); R.drawable.ic_mms_attachment_small);
} }
public void removeDeletedUid(String folder, String messageUid) {
FolderInfoHolder f = getFolder(folder);
if (f != null)
{
f.deletedUids.remove(messageUid);
}
}
public void removeMessage(String folder, String messageUid) public void removeMessage(String folder, String messageUid)
{ {
FolderInfoHolder f = getFolder(folder); FolderInfoHolder f = getFolder(folder);