From a4345a40bf751e81122ba27b3ace4c4e0794a778 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Wed, 2 Oct 2024 11:34:51 +0300 Subject: [PATCH] Update dependencies --- app/build.gradle | 4 ++-- .../kotlin/org/koitharu/kotatsu/core/util/ext/Throwable.kt | 6 +++++- app/src/main/res/values/strings.xml | 1 + build.gradle | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0ba441866..7bad9b52c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -83,7 +83,7 @@ afterEvaluate { } dependencies { //noinspection GradleDependency - implementation('com.github.KotatsuApp:kotatsu-parsers:1.1') { + implementation('com.github.KotatsuApp:kotatsu-parsers:a8df8665ae') { exclude group: 'org.json', module: 'json' } @@ -137,7 +137,7 @@ dependencies { implementation 'io.coil-kt:coil-base:2.7.0' implementation 'io.coil-kt:coil-svg:2.7.0' - implementation 'com.github.KotatsuApp:subsampling-scale-image-view:b2c5a6d5ca' + implementation 'com.github.KotatsuApp:subsampling-scale-image-view:e04098de68' implementation 'com.github.solkin:disk-lru-cache:1.4' implementation 'io.noties.markwon:core:4.6.2' diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Throwable.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Throwable.kt index 93c447518..85afb772c 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Throwable.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Throwable.kt @@ -81,7 +81,11 @@ fun Throwable.getDisplayMessage(resources: Resources): String = when (this) { is UnknownHostException, is SocketTimeoutException -> resources.getString(R.string.network_error) - is ImageDecodeException -> resources.getString(R.string.error_corrupted_file) + is ImageDecodeException -> resources.getString( + R.string.error_image_format, + format.ifNullOrEmpty { resources.getString(R.string.unknown) }, + ) + is NoDataReceivedException -> resources.getString(R.string.error_no_data_received) is IncompatiblePluginException -> resources.getString(R.string.plugin_incompatible) is WrongPasswordException -> resources.getString(R.string.wrong_password) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e0cca68e8..a5bcf862c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -737,4 +737,5 @@ Source code User manual Telegram group + Unsupported image format: %s diff --git a/build.gradle b/build.gradle index fadb8b78b..48081cc88 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.6.0' + classpath 'com.android.tools.build:gradle:8.7.0' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20' classpath 'com.google.dagger:hilt-android-gradle-plugin:2.52' classpath 'com.google.devtools.ksp:symbol-processing-gradle-plugin:2.0.20-1.0.25'