From 33495135ac6f93c891dca897c1cd4d702d375d1b Mon Sep 17 00:00:00 2001 From: Daniel Applebaum Date: Mon, 4 Jan 2010 00:41:26 +0000 Subject: [PATCH] Respect account ring setting for notifications --- src/com/fsck/k9/MessagingController.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/com/fsck/k9/MessagingController.java b/src/com/fsck/k9/MessagingController.java index b8935a69f..a1226ac47 100644 --- a/src/com/fsck/k9/MessagingController.java +++ b/src/com/fsck/k9/MessagingController.java @@ -3206,7 +3206,7 @@ public class MessagingController implements Runnable }; - put("getAccountUnread:" + account.getDescription(), l, unreadRunnable); + put("getAccountUnreadCount:" + account.getDescription(), l, unreadRunnable); } public void getFolderUnreadMessageCount(final Account account, final String folderName, @@ -3484,7 +3484,11 @@ public class MessagingController implements Runnable for (MessagingListener l : getListeners()) { - l.folderStatusChanged(account, account.getTrashFolderName(), localFolder.getUnreadMessageCount()); + l.folderStatusChanged(account, folder, localFolder.getUnreadMessageCount()); + if (localTrashFolder != null) + { + l.folderStatusChanged(account, account.getTrashFolderName(), localTrashFolder.getUnreadMessageCount()); + } } if (K9.DEBUG) @@ -4028,8 +4032,8 @@ public class MessagingController implements Runnable notif.setLatestEventInfo(context, context.getString(R.string.notification_new_title), notice, pi); String ringtone = thisAccount.getRingtone(); - notif.sound = TextUtils.isEmpty(ringtone) ? null : Uri.parse(ringtone); - + notif.sound = TextUtils.isEmpty(ringtone) || thisAccount.isRing() == false ? null : Uri.parse(ringtone); + if (thisAccount.isVibrate()) { notif.defaults |= Notification.DEFAULT_VIBRATE;