moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-12-25 08:58:55 -05:00
Code Issues Releases Wiki Activity

notify on incomming received carbon messages

Browse Source
This commit is contained in:
Daniel Gultsch 2014-04-04 17:58:53 +02:00
parent b9243033df
commit 34bd79ac04
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -136,10 +136,12 @@ public class XmppConnectionService extends Service {
|| (packet.hasChild("sent"))) { || (packet.hasChild("sent"))) {
message = MessageParser.parseCarbonMessage(packet, account, message = MessageParser.parseCarbonMessage(packet, account,
service); service);
if (message != null) { if ((message != null)&&(message.getStatus() == Message.STATUS_SEND)) {
message.getConversation().markRead(); message.getConversation().markRead();
notify = false;
} else {
notify = true;
} }
notify = false;
} }
} else if (packet.getType() == MessagePacket.TYPE_GROUPCHAT) { } else if (packet.getType() == MessagePacket.TYPE_GROUPCHAT) {

10
src/eu/siacs/conversations/utils/UIHelper.java
View File

@ -191,8 +191,14 @@ public class UIHelper {
List<Conversation> unread = new ArrayList<Conversation>(); List<Conversation> unread = new ArrayList<Conversation>();
for (Conversation conversation : conversations) { for (Conversation conversation : conversations) {
if ((!conversation.isRead())&&((wasHighlighted(conversation)||(alwaysNotify)))) { if (conversation.getMode() == Conversation.MODE_MULTI) {
unread.add(conversation); if ((!conversation.isRead())&&((wasHighlighted(conversation)||(alwaysNotify)))) {
unread.add(conversation);
}
} else {
if (!conversation.isRead()) {
unread.add(conversation);
}
} }
} }
String ringtone = preferences.getString("notification_ringtone", null); String ringtone = preferences.getString("notification_ringtone", null);