From a1a9b4b8128fac2927d900c1f0677a798c34c6c0 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Thu, 18 Mar 2021 21:55:25 -0400 Subject: [PATCH] Lint --- .../java/eu/kanade/tachiyomi/source/online/all/EHentai.kt | 5 ++--- .../java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt | 1 - app/src/main/java/exh/log/Logging.kt | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt index fef9c641b..61396ab8d 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt @@ -229,7 +229,7 @@ class EHentai( } else { parsedLocation.queryParameter(REVERSE_PARAM)!!.toBoolean() } - Pair(parsedMangas, hasNextPage) + parsedMangas to hasNextPage } private fun getGenre(element: Element? = null, genreString: String? = null): String? { @@ -879,8 +879,7 @@ class EHentai( stringBuilder.append(" ") } - xLogD(stringBuilder.toString()) - return stringBuilder.toString().trim() + return stringBuilder.toString().trim().also { xLogD(it) } } data class AdvSearchEntry(val search: Pair, val exclude: Boolean) 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 b98592d15..239afa4ac 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 @@ -215,7 +215,6 @@ class MangaDex(delegate: HttpSource, val context: Context) : ).await().closeQuietly() } - val response = client.newCall(GET(MdUtil.apiUrl + MdUtil.isLoggedInApi, headers)).await() withIOContext { response.body?.string() }.let { jsonData -> diff --git a/app/src/main/java/exh/log/Logging.kt b/app/src/main/java/exh/log/Logging.kt index 80c679f87..8dd921248 100644 --- a/app/src/main/java/exh/log/Logging.kt +++ b/app/src/main/java/exh/log/Logging.kt @@ -17,7 +17,6 @@ fun Any.xLog(logLevel: LogLevel, log: String) = xLog().log(logLevel.int, log) fun Any.xLogJson(log: String) = xLog().json(log) fun Any.xLogXML(log: String) = xLog().xml(log) - fun Any.xLogE(log: String, e: Throwable) = xLogStack().e(log, e) fun Any.xLogW(log: String, e: Throwable) = xLogStack().w(log, e) fun Any.xLogD(log: String, e: Throwable) = xLogStack().d(log, e) @@ -70,7 +69,6 @@ sealed class LogLevel(val int: Int, val androidLevel: Int) { } } - @Deprecated("Use proper throwable function", ReplaceWith("""xLogE("", log)""")) fun Any.xLogE(log: Throwable) = xLogStack().e(log) @@ -84,4 +82,4 @@ fun Any.xLogD(log: Throwable) = xLogStack().d(log) fun Any.xLogI(log: Throwable) = xLogStack().i(log) @Deprecated("Use proper throwable function", ReplaceWith("""xLog(logLevel, "", log)""")) -fun Any.xLog(logLevel: LogLevel, log: Throwable) = xLogStack().log(logLevel.int, log) \ No newline at end of file +fun Any.xLog(logLevel: LogLevel, log: Throwable) = xLogStack().log(logLevel.int, log)