From 0fb6bc0d44fb25397c03086d95194676619b013e Mon Sep 17 00:00:00 2001 From: Alessandro Jean Date: Tue, 3 Aug 2021 13:15:09 -0300 Subject: [PATCH] Fix User Agent block error not showing at Tsuki (#8381) * Fix UA error not showing at Tsuki. * Add missing HTTP code in if. --- src/pt/tsukimangas/build.gradle | 2 +- .../extension/pt/tsukimangas/TsukiMangas.kt | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/pt/tsukimangas/build.gradle b/src/pt/tsukimangas/build.gradle index 8f23d49d4..be6bef534 100644 --- a/src/pt/tsukimangas/build.gradle +++ b/src/pt/tsukimangas/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'Tsuki Mangás' pkgNameSuffix = 'pt.tsukimangas' extClass = '.TsukiMangas' - extVersionCode = 23 + extVersionCode = 24 libVersion = '1.2' containsNsfw = true } diff --git a/src/pt/tsukimangas/src/eu/kanade/tachiyomi/extension/pt/tsukimangas/TsukiMangas.kt b/src/pt/tsukimangas/src/eu/kanade/tachiyomi/extension/pt/tsukimangas/TsukiMangas.kt index 76d566f11..a1d9573d1 100644 --- a/src/pt/tsukimangas/src/eu/kanade/tachiyomi/extension/pt/tsukimangas/TsukiMangas.kt +++ b/src/pt/tsukimangas/src/eu/kanade/tachiyomi/extension/pt/tsukimangas/TsukiMangas.kt @@ -375,6 +375,12 @@ class TsukiMangas : HttpSource(), ConfigurableSource { throw IOException(ERROR_CANNOT_LOGIN) } + // API returns 403 or 1020 when User-Agent permission is disabled. + if (loginResponse.code == 403 || loginResponse.code == 1020) { + loginResponse.close() + throw IOException(UA_DISABLED_MESSAGE) + } + try { val loginResponseBody = loginResponse.body?.string().orEmpty() val authResult = json.decodeFromString(loginResponseBody) @@ -394,11 +400,10 @@ class TsukiMangas : HttpSource(), ConfigurableSource { val response = chain.proceed(authorizedRequest) - // API returns 403 when User-Agent permission is disabled - // and returns 401 when the token is invalid. - if (response.code == 403 || response.code == 401) { + // API returns 401 when the token is invalid. + if (response.code == 401) { response.close() - throw IOException(if (response.code == 403) UA_DISABLED_MESSAGE else ERROR_INVALID_TOKEN) + throw IOException(ERROR_INVALID_TOKEN) } return response