Swiftdiff options
| author | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-07-27 15:01:45 (GMT) |
|---|---|---|
| committer | Alex Clayton <alex.clayton@isode.com> | 2016-01-12 11:31:04 (GMT) |
| commit | b4cf2bb8d7b69d95b4a10d610ad259998d2aee5b (patch) | |
| tree | b942953236a7c712eed6ce4a5f261019691c0dca /src/com/isode/stroke/network/JavaNetworkFactories.java | |
| parent | c168fcd0c2468ec939b8d164175e9c5776a63147 (diff) | |
| download | stroke-b4cf2bb8d7b69d95b4a10d610ad259998d2aee5b.zip stroke-b4cf2bb8d7b69d95b4a10d610ad259998d2aee5b.tar.bz2 | |
Make Networks equivalent with Swiften.
Adds ProxyProviders, DomainNameResolvers and DummyConnection.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
Tests added for ChainedConnector, Connector and HostAddress.
Test also added for ComponentConnector, which needed bits of Network.
Five assertions are commented in ConnectorTest, which fails and will be updated after review.
Change-Id: I8a62841eb2f9c109bc3a94865b7a003b33493e11
Diffstat (limited to 'src/com/isode/stroke/network/JavaNetworkFactories.java')
| -rw-r--r-- | src/com/isode/stroke/network/JavaNetworkFactories.java | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/src/com/isode/stroke/network/JavaNetworkFactories.java b/src/com/isode/stroke/network/JavaNetworkFactories.java index 15860e0..b71c220 100644 --- a/src/com/isode/stroke/network/JavaNetworkFactories.java +++ b/src/com/isode/stroke/network/JavaNetworkFactories.java @@ -9,6 +9,8 @@ import com.isode.stroke.crypto.JavaCryptoProvider; import com.isode.stroke.eventloop.EventLoop; import com.isode.stroke.tls.PlatformTLSFactories; import com.isode.stroke.tls.TLSContextFactory; +import com.isode.stroke.idn.IDNConverter; +import com.isode.stroke.idn.ICUConverter; public class JavaNetworkFactories implements NetworkFactories { @@ -16,9 +18,11 @@ public class JavaNetworkFactories implements NetworkFactories { eventLoop_ = eventLoop; timers_ = new JavaTimerFactory(eventLoop_); connections_ = new JavaConnectionFactory(eventLoop_); - dns_ = new PlatformDomainNameResolver(eventLoop_); platformTLSFactories_ = new PlatformTLSFactories(); cryptoProvider_ = new JavaCryptoProvider(); + idnConverter_ = new ICUConverter(); + dns_ = new PlatformDomainNameResolver(idnConverter_, eventLoop_); + proxyProvider_ = new JavaProxyProvider(); } public TimerFactory getTimerFactory() { @@ -36,16 +40,31 @@ public class JavaNetworkFactories implements NetworkFactories { public TLSContextFactory getTLSContextFactory() { return platformTLSFactories_.getTLSContextFactory(); } - + + public ProxyProvider getProxyProvider() { + return proxyProvider_; + } + + public EventLoop getEventLoop() { + return eventLoop_; + } + @Override public CryptoProvider getCryptoProvider() { return cryptoProvider_; } + @Override + public IDNConverter getIDNConverter() { + return idnConverter_; + } + private final EventLoop eventLoop_; private final JavaTimerFactory timers_; private final JavaConnectionFactory connections_; private final PlatformDomainNameResolver dns_; private final PlatformTLSFactories platformTLSFactories_; + private final ProxyProvider proxyProvider_; private final CryptoProvider cryptoProvider_; + private final IDNConverter idnConverter_; } |