aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-09 17:05:20 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-09 17:05:20 +0100
commitc310ada8b3b2cce0195f3a2056234c3082106d25 (patch)
tree99e00a4e08619520a246d5acf18f6ce16fae0645 /src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
parente9af0d4ca70dc01e1e7815261c098cf58cfc2fde (diff)
parentcb1a36da7930aaa553ffd525fc9d2d07547d50b9 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
index aa6ed7b4..57152b26 100644
--- a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
@@ -99,7 +99,7 @@ public class ChooseContactActivity extends XmppActivity {
data.putExtra("contact", mListItem.getJid().toString());
String account = request.getStringExtra("account");
if (account == null && mListItem instanceof Contact) {
- account = ((Contact) mListItem).getAccount().getJid().toString();
+ account = ((Contact) mListItem).getAccount().getJid().toBareJid().toString();
}
data.putExtra("account", account);
data.putExtra("conversation",