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

Bump jxmpp to 0.5.0-alpha4

Browse source
This commit is contained in:
Florian Schmaus 2015-05-27 19:29:51 +02:00
parent 8840236b72
commit c125a3b055
49 changed files with 208 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

2
smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java
View file

@ -65,7 +65,7 @@ public class MultipleRecipientInfo {
* @return the JID of a MUC room to which responses should be sent or <tt>null</tt> if
* no specific address was provided.
*/
// TODO should return BareJid
// TODO should return EntityBareJid
public Jid getReplyRoom() {
List<MultipleAddresses.Address> replyRoom = extension.getAddressesOfType(MultipleAddresses.Type.replyroom);
return replyRoom.isEmpty() ? null : replyRoom.get(0).getJid();

8
smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
View file

@ -28,9 +28,9 @@ import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smackx.address.packet.MultipleAddresses;
import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
import org.jxmpp.jid.BareJid;
import org.jxmpp.jid.EntityBareJid;
import org.jxmpp.jid.DomainBareJid;
import org.jxmpp.jid.FullJid;
import org.jxmpp.jid.EntityFullJid;
import org.jxmpp.jid.Jid;
import java.util.ArrayList;
@ -178,9 +178,9 @@ public class MultipleRecipientManager {
to.add(original.getFrom());
}
// Remove the sender from the TO/CC list (try with bare JID too)
FullJid from = connection.getUser();
EntityFullJid from = connection.getUser();
if (!to.remove(from) && !cc.remove(from)) {
BareJid bareJID = from.asBareJid();
EntityBareJid bareJID = from.asBareJid();
to.remove(bareJID);
cc.remove(bareJID);
}