diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-11-25 20:47:02 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2015-11-25 20:47:02 +0100 |
commit | a557d38e4d0bd55442012f7f8a5be62532f7bfe9 (patch) | |
tree | da3b244cb71952cd469ff0276295b25fd0c6f729 /src/main/java/eu/siacs/conversations/entities/MucOptions.java | |
parent | 8228e82f51fee33d28a81e4b0c36f7c51122035c (diff) |
pgp fixes and revert configuration changes
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/MucOptions.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/MucOptions.java | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java index dc0701645..f8fb0bf43 100644 --- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java +++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java @@ -107,10 +107,6 @@ public class MucOptions { } - public interface OnJoinListener extends OnEventListener { - - } - public class User { private Role role = Role.NONE; private Affiliation affiliation = Affiliation.NONE; @@ -215,7 +211,6 @@ public class MucOptions { private boolean isOnline = 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 password = null; @@ -317,9 +312,6 @@ public class MucOptions { onRenameListener.onSuccess(); } mNickChangingInProgress = false; - } else if (this.onJoinListener != null) { - this.onJoinListener.onSuccess(); - this.onJoinListener = null; } } else { addUser(user); @@ -328,14 +320,11 @@ public class MucOptions { Element signed = packet.findChild("x", "jabber:x:signed"); if (signed != null) { Element status = packet.findChild("status"); - String msg; - if (status != null) { - msg = status.getContent(); - } else { - msg = ""; + String msg = status == null ? "" : status.getContent(); + long keyId = pgp.fetchKeyId(account, msg, signed.getContent()); + if (keyId != 0) { + user.setPgpKeyId(keyId); } - user.setPgpKeyId(pgp.fetchKeyId(account, msg, - signed.getContent())); } } } @@ -381,10 +370,6 @@ public class MucOptions { private void setError(int error) { this.isOnline = false; this.error = error; - if (onJoinListener != null) { - onJoinListener.onFailure(); - onJoinListener = null; - } } private List<String> getStatusCodes(Element x) { @@ -438,10 +423,6 @@ public class MucOptions { this.onRenameListener = listener; } - public void setOnJoinListener(OnJoinListener listener) { - this.onJoinListener = listener; - } - public void setOffline() { this.users.clear(); this.error = 0; |