moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-08-13 17:03:48 -04:00
Code Issues Releases Wiki Activity

Respect account ring setting for notifications

Browse Source
This commit is contained in:
Daniel Applebaum 2010-01-04 00:41:26 +00:00
parent 41729af9b2
commit 33495135ac
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/fsck/k9/MessagingController.java
View File

@ -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, public void getFolderUnreadMessageCount(final Account account, final String folderName,
@ -3484,7 +3484,11 @@ public class MessagingController implements Runnable
for (MessagingListener l : getListeners()) 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) if (K9.DEBUG)
@ -4028,8 +4032,8 @@ public class MessagingController implements Runnable
notif.setLatestEventInfo(context, context.getString(R.string.notification_new_title), notice, pi); notif.setLatestEventInfo(context, context.getString(R.string.notification_new_title), notice, pi);
String ringtone = thisAccount.getRingtone(); 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()) if (thisAccount.isVibrate())
{ {
notif.defaults |= Notification.DEFAULT_VIBRATE; notif.defaults |= Notification.DEFAULT_VIBRATE;