From 180a0e44084752431d702677d68d06ae82524d33 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Sun, 9 Nov 2014 10:57:22 -0500
Subject: Rework `Account.getJid()' to return full JIDs

Remove `Account.getFullJid()'
---
 src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java')

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");
-- 
cgit v1.2.3