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

minor code clean up in XmppConnection class

Browse source
This commit is contained in:
Daniel Gultsch 2020-12-31 10:27:06 +01:00
parent 0e54d8a2cf
commit 0569febf67
1 changed files with 42 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -107,32 +107,29 @@ public class XmppConnection implements Runnable {
private static final int PACKET_IQ = 0; private static final int PACKET_IQ = 0;
private static final int PACKET_MESSAGE = 1; private static final int PACKET_MESSAGE = 1;
private static final int PACKET_PRESENCE = 2; private static final int PACKET_PRESENCE = 2;
public final OnIqPacketReceived registrationResponseListener = new OnIqPacketReceived() { public final OnIqPacketReceived registrationResponseListener = (account, packet) -> {
@Override if (packet.getType() == IqPacket.TYPE.RESULT) {
public void onIqPacketReceived(Account account, IqPacket packet) { account.setOption(Account.OPTION_REGISTER, false);
if (packet.getType() == IqPacket.TYPE.RESULT) { Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": successfully registered new account on server");
account.setOption(Account.OPTION_REGISTER, false); throw new StateChangingError(Account.State.REGISTRATION_SUCCESSFUL);
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": successfully registered new account on server"); } else {
throw new StateChangingError(Account.State.REGISTRATION_SUCCESSFUL); final List<String> PASSWORD_TOO_WEAK_MSGS = Arrays.asList(
} else { "The password is too weak",
final List<String> PASSWORD_TOO_WEAK_MSGS = Arrays.asList( "Please use a longer password.");
"The password is too weak", Element error = packet.findChild("error");
"Please use a longer password."); Account.State state = Account.State.REGISTRATION_FAILED;
Element error = packet.findChild("error"); if (error != null) {
Account.State state = Account.State.REGISTRATION_FAILED; if (error.hasChild("conflict")) {
if (error != null) { state = Account.State.REGISTRATION_CONFLICT;
if (error.hasChild("conflict")) { } else if (error.hasChild("resource-constraint")
state = Account.State.REGISTRATION_CONFLICT; && "wait".equals(error.getAttribute("type"))) {
} else if (error.hasChild("resource-constraint") state = Account.State.REGISTRATION_PLEASE_WAIT;
&& "wait".equals(error.getAttribute("type"))) { } else if (error.hasChild("not-acceptable")
state = Account.State.REGISTRATION_PLEASE_WAIT; && PASSWORD_TOO_WEAK_MSGS.contains(error.findChildContent("text"))) {
} else if (error.hasChild("not-acceptable") state = Account.State.REGISTRATION_PASSWORD_TOO_WEAK;
&& PASSWORD_TOO_WEAK_MSGS.contains(error.findChildContent("text"))) {
state = Account.State.REGISTRATION_PASSWORD_TOO_WEAK;
}
} }
throw new StateChangingError(state);
} }
throw new StateChangingError(state);
} }
}; };
protected final Account account; protected final Account account;
@ -160,10 +157,10 @@ public class XmppConnection implements Runnable {
private long lastSessionStarted = 0; private long lastSessionStarted = 0;
private long lastDiscoStarted = 0; private long lastDiscoStarted = 0;
private boolean isMamPreferenceAlways = false; private boolean isMamPreferenceAlways = false;
private AtomicInteger mPendingServiceDiscoveries = new AtomicInteger(0); private final AtomicInteger mPendingServiceDiscoveries = new AtomicInteger(0);
private AtomicBoolean mWaitForDisco = new AtomicBoolean(true); private final AtomicBoolean mWaitForDisco = new AtomicBoolean(true);
private AtomicBoolean mWaitingForSmCatchup = new AtomicBoolean(false); private final AtomicBoolean mWaitingForSmCatchup = new AtomicBoolean(false);
private AtomicInteger mSmCatchupMessageCounter = new AtomicInteger(0); private final AtomicInteger mSmCatchupMessageCounter = new AtomicInteger(0);
private boolean mInteractive = false; private boolean mInteractive = false;
private int attempt = 0; private int attempt = 0;
private OnPresencePacketReceived presenceListener = null; private OnPresencePacketReceived presenceListener = null;
@ -772,7 +769,7 @@ public class XmppConnection implements Runnable {
} }
} }
private void processMessage(final Tag currentTag) throws XmlPullParserException, IOException { private void processMessage(final Tag currentTag) throws IOException {
final MessagePacket packet = (MessagePacket) processPacket(currentTag, PACKET_MESSAGE); final MessagePacket packet = (MessagePacket) processPacket(currentTag, PACKET_MESSAGE);
if (!packet.valid()) { if (!packet.valid()) {
Log.e(Config.LOGTAG, "encountered invalid message from='" + packet.getFrom() + "' to='" + packet.getTo() + "'"); Log.e(Config.LOGTAG, "encountered invalid message from='" + packet.getFrom() + "' to='" + packet.getTo() + "'");
@ -781,7 +778,7 @@ public class XmppConnection implements Runnable {
this.messageListener.onMessagePacketReceived(account, packet); this.messageListener.onMessagePacketReceived(account, packet);
} }
private void processPresence(final Tag currentTag) throws XmlPullParserException, IOException { private void processPresence(final Tag currentTag) throws IOException {
PresencePacket packet = (PresencePacket) processPacket(currentTag, PACKET_PRESENCE); PresencePacket packet = (PresencePacket) processPacket(currentTag, PACKET_PRESENCE);
if (!packet.valid()) { if (!packet.valid()) {
Log.e(Config.LOGTAG, "encountered invalid presence from='" + packet.getFrom() + "' to='" + packet.getTo() + "'"); Log.e(Config.LOGTAG, "encountered invalid presence from='" + packet.getFrom() + "' to='" + packet.getTo() + "'");
@ -835,7 +832,7 @@ public class XmppConnection implements Runnable {
return sslSocket; return sslSocket;
} }
private void processStreamFeatures(final Tag currentTag) throws XmlPullParserException, IOException { private void processStreamFeatures(final Tag currentTag) throws IOException {
this.streamFeatures = tagReader.readElement(currentTag); this.streamFeatures = tagReader.readElement(currentTag);
final boolean isSecure = features.encryptionEnabled || Config.ALLOW_NON_TLS_CONNECTIONS || account.isOnion(); final boolean isSecure = features.encryptionEnabled || Config.ALLOW_NON_TLS_CONNECTIONS || account.isOnion();
final boolean needsBinding = !isBound && !account.isOptionSet(Account.OPTION_REGISTER); final boolean needsBinding = !isBound && !account.isOptionSet(Account.OPTION_REGISTER);
@ -1326,7 +1323,7 @@ public class XmppConnection implements Runnable {
iq.query("http://jabber.org/protocol/disco#items"); iq.query("http://jabber.org/protocol/disco#items");
this.sendIqPacket(iq, (account, packet) -> { this.sendIqPacket(iq, (account, packet) -> {
if (packet.getType() == IqPacket.TYPE.RESULT) { if (packet.getType() == IqPacket.TYPE.RESULT) {
HashSet<Jid> items = new HashSet<Jid>(); final HashSet<Jid> items = new HashSet<>();
final List<Element> elements = packet.query().getChildren(); final List<Element> elements = packet.query().getChildren();
for (final Element element : elements) { for (final Element element : elements) {
if (element.getName().equals("item")) { if (element.getName().equals("item")) {
@ -1354,23 +1351,19 @@ public class XmppConnection implements Runnable {
private void sendEnableCarbons() { private void sendEnableCarbons() {
final IqPacket iq = new IqPacket(IqPacket.TYPE.SET); final IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
iq.addChild("enable", "urn:xmpp:carbons:2"); iq.addChild("enable", "urn:xmpp:carbons:2");
this.sendIqPacket(iq, new OnIqPacketReceived() { this.sendIqPacket(iq, (account, packet) -> {
if (!packet.hasChild("error")) {
@Override Log.d(Config.LOGTAG, account.getJid().asBareJid()
public void onIqPacketReceived(final Account account, final IqPacket packet) { + ": successfully enabled carbons");
if (!packet.hasChild("error")) { features.carbonsEnabled = true;
Log.d(Config.LOGTAG, account.getJid().asBareJid() } else {
+ ": successfully enabled carbons"); Log.d(Config.LOGTAG, account.getJid().asBareJid()
features.carbonsEnabled = true; + ": error enableing carbons " + packet.toString());
} else {
Log.d(Config.LOGTAG, account.getJid().asBareJid()
+ ": error enableing carbons " + packet.toString());
}
} }
}); });
} }
private void processStreamError(final Tag currentTag) throws XmlPullParserException, IOException { private void processStreamError(final Tag currentTag) throws IOException {
final Element streamError = tagReader.readElement(currentTag); final Element streamError = tagReader.readElement(currentTag);
if (streamError == null) { if (streamError == null) {
return; return;
@ -1623,8 +1616,8 @@ public class XmppConnection implements Runnable {
} }
public List<String> getMucServersWithholdAccount() { public List<String> getMucServersWithholdAccount() {
List<String> servers = getMucServers(); final List<String> servers = getMucServers();
servers.remove(account.getDomain()); servers.remove(account.getDomain().toEscapedString());
return servers; return servers;
} }
@ -1795,7 +1788,7 @@ public class XmppConnection implements Runnable {
} }
} }
private class StateChangingError extends Error { private static class StateChangingError extends Error {
private final Account.State state; private final Account.State state;
public StateChangingError(Account.State state) { public StateChangingError(Account.State state) {
@ -1803,7 +1796,7 @@ public class XmppConnection implements Runnable {
} }
} }
private class StateChangingException extends IOException { private static class StateChangingException extends IOException {
private final Account.State state; private final Account.State state;
public StateChangingException(Account.State state) { public StateChangingException(Account.State state) {