Increase timeout settings via ktor plugin and remove redundant OkHttp timeouts (#685)

Author: sunkup

app/src/main/java/at/bitfire/icsdroid/AppHttpClient.kt

@@ -16,11 +16,11 @@ import io.ktor.client.engine.HttpClientEngine
 import io.ktor.client.engine.okhttp.OkHttp
 import io.ktor.client.engine.okhttp.OkHttpConfig
 import io.ktor.client.engine.okhttp.OkHttpEngine
+import io.ktor.client.plugins.HttpTimeout
 import io.ktor.client.plugins.UserAgent
 import kotlinx.coroutines.flow.MutableStateFlow
 import okhttp3.brotli.BrotliInterceptor
 import okhttp3.internal.tls.OkHostnameVerifier
-import java.util.concurrent.TimeUnit
 import javax.net.ssl.SSLContext
 
 class AppHttpClient @AssistedInject constructor(
@@ -57,13 +57,18 @@ class AppHttpClient @AssistedInject constructor(
             agent = userAgent
         }
 
+        // Increase default timeouts
+        install(HttpTimeout) {
+            connectTimeoutMillis = 20_000
+            requestTimeoutMillis = 60_000
+            socketTimeoutMillis = 60_000
+        }
+
         @Suppress("UNCHECKED_CAST")
         if (engine is OkHttpEngine) (this as HttpClientConfig<OkHttpConfig>).engine {
             addNetworkInterceptor(BrotliInterceptor)
             config {
                 followRedirects(false)
-                connectTimeout(20, TimeUnit.SECONDS)
-                readTimeout(60, TimeUnit.SECONDS)
                 sslSocketFactory(sslContext.socketFactory, certManager)
                 hostnameVerifier(certManager.HostnameVerifier(OkHostnameVerifier))
             }