moparisthebest
/
Conversations
mirror of https://github.com/moparisthebest/Conversations
1
0
Fork 0
Code Issues Releases Wiki Activity

add nick to bookmark when entering full jid in join conference dialog

This commit is contained in:
Daniel Gultsch 2015-10-19 23:20:00 +02:00
parent adca670196
commit efab290c28
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/ui/StartConversationActivity.java
View File

@ -458,16 +458,18 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
} else { } else {
final Bookmark bookmark = new Bookmark(account,conferenceJid.toBareJid()); final Bookmark bookmark = new Bookmark(account,conferenceJid.toBareJid());
bookmark.setAutojoin(true); bookmark.setAutojoin(true);
String nick = conferenceJid.getResourcepart();
if (nick != null && !nick.isEmpty()) {
bookmark.setNick(nick);
}
account.getBookmarks().add(bookmark); account.getBookmarks().add(bookmark);
xmppConnectionService xmppConnectionService.pushBookmarks(account);
.pushBookmarks(account);
final Conversation conversation = xmppConnectionService final Conversation conversation = xmppConnectionService
.findOrCreateConversation(account, .findOrCreateConversation(account,
conferenceJid, true); conferenceJid, true);
conversation.setBookmark(bookmark); conversation.setBookmark(bookmark);
if (!conversation.getMucOptions().online()) { if (!conversation.getMucOptions().online()) {
xmppConnectionService xmppConnectionService.joinMuc(conversation);
.joinMuc(conversation);
} }
dialog.dismiss(); dialog.dismiss();
switchToConversation(conversation); switchToConversation(conversation);