From 464f2b01a1363890fbe28961fce6d485f0046b6f Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sat, 24 Jul 2021 12:38:55 -0400 Subject: [PATCH] Manually try authenticating mangadex logout, skip if it fails --- .../main/java/exh/md/network/MangaDexLoginHelper.kt | 12 +++++++++++- 1 file changed, 11 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 940e949c7..4b37cd3bc 100644 --- a/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt +++ b/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt @@ -71,7 +71,17 @@ class MangaDexLoginHelper(val authServiceLazy: Lazy, val pr suspend fun logout() { return withIOContext { - authService.logout() + try { + if (isAuthenticated()) { + authService.logout() + } else { + if (refreshToken()) { + authService.logout() + } + } + } catch (e: Exception) { + if (e is CancellationException) throw e + } } } }