(Almost) Full OkHTTP implementation

app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt

@@ -48,6 +48,7 @@ import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.adapters.ThumbnailPageAdapter
+import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.ui.ReaderActivity
 import xyz.quaver.pupil.util.ItemClickSupport
@@ -81,7 +82,7 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                 context.startActivity(Intent(context, ReaderActivity::class.java).apply {
                     putExtra("galleryID", galleryID)
                 })
-                (context.applicationContext as Pupil).histories.add(galleryID)
+                histories.add(galleryID)
             }
         }
 
@@ -264,7 +265,7 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                         context.startActivity(Intent(context, ReaderActivity::class.java).apply {
                             putExtra("galleryID", galleries[position].id)
                         })
-                        (context.applicationContext as Pupil).histories.add(galleries[position].id)
+                        histories.add(galleries[position].id)
                     }
                     onItemLongClickListener = { _, position, _ ->
                         GalleryDialog(

app/src/main/java/xyz/quaver/pupil/ui/dialog/ProxyDialog.kt

@@ -31,8 +31,10 @@ import androidx.preference.PreferenceManager
 import kotlinx.android.synthetic.main.dialog_proxy.view.*
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import xyz.quaver.proxy
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.client
+import xyz.quaver.pupil.clientBuilder
+import xyz.quaver.pupil.clientHolder
 import xyz.quaver.pupil.util.ProxyInfo
 import xyz.quaver.pupil.util.getProxyInfo
 import java.net.Proxy
@@ -117,12 +119,15 @@ class ProxyDialog(context: Context) : Dialog(context) {
             }
 
             ProxyInfo(type, addr, port, username, password).let {
-
                 PreferenceManager.getDefaultSharedPreferences(context).edit().putString("proxy",
                     Json.encodeToString(it)
                 ).apply()
 
-                proxy = it.proxy()
+                clientBuilder
+                    .proxy(it.proxy())
+                    .proxyAuthenticator(it.authenticator())
+                clientHolder = null
+                client
             }
 
             dismiss()