diff options
| author | Christian S <christian@pix-art.de> | 2016-01-23 12:30:02 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-01-23 12:30:02 +0100 |
| commit | 0196442c37d5d172ba75986495977bf16f3095dc (patch) | |
| tree | d1a549aa917b8ea5e30ae859f2df8ec399c0dcc0 /src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java | |
| parent | 07d139decd7ed9f616b15539bbca00e244eb8a29 (diff) | |
| parent | ba98fe4f864a7e9df9b001a84c5c4126c9d107be (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java index 70cd982b1..7d49aa114 100644 --- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -190,7 +190,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd super.onCreate(savedInstanceState); if (getIntent().getAction().equals(ACTION_VIEW_CONTACT)) { try { - this.accountJid = Jid.fromString(getIntent().getExtras().getString("account")); + this.accountJid = Jid.fromString(getIntent().getExtras().getString(EXTRA_ACCOUNT)); } catch (final InvalidJidException ignored) { } try { |