Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Exceptions in executeWithTimeoutOrDefault are now correctly handled #1909

Merged
merged 1 commit into from
Jun 12, 2024
Merged

Exceptions in executeWithTimeoutOrDefault are now correctly handled #1909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions app/src/main/java/com/infomaniak/mail/utils/Utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ import com.infomaniak.lib.core.utils.UtilsUi.openUrl
import com.infomaniak.mail.BuildConfig
import com.infomaniak.mail.data.models.Folder.FolderRole
import io.sentry.Sentry
import kotlinx.coroutines.*
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.TimeoutCancellationException
import kotlinx.coroutines.withTimeout
import okhttp3.internal.toHexString
import java.nio.charset.StandardCharsets

Expand Down Expand Up @@ -66,24 +68,15 @@ object Utils {
suspend fun <T> executeWithTimeoutOrDefault(
timeout: Long,
defaultValue: T,
block: CoroutineScope.() -> T,
block: suspend CoroutineScope.() -> T,
onTimeout: (() -> Unit)? = null,
): T = runCatching {
coroutineWithTimeout(timeout, block)
withTimeout(timeout, block)
}.getOrElse {
if (it is TimeoutCancellationException) onTimeout?.invoke() else Sentry.captureException(it)
defaultValue
}

private suspend fun <T> coroutineWithTimeout(
timeout: Long,
block: CoroutineScope.() -> T,
): T = withTimeout(timeout) {
var result: T? = null
CoroutineScope(Dispatchers.Default).launch { result = block() }.join()
result!!
}

fun <T1, T2> waitInitMediator(liveData1: LiveData<T1>, liveData2: LiveData<T2>): MediatorLiveData<Pair<T1, T2>> {

fun areLiveDataInitialized() = liveData1.isInitialized && liveData2.isInitialized
Expand Down
Loading