From aac2fcb7d4b0043b91193325ff2787bdc3a85332 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Thu, 18 Mar 2021 19:48:06 -0400
Subject: [PATCH] Catch more mangadex exceptions

---
 .../tachiyomi/source/online/all/MangaDex.kt   | 23 ++++----
 .../java/exh/md/handlers/FollowsHandler.kt    | 54 ++++++++-----------
 2 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt
index 4efb75915..b98592d15 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt
@@ -205,13 +205,16 @@ class MangaDex(delegate: HttpSource, val context: Context) :
                 add("two_factor", twoFactorCode)
             }
 
-            client.newCall(
-                POST(
-                    "${MdUtil.baseUrl}/ajax/actions.ajax.php?function=login",
-                    headers,
-                    formBody.build()
-                )
-            ).await().closeQuietly()
+            runCatching {
+                client.newCall(
+                    POST(
+                        "${MdUtil.baseUrl}/ajax/actions.ajax.php?function=login",
+                        headers,
+                        formBody.build()
+                    )
+                ).await().closeQuietly()
+            }
+
 
             val response = client.newCall(GET(MdUtil.apiUrl + MdUtil.isLoggedInApi, headers)).await()
 
@@ -235,10 +238,10 @@ class MangaDex(delegate: HttpSource, val context: Context) :
             if (token.isNullOrEmpty()) {
                 return@withIOContext true
             }
-            val result = client.newCall(
-                POST("${MdUtil.baseUrl}/ajax/actions.ajax.php?function=logout", headers).newBuilder().addHeader(REMEMBER_ME, token).build()
-            ).await()
             try {
+                val result = client.newCall(
+                    POST("${MdUtil.baseUrl}/ajax/actions.ajax.php?function=logout", headers).newBuilder().addHeader(REMEMBER_ME, token).build()
+                ).await()
                 val resultStr = withIOContext { result.body?.string() }
                 if (resultStr?.contains("success", true) == true) {
                     network.cookieManager.remove(httpUrl)
diff --git a/app/src/main/java/exh/md/handlers/FollowsHandler.kt b/app/src/main/java/exh/md/handlers/FollowsHandler.kt
index 7038c9273..4f0bd5490 100644
--- a/app/src/main/java/exh/md/handlers/FollowsHandler.kt
+++ b/app/src/main/java/exh/md/handlers/FollowsHandler.kt
@@ -23,6 +23,7 @@ import exh.util.awaitResponse
 import exh.util.floor
 import kotlinx.serialization.decodeFromString
 import okhttp3.CacheControl
+import okhttp3.Call
 import okhttp3.FormBody
 import okhttp3.Headers
 import okhttp3.OkHttpClient
@@ -127,29 +128,24 @@ class FollowsHandler(val client: OkHttpClient, val headers: Headers, val prefere
      */
     suspend fun updateFollowStatus(mangaID: String, followStatus: FollowStatus): Boolean {
         return withIOContext {
-            val response: Response =
-                if (followStatus == FollowStatus.UNFOLLOWED) {
-                    client.newCall(
-                        GET(
-                            "${MdUtil.baseUrl}/ajax/actions.ajax.php?function=manga_unfollow&id=$mangaID&type=$mangaID",
-                            headers,
-                            CacheControl.FORCE_NETWORK
-                        )
+            if (followStatus == FollowStatus.UNFOLLOWED) {
+                client.newCall(
+                    GET(
+                        "${MdUtil.baseUrl}/ajax/actions.ajax.php?function=manga_unfollow&id=$mangaID&type=$mangaID",
+                        headers,
+                        CacheControl.FORCE_NETWORK
                     )
-                        .await()
-                } else {
-                    val status = followStatus.int
-                    client.newCall(
-                        GET(
-                            "${MdUtil.baseUrl}/ajax/actions.ajax.php?function=manga_follow&id=$mangaID&type=$status",
-                            headers,
-                            CacheControl.FORCE_NETWORK
-                        )
+                )
+            } else {
+                val status = followStatus.int
+                client.newCall(
+                    GET(
+                        "${MdUtil.baseUrl}/ajax/actions.ajax.php?function=manga_follow&id=$mangaID&type=$status",
+                        headers,
+                        CacheControl.FORCE_NETWORK
                     )
-                        .await()
-                }
-
-            response.succeeded()
+                )
+            }.succeeded()
         }
     }
 
@@ -160,35 +156,31 @@ class FollowsHandler(val client: OkHttpClient, val headers: Headers, val prefere
                 .add("volume", "0")
                 .add("chapter", track.last_chapter_read.toString())
             xLogD("chapter to update %s", track.last_chapter_read.toString())
-            val response = client.newCall(
+            client.newCall(
                 POST(
                     "${MdUtil.baseUrl}/ajax/actions.ajax.php?function=edit_progress&id=$mangaID",
                     headers,
                     formBody.build()
                 )
-            ).await()
-
-            response.succeeded()
+            ).succeeded()
         }
     }
 
     suspend fun updateRating(track: Track): Boolean {
         return withIOContext {
             val mangaID = MdUtil.getMangaId(track.tracking_url)
-            val response = client.newCall(
+            client.newCall(
                 GET(
                     "${MdUtil.baseUrl}/ajax/actions.ajax.php?function=manga_rating&id=$mangaID&rating=${track.score.toInt()}",
                     headers
                 )
-            ).await()
-
-            response.succeeded()
+            ).succeeded()
         }
     }
 
-    private suspend fun Response.succeeded() = withIOContext {
+    private suspend fun Call.succeeded() = withIOContext {
         try {
-            body?.string().let { body ->
+            await().body?.string().let { body ->
                 (body != null && body.isEmpty()).also {
                     if (!it) xLogD(body)
                 }