diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-09 17:05:20 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-09 17:05:20 +0100 |
| commit | c310ada8b3b2cce0195f3a2056234c3082106d25 (patch) | |
| tree | 99e00a4e08619520a246d5acf18f6ce16fae0645 /src/main/java/eu/siacs/conversations/entities/Account.java | |
| parent | e9af0d4ca70dc01e1e7815261c098cf58cfc2fde (diff) | |
| parent | cb1a36da7930aaa553ffd525fc9d2d07547d50b9 (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Account.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Account.java | 6 |
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 8c80c2ad..bceec639 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 { |