mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-12-24 03:27:59 +01:00
Bump jxmpp to 0.5.0-alpha6
This commit is contained in:
parent
c9eb6323c0
commit
0cbbedd2f4
3 changed files with 3 additions and 23 deletions
|
@ -24,7 +24,6 @@ import org.jivesoftware.smack.roster.packet.RosterPacket;
|
|||
import org.jivesoftware.smack.util.ParserUtils;
|
||||
import org.jxmpp.jid.BareJid;
|
||||
import org.jxmpp.jid.impl.JidCreate;
|
||||
import org.jxmpp.util.XmppStringUtils;
|
||||
import org.xmlpull.v1.XmlPullParser;
|
||||
import org.xmlpull.v1.XmlPullParserException;
|
||||
|
||||
|
@ -51,16 +50,7 @@ public class RosterPacketProvider extends IQProvider<RosterPacket> {
|
|||
String jidString = parser.getAttributeValue("", "jid");
|
||||
String name = parser.getAttributeValue("", "name");
|
||||
|
||||
// workaround for bug in jxmpp 0.5.0-alpha5, where
|
||||
// JidCreate.bareFrom(String), which we would want to use
|
||||
// here, does not produce correct results
|
||||
String localpart = XmppStringUtils.parseLocalpart(jidString);
|
||||
BareJid jid;
|
||||
if (localpart.length() != 0) {
|
||||
jid = JidCreate.entityBareFrom(jidString);
|
||||
} else {
|
||||
jid = JidCreate.domainBareFrom(jidString);
|
||||
}
|
||||
BareJid jid = JidCreate.bareFrom(jidString);
|
||||
|
||||
// Create packet.
|
||||
item = new RosterPacket.Item(jid, name);
|
||||
|
|
|
@ -34,7 +34,6 @@ import org.jivesoftware.smack.util.stringencoder.Base32;
|
|||
import org.jxmpp.jid.BareJid;
|
||||
import org.jxmpp.jid.Jid;
|
||||
import org.jxmpp.jid.impl.JidCreate;
|
||||
import org.jxmpp.util.XmppStringUtils;
|
||||
import org.xmlpull.v1.XmlPullParserFactory;
|
||||
import org.xmlpull.v1.XmlPullParser;
|
||||
import org.xmlpull.v1.XmlPullParserException;
|
||||
|
@ -211,16 +210,7 @@ public final class DirectoryRosterStore implements RosterStore {
|
|||
parser.next();
|
||||
|
||||
String jidString = parser.getText();
|
||||
// workaround for bug in jxmpp 0.5.0-alpha5, where
|
||||
// JidCreate.bareFrom(String), which we would want to
|
||||
// use here, does not produce correct results
|
||||
String localpart = XmppStringUtils.parseLocalpart(jidString);
|
||||
if (localpart.length() != 0) {
|
||||
user = JidCreate.entityBareFrom(jidString);
|
||||
}
|
||||
else {
|
||||
user = JidCreate.domainBareFrom(jidString);
|
||||
}
|
||||
user = JidCreate.bareFrom(jidString);
|
||||
}
|
||||
else if (parserName.equals("name")) {
|
||||
parser.next();
|
||||
|
|
|
@ -2,7 +2,7 @@ allprojects {
|
|||
ext {
|
||||
shortVersion = '4.2.0-alpha2'
|
||||
isSnapshot = true
|
||||
jxmppVersion = '0.5.0-alpha5'
|
||||
jxmppVersion = '0.5.0-alpha6'
|
||||
smackMinAndroidSdk = 8
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue