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

catch IllegalArgumentException caused by invalid custom hostname

Browse source
This commit is contained in:
Daniel Gultsch 2017-07-16 21:02:56 +02:00
parent 2dce71cd96
commit febee9863f
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -300,11 +300,9 @@ public class XmppConnection implements Runnable {
this.verifiedHostname = account.getHostname(); this.verifiedHostname = account.getHostname();
InetSocketAddress address = new InetSocketAddress(this.verifiedHostname, account.getPort());
features.encryptionEnabled = account.getPort() == 5223;
try { try {
InetSocketAddress address = new InetSocketAddress(this.verifiedHostname, account.getPort());
features.encryptionEnabled = address.getPort() == 5223;
if (features.encryptionEnabled) { if (features.encryptionEnabled) {
try { try {
final TlsFactoryVerifier tlsFactoryVerifier = getTlsFactoryVerifier(); final TlsFactoryVerifier tlsFactoryVerifier = getTlsFactoryVerifier();
@ -317,14 +315,13 @@ public class XmppConnection implements Runnable {
throw new StateChangingException(Account.State.TLS_ERROR); throw new StateChangingException(Account.State.TLS_ERROR);
} }
} catch (KeyManagementException e) { } catch (KeyManagementException e) {
features.encryptionEnabled = false; throw new StateChangingException(Account.State.TLS_ERROR);
localSocket = new Socket();
} }
} else { } else {
localSocket = new Socket(); localSocket = new Socket();
localSocket.connect(address, Config.SOCKET_TIMEOUT * 1000); localSocket.connect(address, Config.SOCKET_TIMEOUT * 1000);
} }
} catch (IOException e) { } catch (IOException | IllegalArgumentException e) {
throw new UnknownHostException(); throw new UnknownHostException();
} }
try { try {