Use TLSv1.3 if available

Author: abelgardep

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java

@@ -71,16 +71,21 @@ public static OkHttpClient getOkHttpClient() {
                 SSLContext sslContext;
 
                 try {
-                    sslContext = SSLContext.getInstance("TLSv1.2");
-                } catch (NoSuchAlgorithmException tlsv12Exception) {
+                    sslContext = SSLContext.getInstance("TLSv1.3");
+                } catch (NoSuchAlgorithmException tlsv13Exception) {
                     try {
-                        Timber.w("TLSv1.2 is not supported in this device; falling through TLSv1.1");
-                        sslContext = SSLContext.getInstance("TLSv1.1");
-                    } catch (NoSuchAlgorithmException tlsv11Exception) {
-                        Timber.w("TLSv1.1 is not supported in this device; falling through TLSv1.0");
-                        sslContext = SSLContext.getInstance("TLSv1");
-                        // should be available in any device; see reference of supported protocols in
-                        // http://developer.android.com/reference/javax/net/ssl/SSLSocket.html
+                        Timber.w("TLSv1.3 is not supported in this device; falling through TLSv1.2");
+                        sslContext = SSLContext.getInstance("TLSv1.2");
+                    } catch (NoSuchAlgorithmException tlsv12Exception) {
+                        try {
+                            Timber.w("TLSv1.2 is not supported in this device; falling through TLSv1.1");
+                            sslContext = SSLContext.getInstance("TLSv1.1");
+                        } catch (NoSuchAlgorithmException tlsv11Exception) {
+                            Timber.w("TLSv1.1 is not supported in this device; falling through TLSv1.0");
+                            sslContext = SSLContext.getInstance("TLSv1");
+                            // should be available in any device; see reference of supported protocols in
+                            // http://developer.android.com/reference/javax/net/ssl/SSLSocket.html
+                        }
                     }
                 }
 

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/TLSSocketFactory.java

@@ -74,8 +74,8 @@ public Socket createSocket(InetAddress address, int port, InetAddress localAddre
     }
 
     private Socket enableTLSOnSocket(Socket socket) {
-        if(socket != null && (socket instanceof SSLSocket)) {
-            ((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1.2"});
+        if((socket instanceof SSLSocket)) {
+            ((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1.2", "TLSv1.3"});
         }
         return socket;
     }