aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-11-09 10:57:22 -0500
committerSam Whited <sam@samwhited.com>2014-11-09 10:57:22 -0500
commit180a0e44084752431d702677d68d06ae82524d33 (patch)
treef124833d9df3b62d4cfff2c9cd3eeb2f3de140a6 /src/main/java/eu/siacs/conversations/entities
parent377bd49ee807b9a06089ad5612ca15b9b00f2e36 (diff)
Rework `Account.getJid()' to return full JIDs
Remove `Account.getFullJid()'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Account.java6
1 files changed, 1 insertions, 5 deletions
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 {