diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-11-09 17:06:09 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-11-09 17:06:09 +0100 |
| commit | cb1a36da7930aaa553ffd525fc9d2d07547d50b9 (patch) | |
| tree | a24ea0c29c570dc9e10c0dbd6c7d0766855d4ef0 /src/main/java/eu/siacs/conversations/entities | |
| parent | 44de982877c04fadc80be0d377f09fab24a3b74c (diff) | |
| parent | 180a0e44084752431d702677d68d06ae82524d33 (diff) | |
Merge pull request #642 from SamWhited/accountgetjid
Rework `Account.getJid()' to return full JIDs
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
| -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 { |