From 899f8b618569925921eebba108e6a62acfaf3e9c Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Thu, 22 Mar 2018 19:40:08 +0100 Subject: make account chooser visible for group chats --- .../pixart/messenger/ui/StartConversationActivity.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/main/java/de/pixart') diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java index 8ee4bab96..540673242 100644 --- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java @@ -473,6 +473,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU final AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(R.string.join_conference); final View dialogView = getLayoutInflater().inflate(R.layout.join_conference_dialog, null); + final TextView yourAccount = dialogView.findViewById(R.id.your_account); final Spinner spinner = dialogView.findViewById(R.id.account); final AutoCompleteTextView jid = dialogView.findViewById(R.id.jid); final TextView jabberIdDesc = dialogView.findViewById(R.id.jabber_id); @@ -482,6 +483,13 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU if (prefilledJid != null) { jid.append(prefilledJid); } + if (xmppConnectionService.multipleAccounts()) { + yourAccount.setVisibility(View.VISIBLE); + spinner.setVisibility(View.VISIBLE); + } else { + yourAccount.setVisibility(View.GONE); + spinner.setVisibility(View.GONE); + } populateAccountSpinner(this, mActivatedAccounts, spinner); final Checkable bookmarkCheckBox = (CheckBox) dialogView .findViewById(R.id.bookmark); @@ -545,9 +553,17 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU final AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(R.string.create_conference); final View dialogView = getLayoutInflater().inflate(R.layout.create_conference_dialog, null); + final TextView yourAccount = dialogView.findViewById(R.id.your_account); final Spinner spinner = dialogView.findViewById(R.id.account); final EditText subject = dialogView.findViewById(R.id.subject); populateAccountSpinner(this, mActivatedAccounts, spinner); + if (xmppConnectionService.multipleAccounts()) { + yourAccount.setVisibility(View.VISIBLE); + spinner.setVisibility(View.VISIBLE); + } else { + yourAccount.setVisibility(View.GONE); + spinner.setVisibility(View.GONE); + } builder.setView(dialogView); builder.setPositiveButton(R.string.choose_participants, new OnClickListener() { @Override -- cgit v1.2.3