From a8da645be3883c29e661f70322356e3e30fa0f5d Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Wed, 29 Nov 2023 16:48:11 -0500
Subject: [PATCH] Increasing timeout to account for slower connections.

---
 .../java/com/vitorpamplona/amethyst/service/HttpClient.kt | 8 ++++++--
 .../vitorpamplona/amethyst/ui/actions/ImageUploader.kt    | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/HttpClient.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/HttpClient.kt
index a39e73226..48a83009d 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/HttpClient.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/HttpClient.kt
@@ -22,8 +22,8 @@ object HttpClient {
         this.internalProxy = proxy
     }
 
-    fun getHttpClient(): OkHttpClient {
-        val seconds = if (internalProxy != null) 20L else 10L
+    fun getHttpClient(timeout: Duration): OkHttpClient {
+        val seconds = if (internalProxy != null) timeout.seconds * 2 else timeout.seconds
         val duration = Duration.ofSeconds(seconds)
         return OkHttpClient.Builder()
             .proxy(internalProxy)
@@ -33,6 +33,10 @@ object HttpClient {
             .build()
     }
 
+    fun getHttpClient(): OkHttpClient {
+        return getHttpClient(Duration.ofSeconds(10L))
+    }
+
     fun getProxy(): Proxy? {
         return internalProxy
     }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt
index b9f3f2cf2..b01d320be 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt
@@ -22,6 +22,7 @@ import okio.BufferedSink
 import okio.IOException
 import okio.source
 import java.io.InputStream
+import java.time.Duration
 import java.util.Base64
 
 val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
@@ -86,7 +87,7 @@ class ImageUploader(val account: Account?) {
         val fileName = randomChars()
         val extension = contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
 
-        val client = HttpClient.getHttpClient()
+        val client = HttpClient.getHttpClient(Duration.ofSeconds(30L))
         val requestBody: RequestBody
         val requestBuilder = Request.Builder()