From a2df6a7f1179150e1e184f1f2d1720d7b31546d5 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sat, 18 Dec 2021 21:45:34 -0500 Subject: [PATCH] Fix Mangadex logout crashes --- app/src/main/java/exh/md/network/MangaDexLoginHelper.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt b/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt index 45a70134c..c8c1e10de 100644 --- a/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt +++ b/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt @@ -46,6 +46,7 @@ class MangaDexLoginHelper(val authServiceLazy: Lazy, val pr return withIOContext { val loginRequest = LoginRequestDto(username, password) val loginResult = runCatching { authService.login(loginRequest) } + .onFailure { this@MangaDexLoginHelper.xLogE("Error logging in", it) } val e = loginResult.exceptionOrNull() if (e is CancellationException) throw e @@ -77,7 +78,12 @@ class MangaDexLoginHelper(val authServiceLazy: Lazy, val pr suspend fun logout() { return withIOContext { withTimeoutOrNull(10.seconds) { - authService.logout() + runCatching { + authService.logout() + }.onFailure { + if (it is CancellationException) throw it + this@MangaDexLoginHelper.xLogE("Error logging out", it) + } } } }