(Almost) Full OkHTTP implementation

app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt

@@ -28,14 +28,13 @@ import kotlinx.coroutines.*
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import okhttp3.Dispatcher
 import xyz.quaver.Code
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.Reader
-import xyz.quaver.proxy
 import xyz.quaver.pupil.util.getCachedGallery
 import xyz.quaver.pupil.util.getDownloadDirectory
 import xyz.quaver.pupil.util.isParentOf
+import xyz.quaver.readBytes
 import java.io.BufferedInputStream
 import java.io.File
 import java.io.FileOutputStream
@@ -91,11 +90,12 @@ class Cache(context: Context) : ContextWrapper(context) {
         @Suppress("BlockingMethodInNonBlockingContext")
         val thumbnail = if (metadata?.thumbnail == null)
             withContext(Dispatchers.IO) {
-                val thumbnails = getGalleryBlock(galleryID)?.thumbnails
+                val thumbnail = getGalleryBlock(galleryID)?.thumbnails?.firstOrNull() ?: return@withContext null
                 try {
-                    Base64.encodeToString(URL(thumbnails?.firstOrNull()).openConnection(proxy).getInputStream().use {
-                        it.readBytes()
-                    }, Base64.DEFAULT)
+                    val data = URL(thumbnail).readBytes().apply {
+                        if (isEmpty()) return@withContext null
+                    }
+                    Base64.encodeToString(data, Base64.DEFAULT)
                 } catch (e: Exception) {
                     null
                 }
@@ -178,7 +178,7 @@ class Cache(context: Context) : ContextWrapper(context) {
                     retval = try {
                         withContext(Dispatchers.IO) {
                             withTimeoutOrNull(1000) {
-                                    source.value.invoke()
+                                source.value.invoke()
                             }
                         }
                     } catch (e: Exception) {

app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt

@@ -40,13 +40,13 @@ import xyz.quaver.hitomi.imageUrlFromImage
 import xyz.quaver.hiyobi.cookie
 import xyz.quaver.hiyobi.createImgList
 import xyz.quaver.hiyobi.user_agent
-import xyz.quaver.proxy
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.client
+import xyz.quaver.pupil.interceptors
 import xyz.quaver.pupil.ui.ReaderActivity
 import java.io.File
 import java.io.IOException
 import java.util.concurrent.LinkedBlockingQueue
-import java.util.concurrent.TimeUnit
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class DownloadWorker private constructor(context: Context) : ContextWrapper(context) {
@@ -86,7 +86,6 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         }
 
         private fun source(source: Source) = object: ForwardingSource(source) {
-
             var totalBytesRead = 0L
 
             override fun read(sink: Buffer, byteCount: Long): Long {
@@ -100,6 +99,24 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
 
         }
     }
+
+    init {
+        interceptors[Pair::class] =  { chain ->
+            val request = chain.request()
+            var response = chain.proceed(request)
+
+            var retry = 5
+            while (!response.isSuccessful && retry > 0) {
+                response = chain.proceed(request)
+                retry--
+            }
+
+            response.newBuilder()
+                .body(response.body()?.let {
+                    ProgressResponseBody(request.tag(), it, progressListener)
+                }).build()
+        }
+    }
     //endregion
 
     //region Singleton
@@ -135,34 +152,6 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
     private val loop = loop()
     private val worker = SparseArray<Job?>()
 
-    val interceptor = Interceptor { chain ->
-        val request = chain.request()
-        var response = chain.proceed(request)
-
-        var retry = 5
-        while (!response.isSuccessful && retry > 0) {
-            response = chain.proceed(request)
-            retry--
-        }
-
-        response.newBuilder()
-            .body(response.body()?.let {
-                ProgressResponseBody(request.tag(), it, progressListener)
-            }).build()
-    }
-
-    val client : OkHttpClient =
-        OkHttpClient.Builder()
-            .connectTimeout(0, TimeUnit.SECONDS)
-            .addInterceptor(interceptor)
-            .readTimeout(0, TimeUnit.SECONDS)
-            .dispatcher(Dispatcher().apply {
-                maxRequests = 4
-                maxRequestsPerHost = 4
-            })
-            .proxy(proxy)
-            .build()
-
     fun stop() {
         queue.clear()
 
@@ -300,8 +289,8 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
                     val ext = call.request().url().encodedPath().split('.').last()
 
                     try {
-                        response.body().use {
-                            Cache(this@DownloadWorker).putImage(galleryID, i, ext, it!!.byteStream())
+                        response.body()!!.use {
+                            Cache(this@DownloadWorker).putImage(galleryID, i, ext, it.byteStream())
                         }
                         progress[galleryID]?.set(i, Float.POSITIVE_INFINITY)
 

app/src/main/java/xyz/quaver/pupil/util/misc.kt

@@ -53,7 +53,7 @@ fun byteToString(byte: Long, precision : Int = 1) : String {
 
 }
 
-/*
+/**
  * Convert android generated ID to requestCode
  * to prevent java.lang.IllegalArgumentException: Can only use lower 16 bits for requestCode
  *

app/src/main/java/xyz/quaver/pupil/util/proxy.kt

@@ -23,8 +23,7 @@ import androidx.preference.PreferenceManager
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import okhttp3.Authenticator
-import okhttp3.Credentials
+import okhttp3.*
 import java.net.InetSocketAddress
 import java.net.Proxy
 

app/src/main/java/xyz/quaver/pupil/util/update.kt

@@ -35,6 +35,7 @@ import okhttp3.*
 import ru.noties.markwon.Markwon
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.client
 import java.io.File
 import java.io.IOException
 import java.net.URL
@@ -187,7 +188,7 @@ fun restore(favorites: GalleryList, url: String, onFailure: ((Exception) -> Unit
         .get()
         .build()
 
-    OkHttpClient().newCall(request).enqueue(object: Callback {
+    client.newCall(request).enqueue(object: Callback {
         override fun onFailure(call: Call, e: IOException) {
             onFailure?.invoke(e)
         }