From 8b3ab44c1c01a5c043a8c0226e8e6925c7f94cd1 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Tue, 30 May 2023 20:27:45 +0800
Subject: [PATCH] Cleanup EhSSLSocketFactory

---
 .../ehviewer/client/EhSSLSocketFactory.kt     | 51 ++++---------------
 1 file changed, 9 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhSSLSocketFactory.kt b/app/src/main/java/com/hippo/ehviewer/client/EhSSLSocketFactory.kt
index 067895bce..01ee0b7ab 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhSSLSocketFactory.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhSSLSocketFactory.kt
@@ -25,51 +25,18 @@ import javax.net.ssl.SSLSocket
 import javax.net.ssl.SSLSocketFactory
 
 private const val EXCEPTIONAL_DOMAIN = "hath.network"
+private val sslSocketFactory = SSLSocketFactory.getDefault() as SSLSocketFactory
 
 object EhSSLSocketFactory : SSLSocketFactory() {
-    private val sslSocketFactory = getDefault() as SSLSocketFactory
-    override fun getDefaultCipherSuites(): Array<String> {
-        return sslSocketFactory.defaultCipherSuites
-    }
-
-    override fun getSupportedCipherSuites(): Array<String> {
-        return sslSocketFactory.supportedCipherSuites
-    }
-
+    override fun getDefaultCipherSuites(): Array<String> = sslSocketFactory.defaultCipherSuites
+    override fun getSupportedCipherSuites(): Array<String> = sslSocketFactory.supportedCipherSuites
     override fun createSocket(s: Socket, host: String, port: Int, autoClose: Boolean): Socket {
         val address = s.inetAddress.hostAddress.takeIf { host in builtInHosts || EXCEPTIONAL_DOMAIN in host || host in Settings.dohUrl }
-        val socket = sslSocketFactory.createSocket(s, address ?: host, port, autoClose) as SSLSocket
-        val sslSession = socket.session
-        Log.d(
-            "EhSSLSocketFactory",
-            "Host: " + host + " Address: " + address + " Protocol:" + sslSession.protocol + " CipherSuite:" + sslSession.cipherSuite,
-        )
-        return socket
-    }
-
-    override fun createSocket(host: String, port: Int): Socket {
-        return sslSocketFactory.createSocket(host, port)
-    }
-
-    override fun createSocket(
-        host: String,
-        port: Int,
-        localHost: InetAddress,
-        localPort: Int,
-    ): Socket {
-        return sslSocketFactory.createSocket(host, port, localHost, localPort)
-    }
-
-    override fun createSocket(host: InetAddress, port: Int): Socket {
-        return sslSocketFactory.createSocket(host, port)
-    }
-
-    override fun createSocket(
-        address: InetAddress,
-        port: Int,
-        localAddress: InetAddress,
-        localPort: Int,
-    ): Socket {
-        return sslSocketFactory.createSocket(address, port, localAddress, localPort)
+        Log.d("EhSSLSocketFactory", "Host: $host Address: $address")
+        return sslSocketFactory.createSocket(s, address ?: host, port, autoClose) as SSLSocket
     }
+    override fun createSocket(host: String, port: Int): Socket = sslSocketFactory.createSocket(host, port)
+    override fun createSocket(host: String, port: Int, localHost: InetAddress, localPort: Int): Socket = sslSocketFactory.createSocket(host, port, localHost, localPort)
+    override fun createSocket(host: InetAddress, port: Int): Socket = sslSocketFactory.createSocket(host, port)
+    override fun createSocket(address: InetAddress, port: Int, localAddress: InetAddress, localPort: Int): Socket = sslSocketFactory.createSocket(address, port, localAddress, localPort)
 }