vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-22 20:12:07 +01:00
Code Issues Releases Wiki Activity

Bump jxmpp to 0.5.0-alpha6

Browse source
This commit is contained in:
Florian Schmaus 2015-06-16 10:08:18 +02:00
parent c9eb6323c0
commit 0cbbedd2f4
3 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
smack-im/src/main/java/org/jivesoftware/smack/roster/provider/RosterPacketProvider.java
View file

@ -24,7 +24,6 @@ import org.jivesoftware.smack.roster.packet.RosterPacket;
import org.jivesoftware.smack.util.ParserUtils; import org.jivesoftware.smack.util.ParserUtils;
import org.jxmpp.jid.BareJid; import org.jxmpp.jid.BareJid;
import org.jxmpp.jid.impl.JidCreate; import org.jxmpp.jid.impl.JidCreate;
import org.jxmpp.util.XmppStringUtils;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
@ -51,16 +50,7 @@ public class RosterPacketProvider extends IQProvider<RosterPacket> {
String jidString = parser.getAttributeValue("", "jid"); String jidString = parser.getAttributeValue("", "jid");
String name = parser.getAttributeValue("", "name"); String name = parser.getAttributeValue("", "name");
// workaround for bug in jxmpp 0.5.0-alpha5, where BareJid jid = JidCreate.bareFrom(jidString);
// 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);
}
// Create packet. // Create packet.
item = new RosterPacket.Item(jid, name); item = new RosterPacket.Item(jid, name);

12
smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStore.java
View file

@ -34,7 +34,6 @@ import org.jivesoftware.smack.util.stringencoder.Base32;
import org.jxmpp.jid.BareJid; import org.jxmpp.jid.BareJid;
import org.jxmpp.jid.Jid; import org.jxmpp.jid.Jid;
import org.jxmpp.jid.impl.JidCreate; import org.jxmpp.jid.impl.JidCreate;
import org.jxmpp.util.XmppStringUtils;
import org.xmlpull.v1.XmlPullParserFactory; import org.xmlpull.v1.XmlPullParserFactory;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
@ -211,16 +210,7 @@ public final class DirectoryRosterStore implements RosterStore {
parser.next(); parser.next();
String jidString = parser.getText(); String jidString = parser.getText();
// workaround for bug in jxmpp 0.5.0-alpha5, where user = JidCreate.bareFrom(jidString);
// 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);
}
} }
else if (parserName.equals("name")) { else if (parserName.equals("name")) {
parser.next(); parser.next();

2
version.gradle
View file

@ -2,7 +2,7 @@ allprojects {
ext { ext {
shortVersion = '4.2.0-alpha2' shortVersion = '4.2.0-alpha2'
isSnapshot = true isSnapshot = true
jxmppVersion = '0.5.0-alpha5' jxmppVersion = '0.5.0-alpha6'
smackMinAndroidSdk = 8 smackMinAndroidSdk = 8
} }
} }