Fix message overflow.

This commit is contained in:
Danny Baumann 2013-01-05 13:59:16 +01:00
parent 6f7ec3e401
commit d9cc0446b6
1 changed files with 5 additions and 5 deletions

View File

@ -217,7 +217,7 @@ public class MessagingController implements Runnable {
@Override @Override
public boolean add(Message m) { public boolean add(Message m) {
while (size() >= MAX_MESSAGES) { while (size() >= MAX_MESSAGES) {
Message dropped = super.remove(); Message dropped = super.removeLast();
droppedMessages.add(0, dropped.makeMessageReference()); droppedMessages.add(0, dropped.makeMessageReference());
} }
super.add(0, m); super.add(0, m);
@ -4611,7 +4611,7 @@ public class MessagingController implements Runnable {
keyguardService.inKeyguardRestrictedInputMode()) || keyguardService.inKeyguardRestrictedInputMode()) ||
(K9.getNotificationHideSubject() == NotificationHideSubject.ALWAYS) || (K9.getNotificationHideSubject() == NotificationHideSubject.ALWAYS) ||
summary.length() == 0) { summary.length() == 0) {
summary = new StringBuilder(context.getString(R.string.notification_new_title)); summary = context.getString(R.string.notification_new_title);
} }
NotificationManager notifMgr = NotificationManager notifMgr =
@ -4645,10 +4645,10 @@ public class MessagingController implements Runnable {
getMessageSubject(context, m))); getMessageSubject(context, m)));
} }
if (!data.droppedMessages.isEmpty()) { if (!data.droppedMessages.isEmpty()) {
style.setSummaryText(context.getString( style.setSummaryText(context.getString(R.string.notification_additional_messages,
R.string.notification_additional_messages, data.droppedMessages.size())); data.droppedMessages.size(), accountDescr));
} }
String title = context.getString(R.string.notification_new_messages_title, newMessages, accountDescr); String title = context.getString(R.string.notification_new_messages_title, newMessages);
style.setBigContentTitle(title); style.setBigContentTitle(title);
builder.setContentTitle(title); builder.setContentTitle(title);
builder.setSubText(accountDescr); builder.setSubText(accountDescr);