From 9916d892965d4056da1bf25335a7a3001f721eef Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sun, 1 Aug 2021 21:56:04 -0400
Subject: [PATCH] New attempt to logout

---
 .../java/exh/md/network/MangaDexLoginHelper.kt     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt b/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt
index 4b37cd3bc..8d0571206 100644
--- a/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt
+++ b/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt
@@ -9,7 +9,8 @@ import exh.md.dto.LoginRequestDto
 import exh.md.dto.RefreshTokenDto
 import exh.md.service.MangaDexAuthService
 import exh.md.utils.MdUtil
-import kotlinx.coroutines.CancellationException
+import exh.util.seconds
+import kotlinx.coroutines.*
 import kotlinx.serialization.encodeToString
 
 class MangaDexLoginHelper(val authServiceLazy: Lazy<MangaDexAuthService>, val preferences: PreferencesHelper, val mdList: MdList) {
@@ -72,11 +73,14 @@ class MangaDexLoginHelper(val authServiceLazy: Lazy<MangaDexAuthService>, val pr
     suspend fun logout() {
         return withIOContext {
             try {
-                if (isAuthenticated()) {
-                    authService.logout()
-                } else {
-                    if (refreshToken()) {
+                coroutineScope {
+                    launch {
                         authService.logout()
+                        cancel()
+                    }
+                    launch {
+                        delay(30.seconds)
+                        cancel()
                     }
                 }
             } catch (e: Exception) {