aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs
diff options
context:
space:
mode:
authorGayaz Yusipov <gzep@vingrad.ru>2014-08-30 14:26:46 +0400
committerGayaz Yusipov <gzep@vingrad.ru>2014-08-30 14:26:46 +0400
commitec6220969d362195630c17ec472bcb225838e9ae (patch)
tree7ca755e61c2f6adbec0a76007db701354cc0e0b1 /src/eu/siacs
parent85b31b8d8b5c553d0126fcc7938abd096433f035 (diff)
XEP-0172
Diffstat (limited to 'src/eu/siacs')
-rw-r--r--src/eu/siacs/conversations/parser/PresenceParser.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/parser/PresenceParser.java b/src/eu/siacs/conversations/parser/PresenceParser.java
index ea19df6f..5e5501dd 100644
--- a/src/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/eu/siacs/conversations/parser/PresenceParser.java
@@ -49,7 +49,7 @@ public class PresenceParser extends AbstractParser implements
if (packet.getFrom() == null) {
return;
}
- String[] fromParts = packet.getFrom().split("/");
+ String[] fromParts = packet.getFrom().split("/", 2);
String type = packet.getAttribute("type");
if (fromParts[0].equals(account.getJid())) {
if (fromParts.length == 2) {
@@ -60,7 +60,6 @@ public class PresenceParser extends AbstractParser implements
account.removePresence(fromParts[1]);
}
}
-
} else {
Contact contact = account.getRoster().getContact(packet.getFrom());
if (type == null) {
@@ -108,6 +107,10 @@ public class PresenceParser extends AbstractParser implements
contact.setOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST);
}
}
+ Element nick = packet.findChild("nick", "http://jabber.org/protocol/nick");
+ if (nick != null) {
+ contact.setSystemName(nick.getContent());
+ }
}
mXmppConnectionService.updateRosterUi();
}