thedevstack/PiratX-Archive
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix NPE when using channel search and DOMAIN_LOCK

Browse source
This commit is contained in:
Christian Schneppe 2019-10-02 15:37:37 +02:00
parent 60ca56c188
commit 616eba9d1f
No known key found for this signature in database
GPG key ID: F30B8D686B44D87E
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java
View file

@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import de.pixart.messenger.Config;
import de.pixart.messenger.R;
import de.pixart.messenger.databinding.ActivityChannelDiscoveryBinding;
import de.pixart.messenger.entities.Account;
@ -212,18 +213,19 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
return false;
}
public void joinChannelSearchResult(String accountJid, MuclumbusService.Room result) {
final boolean syncAutojoin = getBooleanPreference("autojoin", R.bool.autojoin);
Account account = xmppConnectionService.findAccountByJid(Jid.of(accountJid));
public void joinChannelSearchResult(String selectedAccount, MuclumbusService.Room result) {
final Jid jid = Config.DOMAIN_LOCK == null ? Jid.of(selectedAccount) : Jid.of(selectedAccount, Config.DOMAIN_LOCK, null);
final boolean syncAutoJoin = getBooleanPreference("autojoin", R.bool.autojoin);
final Account account = xmppConnectionService.findAccountByJid(jid);
final Conversation conversation = xmppConnectionService.findOrCreateConversation(account, result.getRoom(), true, true, true);
if (conversation.getBookmark() != null) {
if (!conversation.getBookmark().autojoin() && syncAutojoin) {
if (!conversation.getBookmark().autojoin() && syncAutoJoin) {
conversation.getBookmark().setAutojoin(true);
xmppConnectionService.pushBookmarks(account);
}
} else {
final Bookmark bookmark = new Bookmark(account, conversation.getJid().asBareJid());
bookmark.setAutojoin(syncAutojoin);
bookmark.setAutojoin(syncAutoJoin);
account.getBookmarks().add(bookmark);
xmppConnectionService.pushBookmarks(account);
}