gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Refactored 'createSocket' method in PlatformSocket

Browse source
This commit is contained in:
alexzatsepin 2016-12-13 20:18:26 +03:00
parent 189b170961
commit e482011ef2
1 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
android/src/com/mapswithme/maps/location/PlatformSocket.java
View file

@ -63,7 +63,7 @@ class PlatformSocket
{
String externalDir = StorageUtils.getExternalFilesDir();
if (!TextUtils.isEmpty(externalDir))
return new FileLogger(externalDir + "/socket.log");
return new FileLogger(externalDir + "/" + PlatformSocket.class.getSimpleName() + ".log");
}
return new DebugLogger(PlatformSocket.class.getSimpleName());
}
@ -103,35 +103,43 @@ class PlatformSocket
@Nullable
private static Socket createSocket(@NonNull String host, int port, boolean ssl)
{
Socket socket = null;
if (ssl)
{
try
{
SocketFactory sf = getSocketFactory();
socket = sf.createSocket(host, port);
sSslConnectionCounter++;
LOGGER.d("###############################################################################");
LOGGER.d(sSslConnectionCounter + " ssl connection is established.");
} catch (IOException e)
{
LOGGER.e(e, "Failed to create the ssl socket, mHost = " + host + " mPort = " + port);
}
} else
{
try
{
socket = new Socket(host, port);
LOGGER.d("Ssl socket is created and ssl handshake is passed successfully");
} catch (IOException e)
{
LOGGER.e(e, "Failed to create the socket, mHost = " + host + " mPort = " + port);
}
}
return ssl ? createSslSocket(host, port) : createRegularSocket(host, port);
}
@Nullable
private static Socket createSslSocket(@NonNull String host, int port)
{
Socket socket = null;
try
{
SocketFactory sf = getSocketFactory();
socket = sf.createSocket(host, port);
sSslConnectionCounter++;
LOGGER.d("###############################################################################");
LOGGER.d(sSslConnectionCounter + " ssl connection is established.");
}
catch (IOException e)
{
LOGGER.e(e, "Failed to create the ssl socket, mHost = " + host + " mPort = " + port);
}
return socket;
}
@Nullable
private static Socket createRegularSocket(@NonNull String host, int port)
{
Socket socket = null;
try
{
socket = new Socket(host, port);
LOGGER.d("Regular socket is created and tcp handshake is passed successfully");
}
catch (IOException e)
{
LOGGER.e(e, "Failed to create the socket, mHost = " + host + " mPort = " + port);
}
return socket;
}
@SuppressLint("SSLCertificateSocketFactoryGetInsecure")
@NonNull