aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/MucOptions.java
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/MucOptions.java160
1 files changed, 101 insertions, 59 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 4725bffa..2655fc44 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -4,18 +4,20 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
+import eu.siacs.conversations.Config;
import eu.siacs.conversations.crypto.PgpEngine;
import eu.siacs.conversations.xml.Element;
import eu.siacs.conversations.xmpp.jid.InvalidJidException;
import eu.siacs.conversations.xmpp.jid.Jid;
import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
import android.annotation.SuppressLint;
+import android.util.Log;
@SuppressLint("DefaultLocale")
public class MucOptions {
public static final int ERROR_NO_ERROR = 0;
public static final int ERROR_NICK_IN_USE = 1;
- public static final int ERROR_ROOM_NOT_FOUND = 2;
+ public static final int ERROR_UNKNOWN = 2;
public static final int ERROR_PASSWORD_REQUIRED = 3;
public static final int ERROR_BANNED = 4;
public static final int ERROR_MEMBERS_ONLY = 5;
@@ -25,8 +27,17 @@ public class MucOptions {
public static final String STATUS_CODE_BANNED = "301";
public static final String STATUS_CODE_KICKED = "307";
- public interface OnRenameListener {
- public void onRename(boolean success);
+ private interface OnEventListener {
+ public void onSuccess();
+ public void onFailure();
+ }
+
+ public interface OnRenameListener extends OnEventListener {
+
+ }
+
+ public interface OnJoinListener extends OnEventListener {
+
}
public class User {
@@ -119,13 +130,13 @@ public class MucOptions {
private List<User> users = new CopyOnWriteArrayList<>();
private Conversation conversation;
private boolean isOnline = false;
- private int error = ERROR_ROOM_NOT_FOUND;
- private OnRenameListener renameListener = null;
- private boolean aboutToRename = false;
+ private int error = ERROR_UNKNOWN;
+ private OnRenameListener onRenameListener = null;
+ private OnJoinListener onJoinListener = null;
private User self = new User();
private String subject = null;
- private String joinnick;
private String password = null;
+ private boolean mNickChangingInProgress = false;
public MucOptions(Conversation conversation) {
this.account = conversation.getAccount();
@@ -155,10 +166,11 @@ public class MucOptions {
final Jid from = packet.getFrom();
if (!from.isBareJid()) {
final String name = from.getResourcepart();
- String type = packet.getAttribute("type");
+ final String type = packet.getAttribute("type");
+ final Element x = packet.findChild("x","http://jabber.org/protocol/muc#user");
+ final List<String> codes = getStatusCodes(x);
if (type == null) {
User user = new User();
- Element x = packet.findChild("x","http://jabber.org/protocol/muc#user");
if (x != null) {
Element item = x.findChild("item");
if (item != null) {
@@ -166,16 +178,16 @@ public class MucOptions {
user.setAffiliation(item.getAttribute("affiliation"));
user.setRole(item.getAttribute("role"));
user.setJid(item.getAttributeAsJid("jid"));
- user.setName(name);
- if (name.equals(this.joinnick)) {
+ if (codes.contains("110")) {
this.isOnline = true;
this.error = ERROR_NO_ERROR;
self = user;
- if (aboutToRename) {
- if (renameListener != null) {
- renameListener.onRename(true);
- }
- aboutToRename = false;
+ if (mNickChangingInProgress) {
+ onRenameListener.onSuccess();
+ mNickChangingInProgress = false;
+ } else if (this.onJoinListener != null) {
+ this.onJoinListener.onSuccess();
+ this.onJoinListener = null;
}
} else {
addUser(user);
@@ -196,46 +208,63 @@ public class MucOptions {
}
}
}
- } else if (type.equals("unavailable") && name.equals(this.joinnick)) {
- Element x = packet.findChild("x",
- "http://jabber.org/protocol/muc#user");
- if (x != null) {
- Element status = x.findChild("status");
- if (status != null) {
- String code = status.getAttribute("code");
- if (STATUS_CODE_KICKED.equals(code)) {
- this.isOnline = false;
- this.error = KICKED_FROM_ROOM;
- } else if (STATUS_CODE_BANNED.equals(code)) {
- this.isOnline = false;
- this.error = ERROR_BANNED;
- }
- }
+ } else if (type.equals("unavailable") && codes.contains("110")) {
+ if (codes.contains("303")) {
+ this.mNickChangingInProgress = true;
+ } else if (codes.contains(STATUS_CODE_KICKED)) {
+ setError(KICKED_FROM_ROOM);
+ } else if (codes.contains(STATUS_CODE_BANNED)) {
+ setError(ERROR_BANNED);
+ } else {
+ setError(ERROR_UNKNOWN);
}
} else if (type.equals("unavailable")) {
- deleteUser(packet.getAttribute("from").split("/", 2)[1]);
+ deleteUser(name);
} else if (type.equals("error")) {
Element error = packet.findChild("error");
if (error != null && error.hasChild("conflict")) {
- if (aboutToRename) {
- if (renameListener != null) {
- renameListener.onRename(false);
+ if (isOnline) {
+ if (onRenameListener != null) {
+ onRenameListener.onFailure();
}
- aboutToRename = false;
- this.setJoinNick(getActualNick());
} else {
- this.error = ERROR_NICK_IN_USE;
+ setError(ERROR_NICK_IN_USE);
}
} else if (error != null && error.hasChild("not-authorized")) {
- this.error = ERROR_PASSWORD_REQUIRED;
+ setError(ERROR_PASSWORD_REQUIRED);
} else if (error != null && error.hasChild("forbidden")) {
- this.error = ERROR_BANNED;
- } else if (error != null
- && error.hasChild("registration-required")) {
- this.error = ERROR_MEMBERS_ONLY;
+ setError(ERROR_BANNED);
+ } else if (error != null && error.hasChild("registration-required")) {
+ setError(ERROR_MEMBERS_ONLY);
+ } else {
+ setError(ERROR_UNKNOWN);
+ }
+ }
+ }
+ }
+
+ private void setError(int error) {
+ this.isOnline = false;
+ this.error = error;
+ if (onJoinListener != null) {
+ onJoinListener.onFailure();
+ onJoinListener = null;
+ }
+ }
+
+ private List<String> getStatusCodes(Element x) {
+ List<String> codes = new ArrayList<String>();
+ if (x != null) {
+ for(Element child : x.getChildren()) {
+ if (child.getName().equals("status")) {
+ String code = child.getAttribute("code");
+ if (code!=null) {
+ codes.add(code);
+ }
}
}
}
+ return codes;
}
public List<User> getUsers() {
@@ -263,10 +292,6 @@ public class MucOptions {
}
}
- public void setJoinNick(String nick) {
- this.joinnick = nick;
- }
-
public boolean online() {
return this.isOnline;
}
@@ -276,11 +301,11 @@ public class MucOptions {
}
public void setOnRenameListener(OnRenameListener listener) {
- this.renameListener = listener;
+ this.onRenameListener = listener;
}
- public OnRenameListener getOnRenameListener() {
- return this.renameListener;
+ public void setOnJoinListener(OnJoinListener listener) {
+ this.onJoinListener = listener;
}
public void setOffline() {
@@ -301,8 +326,28 @@ public class MucOptions {
return this.subject;
}
- public void flagAboutToRename() {
- this.aboutToRename = true;
+ public String createNameFromParticipants() {
+ if (users.size() >= 2) {
+ List<String> names = new ArrayList<String>();
+ for (User user : users) {
+ Contact contact = user.getContact();
+ if (contact != null && !contact.getDisplayName().isEmpty()) {
+ names.add(contact.getDisplayName().split("\\s+")[0]);
+ } else {
+ names.add(user.getName());
+ }
+ }
+ StringBuilder builder = new StringBuilder();
+ for (int i = 0; i < names.size(); ++i) {
+ builder.append(names.get(i));
+ if (i != names.size() - 1) {
+ builder.append(", ");
+ }
+ }
+ return builder.toString();
+ } else {
+ return null;
+ }
}
public long[] getPgpKeyIds() {
@@ -337,10 +382,9 @@ public class MucOptions {
return true;
}
- public Jid getJoinJid() {
+ public Jid createJoinJid(String nick) {
try {
- return Jid.fromString(this.conversation.getContactJid().toBareJid().toString() + "/"
-+ this.joinnick);
+ return Jid.fromString(this.conversation.getContactJid().toBareJid().toString() + "/"+nick);
} catch (final InvalidJidException e) {
return null;
}
@@ -356,8 +400,7 @@ public class MucOptions {
}
public String getPassword() {
- this.password = conversation
- .getAttribute(Conversation.ATTRIBUTE_MUC_PASSWORD);
+ this.password = conversation.getAttribute(Conversation.ATTRIBUTE_MUC_PASSWORD);
if (this.password == null && conversation.getBookmark() != null
&& conversation.getBookmark().getPassword() != null) {
return conversation.getBookmark().getPassword();
@@ -372,8 +415,7 @@ public class MucOptions {
} else {
this.password = password;
}
- conversation
- .setAttribute(Conversation.ATTRIBUTE_MUC_PASSWORD, password);
+ conversation.setAttribute(Conversation.ATTRIBUTE_MUC_PASSWORD, password);
}
public Conversation getConversation() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 10:28:27 +0000