narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

made muc join easier if muc server is known. added room to key words

Browse source
This commit is contained in:
iNPUTmice 2014-06-12 09:54:19 +02:00
parent bb90452673
commit e353a1c109
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/eu/siacs/conversations/entities/Contact.java
View file

@ -139,6 +139,7 @@ public class Contact {
} else {
return (domainParts[0].equals("conf")
|| domainParts[0].equals("conference")
|| domainParts[0].equals("room")
|| domainParts[0].equals("muc")
|| domainParts[0].equals("sala") || domainParts[0]
.equals("salas"));

16
src/eu/siacs/conversations/ui/ContactsActivity.java
View file

@ -18,6 +18,7 @@ import android.os.Bundle;
import android.preference.PreferenceManager;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.Log;
import android.util.SparseBooleanArray;
import android.view.ActionMode;
import android.view.LayoutInflater;
@ -433,7 +434,9 @@ public class ContactsActivity extends XmppActivity {
}
public void showIsMucDialogIfNeeded(final Contact clickedContact) {
if (clickedContact.couldBeMuc()) {
if (isMuc(clickedContact)) {
startConversation(clickedContact,clickedContact.getAccount(), true);
} else if (clickedContact.couldBeMuc()) {
AlertDialog.Builder dialog = new AlertDialog.Builder(this);
dialog.setTitle(getString(R.string.multi_user_conference));
dialog.setMessage(getString(R.string.trying_join_conference));
@ -460,6 +463,17 @@ public class ContactsActivity extends XmppActivity {
}
}
private boolean isMuc(Contact contact) {
ArrayList<String> mucServers = new ArrayList<String>();
for(Account account : accounts) {
if (account.getXmppConnection()!=null) {
mucServers.add(account.getXmppConnection().getMucServer());
}
}
String server = contact.getJid().split("@")[1];
return mucServers.contains(server);
}
public void startConversation(Contact contact, Account account, boolean muc) {
if (!contact.getOption(Contact.Options.IN_ROSTER)&&(!muc)) {
xmppConnectionService.createContact(contact);

2
src/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -936,7 +936,7 @@ public class XmppConnection implements Runnable {
.iterator();
while (it.hasNext()) {
Entry<String, List<String>> pairs = it.next();
if (pairs.getValue().contains(feature)) {
if (pairs.getValue().contains(feature)&&pairs.getValue().size()==1) {
return pairs.getKey();
}
it.remove();