mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-1776: Display all 1-on-1 messages (#192)

Browse Source 
1-on-1 message displaying is tricky. When in a regular chat, Spark
should listen to messages sent by any resource, associated to any
of the JIDs of the peer. In context of a MUC private message however,
the filter MUST be applied to the full jid (which will be:
roomname@servicename/nickname).
This commit is contained in:
Guus der Kinderen
2016-08-15 17:05:12 +02:00
committed by wroot
parent 6cb57676ba
commit c8ed22a386
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java
View File

@ -124,6 +124,11 @@ public class ChatRoomImpl extends ChatRoom {
/**
* Constructs a 1-to-1 ChatRoom.
*
* Note that the participantJID value can be a bare JID, or a full JID. In regular one-on-one chats, a bare JID is
* expected. This instance will then display relevant data sent by any of the (full) JIDs associated to the bare JID.
* When this instance is created to reflect a private message in MUC context, a full JID is expected to be provided
* as the participantJID value (room@service/nick). In such case, only data sent from that full JID is displayed.
*
* @param participantJID the participants jid to chat with.
* @param participantNickname the nickname of the participant.
* @param title the title of the room.
@ -138,7 +143,7 @@ public class ChatRoomImpl extends ChatRoom {
loadHistory();
// Register StanzaListeners
StanzaFilter fromFilter = new FromMatchesFilter(participantJID, true);
StanzaFilter fromFilter = FromMatchesFilter.create(participantJID);
StanzaFilter orFilter = new OrFilter(new StanzaTypeFilter(Presence.class), new StanzaTypeFilter(Message.class));
StanzaFilter andFilter = new AndFilter(orFilter, fromFilter);