Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-12-12 08:01:08 +01:00
Code Issues Releases Wiki Activity

Use Jid (and subclasses) from jxmpp-jid

Browse source 
Fixes SMACK-634
This commit is contained in:
Florian Schmaus 2015-02-14 17:15:02 +01:00
parent 0ee2d9ed1e
commit 5bb4727c57
180 changed files with 1510 additions and 1032 deletions
Download patch file Download diff file Expand all files Collapse all files

7
smack-im/src/main/java/org/jivesoftware/smack/chat/Chat.java
View file

@ -21,6 +21,7 @@ import org.jivesoftware.smack.PacketCollector;
import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.util.StringUtils;
import org.jxmpp.jid.JidWithLocalpart;
import java.util.Set;
import java.util.Collections;
@ -40,7 +41,7 @@ public class Chat {
private ChatManager chatManager;
private String threadID;
private String participant;
private JidWithLocalpart participant;
private final Set<ChatMessageListener> listeners = new CopyOnWriteArraySet<ChatMessageListener>();
/**
@ -50,7 +51,7 @@ public class Chat {
* @param participant the user to chat with.
* @param threadID the thread ID to use.
*/
Chat(ChatManager chatManager, String participant, String threadID) {
Chat(ChatManager chatManager, JidWithLocalpart participant, String threadID) {
if (StringUtils.isEmpty(threadID)) {
throw new IllegalArgumentException("Thread ID must not be null");
}
@ -75,7 +76,7 @@ public class Chat {
*
* @return the name of the user the chat is occuring with.
*/
public String getParticipant() {
public JidWithLocalpart getParticipant() {
return participant;
}

38
smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
View file

@ -24,6 +24,7 @@ import java.util.UUID;
import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.logging.Logger;
import org.jivesoftware.smack.Manager;
import org.jivesoftware.smack.MessageListener;
@ -41,7 +42,9 @@ import org.jivesoftware.smack.filter.ThreadFilter;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Message.Type;
import org.jivesoftware.smack.packet.Stanza;
import org.jxmpp.util.XmppStringUtils;
import org.jxmpp.jid.BareJid;
import org.jxmpp.jid.Jid;
import org.jxmpp.jid.JidWithLocalpart;
/**
* The chat manager keeps track of references to all current chats. It will not hold any references
@ -51,6 +54,9 @@ import org.jxmpp.util.XmppStringUtils;
* @author Alexander Wenckus
*/
public class ChatManager extends Manager{
private static final Logger LOGGER = Logger.getLogger(ChatManager.class.getName());
private static final Map<XMPPConnection, ChatManager> INSTANCES = new WeakHashMap<XMPPConnection, ChatManager>();
/**
@ -124,12 +130,12 @@ public class ChatManager extends Manager{
/**
* Maps jids to chats
*/
private Map<String, Chat> jidChats = new ConcurrentHashMap<>();
private Map<Jid, Chat> jidChats = new ConcurrentHashMap<>();
/**
* Maps base jids to chats
*/
private Map<String, Chat> baseJidChats = new ConcurrentHashMap<>();
private Map<BareJid, Chat> baseJidChats = new ConcurrentHashMap<>();
private Set<ChatManagerListener> chatManagerListeners
= new CopyOnWriteArraySet<ChatManagerListener>();
@ -209,7 +215,7 @@ public class ChatManager extends Manager{
* @param userJID the user this chat is with.
* @return the created chat.
*/
public Chat createChat(String userJID) {
public Chat createChat(JidWithLocalpart userJID) {
return createChat(userJID, null);
}
@ -220,7 +226,7 @@ public class ChatManager extends Manager{
* @param listener the optional listener which will listen for new messages from this chat.
* @return the created chat.
*/
public Chat createChat(String userJID, ChatMessageListener listener) {
public Chat createChat(JidWithLocalpart userJID, ChatMessageListener listener) {
return createChat(userJID, null, listener);
}
@ -232,7 +238,7 @@ public class ChatManager extends Manager{
* @param listener the optional listener to add to the chat
* @return the created chat.
*/
public Chat createChat(String userJID, String thread, ChatMessageListener listener) {
public Chat createChat(JidWithLocalpart userJID, String thread, ChatMessageListener listener) {
if (thread == null) {
thread = nextID();
}
@ -245,11 +251,11 @@ public class ChatManager extends Manager{
return chat;
}
private Chat createChat(String userJID, String threadID, boolean createdLocally) {
private Chat createChat(JidWithLocalpart userJID, String threadID, boolean createdLocally) {
Chat chat = new Chat(this, userJID, threadID);
threadChats.put(threadID, chat);
jidChats.put(userJID, chat);
baseJidChats.put(XmppStringUtils.parseBareJid(userJID), chat);
baseJidChats.put(userJID.asBareJid(), chat);
for(ChatManagerListener listener : chatManagerListeners) {
listener.chatCreated(chat, createdLocally);
@ -260,9 +266,9 @@ public class ChatManager extends Manager{
void closeChat(Chat chat) {
threadChats.remove(chat.getThreadID());
String userJID = chat.getParticipant();
JidWithLocalpart userJID = chat.getParticipant();
jidChats.remove(userJID);
baseJidChats.remove(XmppStringUtils.parseBareJid(userJID));
baseJidChats.remove(userJID.withoutResource());
}
/**
@ -273,10 +279,16 @@ public class ChatManager extends Manager{
* @return a Chat or null if none can be created
*/
private Chat createChat(Message message) {
String userJID = message.getFrom();
Jid from = message.getFrom();
// According to RFC6120 8.1.2.1 4. messages without a 'from' attribute are valid, but they
// are of no use in this case for ChatManager
if (from == null) {
return null;
}
JidWithLocalpart userJID = from.asJidWithLocalpartIfPossible();
if (userJID == null) {
LOGGER.warning("Message from JID without localpart: '" +message.toXML() + "'");
return null;
}
String threadID = message.getThread();
@ -296,7 +308,7 @@ public class ChatManager extends Manager{
* @param userJID jid in the from field of message.
* @return Matching chat, or null if no match found.
*/
private Chat getUserChat(String userJID) {
private Chat getUserChat(Jid userJID) {
if (matchMode == MatchMode.NONE) {
return null;
}
@ -308,7 +320,7 @@ public class ChatManager extends Manager{
Chat match = jidChats.get(userJID);
if (match == null && (matchMode == MatchMode.BARE_JID)) {
match = baseJidChats.get(XmppStringUtils.parseBareJid(userJID));
match = baseJidChats.get(userJID.asBareJidIfPossible());
}
return match;
}