moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-25 09:08:49 -05:00
Code Issues Releases Wiki Activity

Improve notification message list processing

Browse Source 
- If a message contained in the inbox list is deleted or read while
  there are messages in the overflow list, restore the newest message
  from the overflow list so there are always 5 messages in the inbox
  list in that case.
- Use explicit methods instead of method overriding.
This commit is contained in:
Danny Baumann 2013-01-08 09:27:28 +01:00
parent 5ac3d1d5c2
commit 84a5e34537
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/com/fsck/k9/controller/MessagingController.java
View File

@ -201,29 +201,36 @@ public class MessagingController implements Runnable {
private ConcurrentHashMap<String, String> deletedUids = new ConcurrentHashMap<String, String>();
private static class NotificationData {
int unreadBeforeNotification;
LinkedList<Message> messages; // newest one first
LinkedList<MessageReference> droppedMessages; // newest one first
private int unreadBeforeNotification;
private LinkedList<Message> messages; // newest one first
private LinkedList<MessageReference> droppedMessages; // newest one first
// There's no point in storing more than 5 messages for the notification, as a single notification
// can't display more than that anyway.
private final static int MAX_MESSAGES = 5;
@SuppressWarnings("serial")
public NotificationData(int unread) {
unreadBeforeNotification = unread;
droppedMessages = new LinkedList<MessageReference>();
messages = new LinkedList<Message>() {
@Override
public boolean add(Message m) {
while (size() >= MAX_MESSAGES) {
Message dropped = super.removeLast();
droppedMessages.add(0, dropped.makeMessageReference());
messages = new LinkedList<Message>();
}
public void addMessage(Message m) {
while (messages.size() >= MAX_MESSAGES) {
Message dropped = messages.removeLast();
droppedMessages.addFirst(dropped.makeMessageReference());
}
messages.addFirst(m);
}
public void removeMessage(Context context, Message m) {
if (messages.remove(m) && !droppedMessages.isEmpty()) {
Message message = droppedMessages.getFirst().restoreToLocalMessage(context);
if (message != null) {
messages.addLast(message);
droppedMessages.removeFirst();
}
super.add(0, m);
return true;
}
};
}
public ArrayList<MessageReference> getAllMessageRefs() {
@ -1756,7 +1763,7 @@ public class MessagingController implements Runnable {
for (Message m : data.messages) {
if (uid.equals(m.getUid()) && !shouldBeNotifiedOf) {
data.messages.remove(m);
data.removeMessage(mApplication, m);
needUpdateNotification = true;
break;
}
@ -1764,7 +1771,7 @@ public class MessagingController implements Runnable {
if (!needUpdateNotification) {
for (MessageReference dropped : data.droppedMessages) {
if (uid.equals(dropped.uid) && !shouldBeNotifiedOf) {
data.droppedMessages.remove(dropped.uid);
data.droppedMessages.remove(dropped);
needUpdateNotification = true;
break;
}
@ -4568,11 +4575,11 @@ public class MessagingController implements Runnable {
private Message findNewestMessageForNotificationLocked(Context context,
Account account, NotificationData data) {
if (!data.messages.isEmpty()) {
return data.messages.get(0);
return data.messages.getFirst();
}
if (!data.droppedMessages.isEmpty()) {
return data.droppedMessages.get(0).restoreToLocalMessage(context);
return data.droppedMessages.getFirst().restoreToLocalMessage(context);
}
return null;
@ -4601,7 +4608,7 @@ public class MessagingController implements Runnable {
return;
}
} else {
data.messages.add(message);
data.addMessage(message);
}
final KeyguardManager keyguardService = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);