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/ui/XmppActivity.java | |
| 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/ui/XmppActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index 4bd64411..e8a858c0 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -277,14 +277,14 @@ public abstract class XmppActivity extends Activity { public void switchToContactDetails(Contact contact) { Intent intent = new Intent(this, ContactDetailsActivity.class); intent.setAction(ContactDetailsActivity.ACTION_VIEW_CONTACT); - intent.putExtra("account", contact.getAccount().getJid().toString()); + intent.putExtra("account", contact.getAccount().getJid().toBareJid().toString()); intent.putExtra("contact", contact.getJid().toString()); startActivity(intent); } public void switchToAccount(Account account) { Intent intent = new Intent(this, EditAccountActivity.class); - intent.putExtra("jid", account.getJid().toString()); + intent.putExtra("jid", account.getJid().toBareJid().toString()); startActivity(intent); } |