Merge branch 'issue-65' into dev

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

@@ -23,6 +23,7 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
 import android.content.SharedPreferences
+import android.util.Log
 import android.util.SparseArray
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -40,6 +41,7 @@ import xyz.quaver.hitomi.urlFromUrlFromHash
 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.ui.ReaderActivity
 import java.io.IOException
@@ -159,6 +161,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         OkHttpClient.Builder()
             .addInterceptor(interceptor)
             .dispatcher(Dispatcher(Executors.newFixedThreadPool(4)))
+            .proxy(proxy)
             .build()
 
     fun stop() {
@@ -229,7 +232,10 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
             tag(galleryID to index)
         }.build()
 
-        clients[galleryID].newCall(request).enqueue(callback)
+        if (clients.get(galleryID) == null)
+            clients.put(galleryID, buildClient())
+
+        clients[galleryID]?.newCall(request)?.enqueue(callback)
     }
 
     private fun download(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
@@ -254,6 +260,8 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         }.toMutableList())
         exception.put(galleryID, reader.galleryInfo.map { null }.toMutableList())
 
+        Log.i("PUPILD", "READER HERE!")
+
         if (notification[galleryID] == null)
             initNotification(galleryID)
 
@@ -271,8 +279,6 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
             return@launch
         }
 
-        clients.put(galleryID, buildClient())
-
         for (i in reader.galleryInfo.indices) {
             val callback = object : Callback {
                 override fun onFailure(call: Call, e: IOException) {

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

@@ -0,0 +1,63 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.util
+
+import android.content.Context
+import androidx.preference.PreferenceManager
+import kotlinx.serialization.Serializable
+import okhttp3.Authenticator
+import okhttp3.Credentials
+import java.net.InetSocketAddress
+import java.net.Proxy
+
+@Serializable
+data class ProxyInfo(
+    val type: Proxy.Type,
+    val host: String? = null,
+    val port: Int? = null,
+    val username: String? = null,
+    val password: String? = null
+) {
+    fun proxy() : Proxy {
+        return if (host == null || port == null)
+            return Proxy.NO_PROXY
+        else
+            Proxy(type, InetSocketAddress.createUnresolved(host, port))
+    }
+
+    fun authenticator() = Authenticator { _, response ->
+        val credential = Credentials.basic(username, password)
+
+        response.request().newBuilder()
+            .header("Proxy-Authorization", credential)
+            .build()
+    }
+
+}
+
+fun getProxy(context: Context) =
+    getProxyInfo(context).proxy()
+
+fun getProxyInfo(context: Context) =
+    PreferenceManager.getDefaultSharedPreferences(context).getString("proxy", null).let {
+        if (it == null)
+            ProxyInfo(Proxy.Type.DIRECT)
+        else
+            json.parse(ProxyInfo.serializer(), it)
+    }