Mercury-IM/Mercury-IM
Mercury-IM
/
Mercury-IM
mirror of https://codeberg.org/Mercury-IM/Mercury-IM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor XmppConnectionFactory

This commit is contained in:
Paul Schaub 2019-12-22 00:49:30 +01:00
parent 83c3245c36
commit 647695b081
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
2 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
domain/src/main/java/org/mercury_im/messenger/xmpp/MercuryConnection.java
View File

@ -1,17 +1,8 @@
package org.mercury_im.messenger.xmpp;
import org.jivesoftware.smack.AbstractXMPPConnection;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.tcp.XMPPTCPConnection;
import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
import org.jivesoftware.smack.util.stringencoder.BareJidEncoder;
import org.jxmpp.jid.BareJid;
import org.jxmpp.jid.impl.JidCreate;
import org.jxmpp.stringprep.XmppStringprepException;
import org.mercury_im.messenger.entity.Account;
import java.net.Inet4Address;
public class MercuryConnection {
private static final XmppConnectionFactory connectionFactory = new XmppConnectionFactory();
@ -31,25 +22,4 @@ public class MercuryConnection {
public XMPPConnection getConnection() {
return connection;
}
public void ensureAuthenticated() {
}
public static class XmppConnectionFactory {
public AbstractXMPPConnection createConnection(Account account) {
try {
XMPPTCPConnectionConfiguration connectionConfiguration = XMPPTCPConnectionConfiguration.builder()
.setConnectTimeout(10 * 1000)
.setXmppAddressAndPassword(account.getAddress(), account.getPassword())
.setHost(account.getHost() != null ? account.getHost() : JidCreate.domainBareFrom(account.getAddress()).toString())
.setPort(account.getPort() != 0 ? account.getPort() : 5222)
.build();
return new XMPPTCPConnection(connectionConfiguration);
} catch (XmppStringprepException e) {
throw new AssertionError("Account has invalid address: " + account.getAddress(), e);
}
}
}
}

35
domain/src/main/java/org/mercury_im/messenger/xmpp/XmppConnectionFactory.java Normal file
View File

@ -0,0 +1,35 @@
package org.mercury_im.messenger.xmpp;
import org.jivesoftware.smack.AbstractXMPPConnection;
import org.jivesoftware.smack.tcp.XMPPTCPConnection;
import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
import org.jxmpp.jid.impl.JidCreate;
import org.jxmpp.stringprep.XmppStringprepException;
import org.mercury_im.messenger.entity.Account;
public class XmppConnectionFactory {
private static final int DEFAULT_PORT = 5222;
private static final int CONNECTION_TIMEOUT = 30 * 1000;
public AbstractXMPPConnection createConnection(Account account) {
try {
return new XMPPTCPConnection(XMPPTCPConnectionConfiguration.builder()
.setConnectTimeout(CONNECTION_TIMEOUT)
.setXmppAddressAndPassword(account.getAddress(), account.getPassword())
.setHost(determineHost(account))
.setPort(determinePort(account))
.build());
} catch (XmppStringprepException e) {
throw new AssertionError("Account has invalid address: " + account.getAddress(), e);
}
}
private String determineHost(Account account) throws XmppStringprepException {
return account.getHost() != null ? account.getHost() : JidCreate.domainBareFrom(account.getAddress()).toString();
}
private int determinePort(Account account) {
return account.getPort() != 0 ? account.getPort() : DEFAULT_PORT;
}
}