diff options
author | Sam Whited <sam@samwhited.com> | 2014-11-09 10:57:22 -0500 |
---|---|---|
committer | Sam Whited <sam@samwhited.com> | 2014-11-09 10:57:22 -0500 |
commit | 180a0e44084752431d702677d68d06ae82524d33 (patch) | |
tree | f124833d9df3b62d4cfff2c9cd3eeb2f3de140a6 /src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java | |
parent | 377bd49ee807b9a06089ad5612ca15b9b00f2e36 (diff) |
Rework `Account.getJid()' to return full JIDs
Remove `Account.getFullJid()'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java index 6036c802..e3642f6b 100644 --- a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java @@ -16,7 +16,7 @@ public class PresenceGenerator extends AbstractGenerator { PresencePacket packet = new PresencePacket(); packet.setAttribute("type", type); packet.setTo(contact.getJid()); - packet.setFrom(contact.getAccount().getJid()); + packet.setFrom(contact.getAccount().getJid().toBareJid()); return packet; } @@ -38,7 +38,7 @@ public class PresenceGenerator extends AbstractGenerator { public PresencePacket sendPresence(Account account) { PresencePacket packet = new PresencePacket(); - packet.setFrom(account.getFullJid()); + packet.setFrom(account.getJid()); String sig = account.getPgpSignature(); if (sig != null) { packet.addChild("status").setContent("online"); |