Merge remote-tracking branch 'refs/remotes/siacs/master'

8 files changed, 209 insertions, 54 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
index 1698343b0..5156fcca4 100644
--- a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
@@ -1,8 +1,10 @@
 package eu.siacs.conversations.ui;
 
+import android.app.ActionBar;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.StringRes;
 import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -32,6 +34,7 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
 
 	private Set<Contact> selected;
 	private Set<String> filterContacts;
+	public static final String EXTRA_TITLE_RES_ID = "extra_title_res_id";
 
 	@Override
 	public void onCreate(final Bundle savedInstanceState) {
@@ -77,6 +80,8 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
 							String[] selection = getSelectedContactJids();
 							data.putExtra("contacts", selection);
 							data.putExtra("multiple", true);
+							data.putExtra(EXTRA_ACCOUNT,request.getStringExtra(EXTRA_ACCOUNT));
+							data.putExtra("subject", request.getStringExtra("subject"));
 							setResult(RESULT_OK, data);
 							finish();
 							return true;
@@ -121,6 +126,7 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
 				data.putExtra("conversation",
 						request.getStringExtra("conversation"));
 				data.putExtra("multiple", false);
+				data.putExtra("subject", request.getStringExtra("subject"));
 				setResult(RESULT_OK, data);
 				finish();
 			}
@@ -129,6 +135,22 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
 	}
 
 	@Override
+	public void onStart() {
+		super.onStart();
+		Intent intent = getIntent();
+		@StringRes
+		int res = intent != null ? intent.getIntExtra(EXTRA_TITLE_RES_ID,R.string.title_activity_choose_contact) : R.string.title_activity_choose_contact;
+		ActionBar bar = getActionBar();
+		if (bar != null) {
+			try {
+				bar.setTitle(res);
+			} catch (Exception e) {
+				bar.setTitle(R.string.title_activity_choose_contact);
+			}
+		}
+	}
+
+	@Override
 	public boolean onCreateOptionsMenu(final Menu menu) {
 		super.onCreateOptionsMenu(menu);
 		final Intent i = getIntent();
@@ -194,6 +216,7 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
 				data.putExtra("conversation",
 						request.getStringExtra("conversation"));
 				data.putExtra("multiple", false);
+				data.putExtra("subject", request.getStringExtra("subject"));
 				setResult(RESULT_OK, data);
 				finish();
 
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index 808f6e7f9..7e2e3297e 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -27,7 +27,6 @@ import org.openintents.openpgp.util.OpenPgpUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import eu.siacs.conversations.Config;
@@ -281,7 +280,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			case R.id.action_edit_subject:
 				if (mConversation != null) {
 					quickEdit(mConversation.getMucOptions().getSubject(),
-							R.string.action_edit_subject,
+							R.string.edit_subject_hint,
 							this.onSubjectEdited);
 				}
 				break;
@@ -486,16 +485,8 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 	}
 
 	protected void saveAsBookmark() {
-		Account account = mConversation.getAccount();
-		Bookmark bookmark = new Bookmark(account, mConversation.getJid().toBareJid());
-		if (!mConversation.getJid().isBareJid()) {
-			bookmark.setNick(mConversation.getJid().getResourcepart());
-		}
-		bookmark.setBookmarkName(mConversation.getMucOptions().getSubject());
-		bookmark.setAutojoin(getPreferences().getBoolean("autojoin",true));
-		account.getBookmarks().add(bookmark);
-		xmppConnectionService.pushBookmarks(account);
-		mConversation.setBookmark(bookmark);
+		xmppConnectionService.saveConversationAsBookmark(mConversation,
+				mConversation.getMucOptions().getSubject());
 	}
 
 	protected void deleteBookmark() {
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 8fa0c6296..4f2f5e7b2 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -415,35 +415,39 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 		keys.removeAllViews();
 		boolean hasKeys = false;
 		LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-		for(final String otrFingerprint : contact.getOtrFingerprints()) {
-			hasKeys = true;
-			View view = inflater.inflate(R.layout.contact_key, keys, false);
-			TextView key = (TextView) view.findViewById(R.id.key);
-			TextView keyType = (TextView) view.findViewById(R.id.key_type);
-			ImageButton removeButton = (ImageButton) view
-				.findViewById(R.id.button_remove);
-			removeButton.setVisibility(View.VISIBLE);
-			keyType.setText("OTR Fingerprint");
-			key.setText(CryptoHelper.prettifyFingerprint(otrFingerprint));
-			keys.addView(view);
-			removeButton.setOnClickListener(new OnClickListener() {
+		if (Config.supportOtr()) {
+			for (final String otrFingerprint : contact.getOtrFingerprints()) {
+				hasKeys = true;
+				View view = inflater.inflate(R.layout.contact_key, keys, false);
+				TextView key = (TextView) view.findViewById(R.id.key);
+				TextView keyType = (TextView) view.findViewById(R.id.key_type);
+				ImageButton removeButton = (ImageButton) view
+						.findViewById(R.id.button_remove);
+				removeButton.setVisibility(View.VISIBLE);
+				keyType.setText("OTR Fingerprint");
+				key.setText(CryptoHelper.prettifyFingerprint(otrFingerprint));
+				keys.addView(view);
+				removeButton.setOnClickListener(new OnClickListener() {
 
-				@Override
-				public void onClick(View v) {
-					confirmToDeleteFingerprint(otrFingerprint);
-				}
-			});
+					@Override
+					public void onClick(View v) {
+						confirmToDeleteFingerprint(otrFingerprint);
+					}
+				});
+			}
 		}
-		for (final String fingerprint : contact.getAccount().getAxolotlService().getFingerprintsForContact(contact)) {
-			boolean highlight = fingerprint.equals(messageFingerprint);
-			hasKeys |= addFingerprintRow(keys, contact.getAccount(), fingerprint, highlight, new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					onOmemoKeyClicked(contact.getAccount(), fingerprint);
-				}
-			});
+		if (Config.supportOmemo()) {
+			for (final String fingerprint : contact.getAccount().getAxolotlService().getFingerprintsForContact(contact)) {
+				boolean highlight = fingerprint.equals(messageFingerprint);
+				hasKeys |= addFingerprintRow(keys, contact.getAccount(), fingerprint, highlight, new OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						onOmemoKeyClicked(contact.getAccount(), fingerprint);
+					}
+				});
+			}
 		}
-		if (contact.getPgpKeyId() != 0) {
+		if (Config.supportOpenPgp() && contact.getPgpKeyId() != 0) {
 			hasKeys = true;
 			View view = inflater.inflate(R.layout.contact_key, keys, false);
 			TextView key = (TextView) view.findViewById(R.id.key);
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 9e8c7f6f6..2db0e7c38 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1316,6 +1316,8 @@ public class ConversationActivity extends XmppActivity
 
 		if (mPendingConferenceInvite != null) {
 			mPendingConferenceInvite.execute(this);
+			mToast = Toast.makeText(this, R.string.creating_conference,Toast.LENGTH_LONG);
+			mToast.show();
 			mPendingConferenceInvite = null;
 		}
 
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 014fedd39..3ec484087 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -400,8 +400,11 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		} else {
 			switch (conversation.getNextEncryption()) {
 				case Message.ENCRYPTION_NONE:
-					mEditMessage
-							.setHint(getString(R.string.send_unencrypted_message));
+					if (Config.multipleEncryptionChoices()) {
+						mEditMessage.setHint(getString(R.string.send_unencrypted_message));
+					} else {
+						mEditMessage.setHint(getString(R.string.send_message_to_x,conversation.getName()));
+					}
 					break;
 				case Message.ENCRYPTION_OTR:
 					mEditMessage.setHint(getString(R.string.send_otr_message));
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 15701c950..af6b305c0 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -523,7 +523,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			}
 			mamPrefs.setVisible(mAccount.getXmppConnection().getFeatures().mam());
 			Set<Integer> otherDevices = mAccount.getAxolotlService().getOwnDeviceIds();
-			if (otherDevices == null || otherDevices.isEmpty()) {
+			if (otherDevices == null || otherDevices.isEmpty() || Config.supportOmemo()) {
 				clearDevices.setVisible(false);
 			}
 			changePresence.setVisible(manuallyChangePresence());
@@ -785,7 +785,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				this.mServerInfoPush.setText(R.string.server_info_unavailable);
 			}
 			final String otrFingerprint = this.mAccount.getOtrFingerprint();
-			if (otrFingerprint != null) {
+			if (otrFingerprint != null && Config.supportOtr()) {
 				this.mOtrFingerprintBox.setVisibility(View.VISIBLE);
 				this.mOtrFingerprint.setText(CryptoHelper.prettifyFingerprint(otrFingerprint));
 				this.mOtrFingerprintToClipboardButton
@@ -807,10 +807,10 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			} else {
 				this.mOtrFingerprintBox.setVisibility(View.GONE);
 			}
-			final String axolotlFingerprint = this.mAccount.getAxolotlService().getOwnFingerprint();
-			if (axolotlFingerprint != null) {
+			final String ownAxolotlFingerprint = this.mAccount.getAxolotlService().getOwnFingerprint();
+			if (ownAxolotlFingerprint != null && Config.supportOmemo()) {
 				this.mAxolotlFingerprintBox.setVisibility(View.VISIBLE);
-				this.mAxolotlFingerprint.setText(CryptoHelper.prettifyFingerprint(axolotlFingerprint.substring(2)));
+				this.mAxolotlFingerprint.setText(CryptoHelper.prettifyFingerprint(ownAxolotlFingerprint.substring(2)));
 				this.mAxolotlFingerprintToClipboardButton
 						.setVisibility(View.VISIBLE);
 				this.mAxolotlFingerprintToClipboardButton
@@ -819,7 +819,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 							@Override
 							public void onClick(final View v) {
 
-								if (copyTextToClipboard(axolotlFingerprint.substring(2), R.string.omemo_fingerprint)) {
+								if (copyTextToClipboard(ownAxolotlFingerprint.substring(2), R.string.omemo_fingerprint)) {
 									Toast.makeText(
 											EditAccountActivity.this,
 											R.string.toast_message_omemo_fingerprint,
@@ -842,17 +842,16 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			} else {
 				this.mAxolotlFingerprintBox.setVisibility(View.GONE);
 			}
-			final String ownFingerprint = mAccount.getAxolotlService().getOwnFingerprint();
 			boolean hasKeys = false;
 			keys.removeAllViews();
 			for (final String fingerprint : mAccount.getAxolotlService().getFingerprintsForOwnSessions()) {
-				if (ownFingerprint.equals(fingerprint)) {
+				if (ownAxolotlFingerprint.equals(fingerprint)) {
 					continue;
 				}
 				boolean highlight = fingerprint.equals(messageFingerprint);
 				hasKeys |= addFingerprintRow(keys, mAccount, fingerprint, highlight, null);
 			}
-			if (hasKeys) {
+			if (hasKeys && Config.supportOmemo()) {
 				keysCard.setVisibility(View.VISIBLE);
 			} else {
 				keysCard.setVisibility(View.GONE);
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 3ab6d1d2e..9af83edd8 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -10,6 +10,7 @@ import android.app.AlertDialog;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
 import android.app.ListFragment;
+import android.app.PendingIntent;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
@@ -27,6 +28,7 @@ import android.support.v4.view.ViewPager;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.util.Pair;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.KeyEvent;
@@ -54,6 +56,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.RunnableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import eu.siacs.conversations.Config;
@@ -94,6 +97,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 	private EditText mSearchEditText;
 	private AtomicBoolean mRequestedContactsPermission = new AtomicBoolean(false);
 	private final int REQUEST_SYNC_CONTACTS = 0x3b28cf;
+	private final int REQUEST_CREATE_CONFERENCE = 0x3b39da;
 
 	private MenuItem.OnActionExpandListener mOnActionExpandListener = new MenuItem.OnActionExpandListener() {
 
@@ -201,6 +205,47 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 		}
 	};
 	private String mInitialJid;
+	private Pair<Integer, Intent> mPostponedActivityResult;
+	private UiCallback<Conversation> mAdhocConferenceCallback = new UiCallback<Conversation>() {
+		@Override
+		public void success(final Conversation conversation) {
+			runOnUiThread(new Runnable() {
+				@Override
+				public void run() {
+					hideToast();
+					switchToConversation(conversation);
+				}
+			});
+		}
+
+		@Override
+		public void error(final int errorCode, Conversation object) {
+			runOnUiThread(new Runnable() {
+				@Override
+				public void run() {
+					replaceToast(getString(errorCode));
+				}
+			});
+		}
+
+		@Override
+		public void userInputRequried(PendingIntent pi, Conversation object) {
+
+		}
+	};
+	private Toast mToast;
+
+	protected void hideToast() {
+		if (mToast != null) {
+			mToast.cancel();
+		}
+	}
+
+	protected void replaceToast(String msg) {
+		hideToast();
+		mToast = Toast.makeText(this, msg ,Toast.LENGTH_LONG);
+		mToast.show();
+	}
 
 	@Override
 	public void onRosterUpdate() {
@@ -488,6 +533,37 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 				});
 	}
 
+	private void showCreateConferenceDialog() {
+		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 Spinner spinner = (Spinner) dialogView.findViewById(R.id.account);
+		final EditText subject = (EditText) dialogView.findViewById(R.id.subject);
+		populateAccountSpinner(this, mActivatedAccounts, spinner);
+		builder.setView(dialogView);
+		builder.setPositiveButton(R.string.choose_participants, new OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				if (!xmppConnectionServiceBound) {
+					return;
+				}
+				final Account account = getSelectedAccount(spinner);
+				if (account == null) {
+					return;
+				}
+				Intent intent = new Intent(getApplicationContext(), ChooseContactActivity.class);
+				intent.putExtra("multiple", true);
+				intent.putExtra("show_enter_jid", true);
+				intent.putExtra("subject", subject.getText().toString());
+				intent.putExtra(EXTRA_ACCOUNT, account.getJid().toBareJid().toString());
+				intent.putExtra(ChooseContactActivity.EXTRA_TITLE_RES_ID,R.string.choose_participants);
+				startActivityForResult(intent, REQUEST_CREATE_CONFERENCE);
+			}
+		});
+		builder.setNegativeButton(R.string.cancel, null);
+		builder.create().show();
+	}
+
 	private Account getSelectedAccount(Spinner spinner) {
 		if (!spinner.isEnabled()) {
 			return null;
@@ -532,7 +608,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 	public boolean onCreateOptionsMenu(Menu menu) {
 		getMenuInflater().inflate(R.menu.start_conversation, menu);
 		MenuItem menuCreateContact = menu.findItem(R.id.action_create_contact);
-		MenuItem menuCreateConference = menu.findItem(R.id.action_join_conference);
+		MenuItem menuCreateConference = menu.findItem(R.id.action_conference);
 		MenuItem menuHideOffline = menu.findItem(R.id.action_hide_offline);
 		menuHideOffline.setChecked(this.mHideOfflineContacts);
 		mMenuSearchView = menu.findItem(R.id.action_search);
@@ -564,6 +640,9 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 			case R.id.action_join_conference:
 				showJoinConferenceDialog(null);
 				return true;
+			case R.id.action_create_conference:
+				showCreateConferenceDialog();
+				return true;
 			case R.id.action_scan_qr_code:
 				new IntentIntegrator(this).initiateScan();
 				return true;
@@ -616,6 +695,39 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 					this.mPendingInvite = null;
 				}
 			}
+		} else if (resultCode == RESULT_OK) {
+			if (xmppConnectionServiceBound) {
+				this.mPostponedActivityResult = null;
+				if (requestCode == REQUEST_CREATE_CONFERENCE) {
+					Log.d(Config.LOGTAG,"account jid: "+ intent.getStringExtra(EXTRA_ACCOUNT));
+					Account account = extractAccount(intent);
+					final String subject = intent.getStringExtra("subject");
+					List<Jid> jids = new ArrayList<>();
+					if (intent.getBooleanExtra("multiple", false)) {
+						String[] toAdd = intent.getStringArrayExtra("contacts");
+						for (String item : toAdd) {
+							try {
+								jids.add(Jid.fromString(item));
+							} catch (InvalidJidException e) {
+								//ignored
+							}
+						}
+					} else {
+						try {
+							jids.add(Jid.fromString(intent.getStringExtra("contact")));
+						} catch (Exception e) {
+							//ignored
+						}
+					}
+					if (account != null && jids.size() > 1) {
+						xmppConnectionService.createAdhocConference(account, subject, jids, mAdhocConferenceCallback);
+						mToast = Toast.makeText(this, R.string.creating_conference,Toast.LENGTH_LONG);
+						mToast.show();
+					}
+				}
+			} else {
+				this.mPostponedActivityResult = new Pair<>(requestCode, intent);
+			}
 		}
 		super.onActivityResult(requestCode, requestCode, intent);
 	}
@@ -657,6 +769,10 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 
 	@Override
 	protected void onBackendConnected() {
+		if (mPostponedActivityResult != null) {
+			onActivityResult(mPostponedActivityResult.first, RESULT_OK, mPostponedActivityResult.second);
+			this.mPostponedActivityResult = null;
+		}
 		this.mActivatedAccounts.clear();
 		for (Account account : xmppConnectionService.getAccounts()) {
 			if (account.getStatus() != Account.State.DISABLED) {
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 2a6dbf589..faa314752 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -118,6 +118,20 @@ public abstract class XmppActivity extends Activity {
 	protected int mTheme;
 	protected boolean mUsingEnterKey = false;
 
+	protected Toast mToast;
+
+	protected void hideToast() {
+		if (mToast != null) {
+			mToast.cancel();
+		}
+	}
+
+	protected void replaceToast(String msg) {
+		hideToast();
+		mToast = Toast.makeText(this, msg ,Toast.LENGTH_LONG);
+		mToast.show();
+	}
+
 	protected Runnable onOpenPGPKeyPublished = new Runnable() {
 		@Override
 		public void run() {
@@ -948,19 +962,22 @@ public abstract class XmppActivity extends Activity {
 			mPendingConferenceInvite = ConferenceInvite.parse(data);
 			if (xmppConnectionServiceBound && mPendingConferenceInvite != null) {
 				mPendingConferenceInvite.execute(this);
+				mToast = Toast.makeText(this, R.string.creating_conference,Toast.LENGTH_LONG);
+				mToast.show();
 				mPendingConferenceInvite = null;
 			}
 		}
 	}
 
+
 	private UiCallback<Conversation> adhocCallback = new UiCallback<Conversation>() {
 		@Override
 		public void success(final Conversation conversation) {
-			switchToConversation(conversation);
 			runOnUiThread(new Runnable() {
 				@Override
 				public void run() {
-					Toast.makeText(XmppActivity.this,R.string.conference_created,Toast.LENGTH_LONG).show();
+					switchToConversation(conversation);
+					hideToast();
 				}
 			});
 		}
@@ -970,7 +987,7 @@ public abstract class XmppActivity extends Activity {
 			runOnUiThread(new Runnable() {
 				@Override
 				public void run() {
-					Toast.makeText(XmppActivity.this,errorCode,Toast.LENGTH_LONG).show();
+					replaceToast(getString(errorCode));
 				}
 			});
 		}
@@ -1167,7 +1184,7 @@ public abstract class XmppActivity extends Activity {
 				}
 			} else {
 				jids.add(conversation.getJid().toBareJid());
-				service.createAdhocConference(conversation.getAccount(), jids, activity.adhocCallback);
+				service.createAdhocConference(conversation.getAccount(), null, jids, activity.adhocCallback);
 			}
 		}
 	}