Increasing timeout to account for slower connections.
This commit is contained in:
@@ -22,8 +22,8 @@ object HttpClient {
|
|||||||
this.internalProxy = proxy
|
this.internalProxy = proxy
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getHttpClient(): OkHttpClient {
|
fun getHttpClient(timeout: Duration): OkHttpClient {
|
||||||
val seconds = if (internalProxy != null) 20L else 10L
|
val seconds = if (internalProxy != null) timeout.seconds * 2 else timeout.seconds
|
||||||
val duration = Duration.ofSeconds(seconds)
|
val duration = Duration.ofSeconds(seconds)
|
||||||
return OkHttpClient.Builder()
|
return OkHttpClient.Builder()
|
||||||
.proxy(internalProxy)
|
.proxy(internalProxy)
|
||||||
@@ -33,6 +33,10 @@ object HttpClient {
|
|||||||
.build()
|
.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun getHttpClient(): OkHttpClient {
|
||||||
|
return getHttpClient(Duration.ofSeconds(10L))
|
||||||
|
}
|
||||||
|
|
||||||
fun getProxy(): Proxy? {
|
fun getProxy(): Proxy? {
|
||||||
return internalProxy
|
return internalProxy
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import okio.BufferedSink
|
|||||||
import okio.IOException
|
import okio.IOException
|
||||||
import okio.source
|
import okio.source
|
||||||
import java.io.InputStream
|
import java.io.InputStream
|
||||||
|
import java.time.Duration
|
||||||
import java.util.Base64
|
import java.util.Base64
|
||||||
|
|
||||||
val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
|
val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
|
||||||
@@ -86,7 +87,7 @@ class ImageUploader(val account: Account?) {
|
|||||||
val fileName = randomChars()
|
val fileName = randomChars()
|
||||||
val extension = contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
|
val extension = contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
|
||||||
|
|
||||||
val client = HttpClient.getHttpClient()
|
val client = HttpClient.getHttpClient(Duration.ofSeconds(30L))
|
||||||
val requestBody: RequestBody
|
val requestBody: RequestBody
|
||||||
val requestBuilder = Request.Builder()
|
val requestBuilder = Request.Builder()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user