Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Add a 5s timeout to avoid infinite loading (actually waiting for network timeout which can be long and is harder to configure).

Browse source
This commit is contained in:
Benoit Marty 2023-06-09 18:34:00 +02:00
parent 6b1809ed3b
commit cdf89e86d6
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverResolver.kt
View file

@ -30,6 +30,7 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import kotlinx.coroutines.withTimeout
import java.util.Collections import java.util.Collections
import javax.inject.Inject import javax.inject.Inject
@ -56,7 +57,11 @@ class HomeserverResolver @Inject constructor(
withContext(dispatchers.io) { withContext(dispatchers.io) {
list.map { list.map {
async { async {
val wellKnown = tryOrNull { wellknownRequest.execute(it) } val wellKnown = tryOrNull {
withTimeout(5000) {
wellknownRequest.execute(it)
}
}
val isValid = wellKnown?.isValid().orFalse() val isValid = wellKnown?.isValid().orFalse()
if (isValid) { if (isValid) {
val supportSlidingSync = wellKnown?.supportSlidingSync().orFalse() val supportSlidingSync = wellKnown?.supportSlidingSync().orFalse()