moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-07 10:40:11 -05:00
Code Issues Releases Wiki Activity

Group messages by account when moving to spam/archive folder

Browse Source
This commit is contained in:
cketti 2012-11-03 05:24:41 +01:00
parent 02aeccdedc
commit 46feb8b9d0
1 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/com/fsck/k9/fragment/MessageListFragment.java
View File

@ -6,9 +6,11 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.concurrent.Future; import java.util.concurrent.Future;
@ -2021,13 +2023,32 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
} }
private void onArchive(final Message[] messages) { private void onArchive(final Message[] messages) {
final String folderName = messages[0].getFolder().getAccount().getArchiveFolderName(); Map<Account, List<Message>> messagesByAccount = groupMessagesByAccount(messages);
if (K9.FOLDER_NONE.equalsIgnoreCase(folderName)) {
return; for (Entry<Account, List<Message>> entry : messagesByAccount.entrySet()) {
Account account = entry.getKey();
String archiveFolder = account.getArchiveFolderName();
if (!K9.FOLDER_NONE.equals(archiveFolder)) {
move(entry.getValue().toArray(new Message[0]), archiveFolder);
}
} }
// TODO one should separate messages by account and call move afterwards }
// (because each account might have a specific Archive folder name)
move(messages, folderName); private Map<Account, List<Message>> groupMessagesByAccount(final Message[] messages) {
Map<Account, List<Message>> messagesByAccount = new HashMap<Account, List<Message>>();
for (Message message : messages) {
Account account = message.getFolder().getAccount();
List<Message> msgList = messagesByAccount.get(account);
if (msgList == null) {
msgList = new ArrayList<Message>();
messagesByAccount.put(account, msgList);
}
msgList.add(message);
}
return messagesByAccount;
} }
private void onSpam(Message message) { private void onSpam(Message message) {
@ -2048,18 +2069,17 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
} }
} }
/**
* @param holders
* Never {@code null}.
*/
private void onSpamConfirmed(Message[] messages) { private void onSpamConfirmed(Message[] messages) {
final String folderName = messages[0].getFolder().getAccount().getSpamFolderName(); Map<Account, List<Message>> messagesByAccount = groupMessagesByAccount(messages);
if (K9.FOLDER_NONE.equalsIgnoreCase(folderName)) {
return; for (Entry<Account, List<Message>> entry : messagesByAccount.entrySet()) {
Account account = entry.getKey();
String spamFolder = account.getSpamFolderName();
if (!K9.FOLDER_NONE.equals(spamFolder)) {
move(entry.getValue().toArray(new Message[0]), spamFolder);
}
} }
// TODO one should separate messages by account and call move afterwards
// (because each account might have a specific Spam folder name)
move(messages, folderName);
} }
private static enum FolderOperation { private static enum FolderOperation {