From ccdae6bb9aec211a1e6a347e3a430924288810cf Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Mon, 8 Mar 2021 19:50:41 -0500 Subject: [PATCH] Deprecate throwable logging function, produces bad log --- app/src/main/java/exh/log/Logging.kt | 5 +++++ app/src/main/java/exh/md/handlers/ApiMangaParser.kt | 8 ++------ app/src/main/java/exh/md/similar/SimilarUpdateService.kt | 2 +- app/src/main/java/exh/ui/batchadd/BatchAddPresenter.kt | 2 +- app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt | 2 +- .../java/exh/widget/preference/MangadexLoginDialog.kt | 2 ++ 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/exh/log/Logging.kt b/app/src/main/java/exh/log/Logging.kt index 2b366cd8d..8edb7a12e 100644 --- a/app/src/main/java/exh/log/Logging.kt +++ b/app/src/main/java/exh/log/Logging.kt @@ -17,10 +17,15 @@ 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) +@Deprecated("Use proper throwable function", ReplaceWith("""xLogE("", log)""")) fun Any.xLogE(log: Throwable) = xLogStack().e(log) +@Deprecated("Use proper throwable function", ReplaceWith("""xLogW("", log)""")) fun Any.xLogW(log: Throwable) = xLogStack().w(log) +@Deprecated("Use proper throwable function", ReplaceWith("""xLogD("", log)""")) fun Any.xLogD(log: Throwable) = xLogStack().d(log) +@Deprecated("Use proper throwable function", ReplaceWith("""xLogI("", 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) fun Any.xLogE(log: String, e: Throwable) = xLogStack().e(log, e) diff --git a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt index e707427a8..ec5ec6f3a 100644 --- a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt +++ b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt @@ -150,7 +150,7 @@ class ApiMangaParser(private val lang: String) { if (tags.isNotEmpty()) tags.clear() tags += genres.map { RaisedTag(null, it, MangaDexSearchMetadata.TAG_TYPE_DEFAULT) } } catch (e: Exception) { - xLogE(e) + xLogE("Parse into metadata error", e) throw e } } @@ -250,13 +250,9 @@ class ApiMangaParser(private val lang: String) { fun chapterParseForMangaId(response: Response): Int { try { - if (response.code != 200) throw Exception("HTTP error ${response.code}") - checkNotNull(response.body) { - "Null Response" - } return response.parseAs().data.mangaId } catch (e: Exception) { - xLogE(e) + xLogE("Parse for manga id error", e) throw e } } diff --git a/app/src/main/java/exh/md/similar/SimilarUpdateService.kt b/app/src/main/java/exh/md/similar/SimilarUpdateService.kt index f04eef157..619c9f254 100644 --- a/app/src/main/java/exh/md/similar/SimilarUpdateService.kt +++ b/app/src/main/java/exh/md/similar/SimilarUpdateService.kt @@ -135,7 +135,7 @@ class SimilarUpdateService( // Unsubscribe from any previous subscription if needed. job?.cancel() val handler = CoroutineExceptionHandler { _, exception -> - xLogE(exception) + xLogE("Similar manga update error", exception) stopSelf(startId) showResultNotification(true) cancelProgressNotification() diff --git a/app/src/main/java/exh/ui/batchadd/BatchAddPresenter.kt b/app/src/main/java/exh/ui/batchadd/BatchAddPresenter.kt index 7adad3a19..1e2312b63 100644 --- a/app/src/main/java/exh/ui/batchadd/BatchAddPresenter.kt +++ b/app/src/main/java/exh/ui/batchadd/BatchAddPresenter.kt @@ -56,7 +56,7 @@ class BatchAddPresenter : BasePresenter() { currentlyAddingRelay.call(STATE_INPUT_TO_PROGRESS) val handler = CoroutineExceptionHandler { _, throwable -> - xLogE(throwable) + xLogE("Batch add error", throwable) } presenterScope.launch(Dispatchers.IO + handler) { diff --git a/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt b/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt index ea7508ce3..59dac52b0 100644 --- a/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt +++ b/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt @@ -187,7 +187,7 @@ class BrowserActionActivity : AppCompatActivity() { suspend fun captchaSolveFail() { currentLoopId = null validateCurrentLoopId = null - xLogE(IllegalStateException("Captcha solve failure!")) + xLogE("Captcha solve Error", IllegalStateException("Captcha solve failure!")) withUIContext { binding.webview.evaluateJavascript(SOLVE_UI_SCRIPT_HIDE, null) MaterialDialog(this@BrowserActionActivity) diff --git a/app/src/main/java/exh/widget/preference/MangadexLoginDialog.kt b/app/src/main/java/exh/widget/preference/MangadexLoginDialog.kt index 82f2bf8bd..1a7316061 100644 --- a/app/src/main/java/exh/widget/preference/MangadexLoginDialog.kt +++ b/app/src/main/java/exh/widget/preference/MangadexLoginDialog.kt @@ -20,6 +20,7 @@ import eu.kanade.tachiyomi.source.online.all.MangaDex import eu.kanade.tachiyomi.ui.base.controller.DialogController import eu.kanade.tachiyomi.util.lang.launchUI import eu.kanade.tachiyomi.util.system.toast +import exh.log.xLogW import exh.source.getMainSource import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -109,6 +110,7 @@ class MangadexLoginDialog(bundle: Bundle? = null) : DialogController(bundle) { } } catch (error: Exception) { errorResult() + xLogW("Login to Mangadex error", error) error.message?.let { launchUI { binding.root.context.toast(it) } } } }