diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-12-04 14:07:16 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-12-04 20:16:46 +0100 |
| commit | dedf6c328a2141d55a53bf76db69811408f32d2c (patch) | |
| tree | d7cfce9563e288bf65a4ede6951b92b50cd288d7 /src/main/java/eu/siacs/conversations/services | |
| parent | 293e4c330499b61bcbc24be8ed598e29e406aea4 (diff) | |
use proposed nick as default nick in mucoptions
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 2bafb03aa..776069568 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1720,9 +1720,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa Account account = conversation.getAccount(); final String nick = conversation.getMucOptions().getProposedNick(); final Jid joinJid = conversation.getMucOptions().createJoinJid(nick); - if (joinJid == null) { - return; //safety net - } Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": joining conversation " + joinJid.toString()); PresencePacket packet = new PresencePacket(); packet.setFrom(conversation.getAccount().getJid()); |