From 0594e1f8f8cf9e8589e2a86e116bef14100ed6ac Mon Sep 17 00:00:00 2001 From: steckbrief Date: Sat, 16 Jan 2016 19:18:29 +0100 Subject: Fixed minor class cast issue --- .../conversationsplus/xmpp/pubsub/PubSubPacketParser.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/pubsub/PubSubPacketParser.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/pubsub/PubSubPacketParser.java index a5172577..682803c4 100644 --- a/src/main/java/de/thedevstack/conversationsplus/xmpp/pubsub/PubSubPacketParser.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/pubsub/PubSubPacketParser.java @@ -7,14 +7,14 @@ import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket; * Created by tzur on 15.01.2016. */ public class PubSubPacketParser { - public static PubSubPacket findPubSubPacket(IqPacket packet){ + public static Element findPubSubPacket(IqPacket packet){ if (null == packet) { return null; } - return (PubSubPacket) packet.findChild("pubsub", "http://jabber.org/protocol/pubsub"); + return packet.findChild("pubsub", "http://jabber.org/protocol/pubsub"); } - public static Element findItems(PubSubPacket pubSubPacket) { + public static Element findItemsFromPubSubElement(Element pubSubPacket) { if (null == pubSubPacket) { return null; } @@ -22,6 +22,6 @@ public class PubSubPacketParser { } public static Element findItems(IqPacket packet) { - return PubSubPacketParser.findItems(PubSubPacketParser.findPubSubPacket(packet)); + return PubSubPacketParser.findItemsFromPubSubElement(PubSubPacketParser.findPubSubPacket(packet)); } } -- cgit v1.2.3 From 362c00d31b31690b7debebc68213851456b422dd Mon Sep 17 00:00:00 2001 From: steckbrief Date: Tue, 9 Feb 2016 21:48:09 +0100 Subject: Fixes FS#135: condition NOT message.isRead() added to check if notification should be shown for a message --- .../conversationsplus/services/NotificationService.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java b/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java index d537ff73..f3ef271c 100644 --- a/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java +++ b/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java @@ -64,12 +64,13 @@ public class NotificationService { public boolean notify(final Message message) { return (message.getStatus() == Message.STATUS_RECEIVED) - && ConversationsPlusPreferences.showNotification() - && !message.getConversation().isMuted() - && (message.getConversation().getMode() == Conversation.MODE_SINGLE - || ConversationsPlusPreferences.alwaysNotifyInConference() - || wasHighlightedOrPrivate(message) - ); + && !message.isRead() + && ConversationsPlusPreferences.showNotification() + && !message.getConversation().isMuted() + && (message.getConversation().getMode() == Conversation.MODE_SINGLE + || ConversationsPlusPreferences.alwaysNotifyInConference() + || wasHighlightedOrPrivate(message) + ); } public void notifyPebble(final Message message) { -- cgit v1.2.3