sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

safety net in joinMuc

This commit is contained in:
iNPUTmice 2014-12-03 00:05:41 +01:00
parent 39a3f372dd
commit eb0f8c08bd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -1301,10 +1301,12 @@ public class XmppConnectionService extends Service {
account.pendingConferenceJoins.remove(conversation); account.pendingConferenceJoins.remove(conversation);
account.pendingConferenceLeaves.remove(conversation); account.pendingConferenceLeaves.remove(conversation);
if (account.getStatus() == Account.State.ONLINE) { if (account.getStatus() == Account.State.ONLINE) {
Log.d(Config.LOGTAG, final String nick = conversation.getMucOptions().getProposedNick();
"joining conversation " + conversation.getContactJid()); final Jid joinJid = conversation.getMucOptions().createJoinJid(nick);
String nick = conversation.getMucOptions().getProposedNick(); if (joinJid == null) {
Jid joinJid = conversation.getMucOptions().createJoinJid(nick); return; //safety net
}
Log.d(Config.LOGTAG,account.getJid().toBareJid().toString()+": joining conversation " + joinJid.toString());
PresencePacket packet = new PresencePacket(); PresencePacket packet = new PresencePacket();
packet.setFrom(conversation.getAccount().getJid()); packet.setFrom(conversation.getAccount().getJid());
packet.setTo(joinJid); packet.setTo(joinJid);