diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-29 22:03:57 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-29 22:03:57 +0200 |
| commit | db7920aa9e57e5b4c35800136eaa53f7ae9de2c7 (patch) | |
| tree | 7df4b6c9c4d082b71c95b158cff24ad9985d4fd9 /src/main/java/eu/siacs/conversations/ui | |
| parent | 632fe1b712f50ee0e1f5ab4754d187ee9aadf2e6 (diff) | |
| parent | 762820072a4cdc5ee420ac75321b5416d5d31df3 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index 9af83edd8..548682dfb 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -699,7 +699,6 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU 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<>(); @@ -719,7 +718,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU //ignored } } - if (account != null && jids.size() > 1) { + if (account != null && jids.size() > 0) { xmppConnectionService.createAdhocConference(account, subject, jids, mAdhocConferenceCallback); mToast = Toast.makeText(this, R.string.creating_conference,Toast.LENGTH_LONG); mToast.show(); |