From 5a1bf79e4b844ba2deffc5d2ce5c781c9ceba11f Mon Sep 17 00:00:00 2001 From: kalarina Date: Sun, 25 Oct 2026 12:23:46 +0200 Subject: [PATCH] Derive all OkHttp clients from one shared base client The DoH transport keeps its own connection pool and no longer creates the dispatcher's thread pool only to shut it down. --- .../java/cc/skysparkle/sparkledns/Blocklist.kt | 3 +-- .../java/cc/skysparkle/sparkledns/DohClient.kt | 11 +++++++---- app/src/main/java/cc/skysparkle/sparkledns/Http.kt | 14 ++++++++++++++ .../java/cc/skysparkle/sparkledns/Providers.kt | 4 +--- 4 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 app/src/main/java/cc/skysparkle/sparkledns/Http.kt diff --git a/app/src/main/java/cc/skysparkle/sparkledns/Blocklist.kt b/app/src/main/java/cc/skysparkle/sparkledns/Blocklist.kt index df886a1..476d937 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/Blocklist.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/Blocklist.kt @@ -379,8 +379,7 @@ private class BlocklistStore(context: Context) { companion object { val client: OkHttpClient by lazy { - OkHttpClient.Builder() - .connectTimeout(15, TimeUnit.SECONDS) + Http.client.newBuilder() .readTimeout(60, TimeUnit.SECONDS) .build() } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/DohClient.kt b/app/src/main/java/cc/skysparkle/sparkledns/DohClient.kt index fa1f91e..f40e36d 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/DohClient.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/DohClient.kt @@ -10,10 +10,10 @@ import android.net.http.UrlResponseInfo import android.os.Build import android.util.Log import androidx.annotation.RequiresApi +import okhttp3.ConnectionPool import okhttp3.Dns import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.MediaType.Companion.toMediaType -import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.RequestBody.Companion.toRequestBody import java.io.ByteArrayOutputStream @@ -91,7 +91,11 @@ private class OkHttpTransport(private val provider: DohProvider) : Transport { private val url by lazy { provider.url.toHttpUrl() } - private val client = OkHttpClient.Builder() + // Its own connection pool, so stopping a session drops only DoH connections + private val pool = ConnectionPool() + + private val client = Http.client.newBuilder() + .connectionPool(pool) .dns(BootstrapDns(provider.bootstrap)) .connectTimeout(5, TimeUnit.SECONDS) .readTimeout(5, TimeUnit.SECONDS) @@ -118,8 +122,7 @@ private class OkHttpTransport(private val provider: DohProvider) : Transport { } override fun shutdown() { - client.dispatcher.executorService.shutdown() - client.connectionPool.evictAll() + pool.evictAll() } private companion object { diff --git a/app/src/main/java/cc/skysparkle/sparkledns/Http.kt b/app/src/main/java/cc/skysparkle/sparkledns/Http.kt new file mode 100644 index 0000000..e6aaf1c --- /dev/null +++ b/app/src/main/java/cc/skysparkle/sparkledns/Http.kt @@ -0,0 +1,14 @@ +package cc.skysparkle.sparkledns + +import okhttp3.OkHttpClient +import java.util.concurrent.TimeUnit + +// Base for every OkHttp client in the app. Clients made with newBuilder() share its dispatcher +// and thread pools, and its connection pool unless they bring their own. +internal object Http { + val client: OkHttpClient by lazy { + OkHttpClient.Builder() + .connectTimeout(15, TimeUnit.SECONDS) + .build() + } +} diff --git a/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt b/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt index 03a31f8..dcd0f4f 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt @@ -4,7 +4,6 @@ import android.content.Context import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import okhttp3.HttpUrl.Companion.toHttpUrlOrNull -import okhttp3.OkHttpClient import okhttp3.Request import java.io.File import java.io.IOException @@ -74,8 +73,7 @@ object ServerList { @Volatile private var loaded = false private val client by lazy { - OkHttpClient.Builder() - .connectTimeout(15, TimeUnit.SECONDS) + Http.client.newBuilder() .readTimeout(30, TimeUnit.SECONDS) .build() }