mirror of
https://github.com/moparisthebest/k-9
synced 2024-11-30 13:12:25 -05:00
Respect account ring setting for notifications
This commit is contained in:
parent
41729af9b2
commit
33495135ac
@ -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,7 +4032,7 @@ 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())
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user