vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-12-14 15:01:07 +01:00
Code Issues Releases Wiki Activity

Use jxmpp-core (0.1.0-alpha1-SNAPSHOT)

Browse source 
fixes also SMACK-570, since jxmpp-core's XmppStringUtil contains the fix
for SMACK-570.
This commit is contained in:
Florian Schmaus 2014-06-01 12:23:13 +02:00
parent 8977f5b3f0
commit f67d655fe7
34 changed files with 84 additions and 896 deletions
Download patch file Download diff file Expand all files Collapse all files

4
smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java
View file

@ -20,7 +20,7 @@ package org.jivesoftware.smackx.muc;
import org.jivesoftware.smackx.muc.packet.MUCAdmin;
import org.jivesoftware.smackx.muc.packet.MUCUser;
import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smack.util.StringUtils;
import org.jxmpp.util.XmppStringUtils;
/**
* Represents the information about an occupant in a given room. The information will always have
@ -53,7 +53,7 @@ public class Occupant {
this.affiliation = item.getAffiliation();
this.role = item.getRole();
// Get the nickname from the FROM attribute of the presence
this.nick = StringUtils.parseResource(presence.getFrom());
this.nick = XmppStringUtils.parseResource(presence.getFrom());
}
/**

6
smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomListenerMultiplexor.java
View file

@ -23,7 +23,7 @@ import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.util.StringUtils;
import org.jxmpp.util.XmppStringUtils;
import java.lang.ref.WeakReference;
import java.util.Locale;
@ -151,7 +151,7 @@ class RoomListenerMultiplexor extends AbstractConnectionListener {
if (from == null) {
return false;
}
return roomAddressTable.containsKey(StringUtils.parseBareAddress(from).toLowerCase(Locale.US));
return roomAddressTable.containsKey(XmppStringUtils.parseBareAddress(from).toLowerCase(Locale.US));
}
public void addRoom(String address) {
@ -192,7 +192,7 @@ class RoomListenerMultiplexor extends AbstractConnectionListener {
}
PacketMultiplexListener listener =
roomListenersByAddress.get(StringUtils.parseBareAddress(from).toLowerCase(Locale.US));
roomListenersByAddress.get(XmppStringUtils.parseBareAddress(from).toLowerCase(Locale.US));
if (listener != null) {
listener.processPacket(p);