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/entities/Account.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/entities')

diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index 8c80c2adc..bceec639a 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -185,7 +185,7 @@ public class Account extends AbstractEntity {
 	}
 
 	public Jid getJid() {
-		return jid.toBareJid();
+		return jid;
 	}
 
 	public JSONObject getKeys() {
@@ -246,10 +246,6 @@ public class Account extends AbstractEntity {
 		this.xmppConnection = connection;
 	}
 
-	public Jid getFullJid() {
-		return this.jid;
-	}
-
 	public String getOtrFingerprint() {
 		if (this.otrFingerprint == null) {
 			try {
-- 
cgit v1.2.3