aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-01-04 17:27:51 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-01-04 17:27:54 +0100
commit501034fe0eb267f5100f4dd799fb1454fe7ba1a4 (patch)
treef3a676567c49f99e6bb103095951cdcae1f686d4 /src/main/java/eu/siacs/conversations/ui/XmppActivity.java
parentfdb6b0e30d7cc5a90e4bad181ddc89acf4a2e4fa (diff)
Allow entering a JID from 'choose contact'. thanks @singpolyma
fixes #1611 fixes #1602
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/XmppActivity.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/XmppActivity.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index f52066cb..a23f51eb 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -469,6 +469,8 @@ public abstract class XmppActivity extends Activity {
intent.putExtra("filter_contacts", contacts.toArray(new String[contacts.size()]));
intent.putExtra("conversation", conversation.getUuid());
intent.putExtra("multiple", true);
+ intent.putExtra("show_enter_jid", true);
+ intent.putExtra("account", conversation.getAccount().getJid().toBareJid().toString());
startActivityForResult(intent, REQUEST_INVITE_TO_CONVERSATION);
}