From 627a00beb4cd3926abc99590e6932aee1afda434 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sat, 1 Oct 2022 13:55:33 +0300 Subject: [PATCH] Update parsers --- app/build.gradle | 20 +++++++++---------- .../kotatsu/core/ui/MangaErrorDialog.kt | 2 +- .../kotatsu/local/ui/ImportService.kt | 2 +- .../kotatsu/reader/ui/ReaderActivity.kt | 2 +- .../kotatsu/utils/ext/ThrowableExt.kt | 4 ++-- build.gradle | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index adf7da43e..d4baf5967 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId 'org.koitharu.kotatsu' minSdkVersion 21 targetSdkVersion 33 - versionCode 498 - versionName '4.0-beta2' + versionCode 499 + versionName '4.0-rc1' generatedDensities = [] testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -83,15 +83,15 @@ afterEvaluate { } } dependencies { - implementation('com.github.KotatsuApp:kotatsu-parsers:b3a9c5fcda') { + implementation('com.github.KotatsuApp:kotatsu-parsers:b1990c7918') { exclude group: 'org.json', module: 'json' } implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4' implementation 'androidx.core:core-ktx:1.9.0' - implementation 'androidx.activity:activity-ktx:1.5.1' - implementation 'androidx.fragment:fragment-ktx:1.5.2' + implementation 'androidx.activity:activity-ktx:1.6.0' + implementation 'androidx.fragment:fragment-ktx:1.5.3' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1' implementation 'androidx.lifecycle:lifecycle-service:2.5.1' @@ -102,7 +102,7 @@ dependencies { implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01' implementation 'androidx.preference:preference-ktx:1.2.0' implementation 'androidx.work:work-runtime-ktx:2.7.1' - implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha04' + implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05' implementation 'com.google.android.material:material:1.7.0-rc01' //noinspection LifecycleAnnotationProcessorWithJava8 kapt 'androidx.lifecycle:lifecycle-compiler:2.5.1' @@ -118,8 +118,8 @@ dependencies { implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2' implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2' - implementation "com.google.dagger:hilt-android:2.43.2" - kapt "com.google.dagger:hilt-compiler:2.43.2" + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" implementation 'androidx.hilt:hilt-work:1.0.0' kapt 'androidx.hilt:hilt-compiler:1.0.0' @@ -147,6 +147,6 @@ dependencies { androidTestImplementation 'androidx.room:room-testing:2.4.3' androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.14.0' - androidTestImplementation 'com.google.dagger:hilt-android-testing:2.43.2' - kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.43.2' + androidTestImplementation 'com.google.dagger:hilt-android-testing:2.44' + kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.44' } diff --git a/app/src/main/java/org/koitharu/kotatsu/core/ui/MangaErrorDialog.kt b/app/src/main/java/org/koitharu/kotatsu/core/ui/MangaErrorDialog.kt index b5781451a..4930ac0fe 100644 --- a/app/src/main/java/org/koitharu/kotatsu/core/ui/MangaErrorDialog.kt +++ b/app/src/main/java/org/koitharu/kotatsu/core/ui/MangaErrorDialog.kt @@ -54,7 +54,7 @@ class MangaErrorDialog : AlertDialogFragment() { .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(R.string.report) { _, _ -> dismiss() - error.report(TAG) + error.report() }.setTitle(R.string.error_occurred) } diff --git a/app/src/main/java/org/koitharu/kotatsu/local/ui/ImportService.kt b/app/src/main/java/org/koitharu/kotatsu/local/ui/ImportService.kt index 86732aa91..1ae9dc6c7 100644 --- a/app/src/main/java/org/koitharu/kotatsu/local/ui/ImportService.kt +++ b/app/src/main/java/org/koitharu/kotatsu/local/ui/ImportService.kt @@ -75,7 +75,7 @@ class ImportService : CoroutineIntentService() { } override fun onError(startId: Int, error: Throwable) { - error.report(null) + error.report() } private suspend fun importImpl(uri: Uri): Manga { diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt index ffa7432ef..3510318dc 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt @@ -405,7 +405,7 @@ class ReaderActivity : if (ExceptionResolver.canResolve(exception)) { tryResolve(exception) } else { - exception.report("ReaderActivity::onError") + exception.report() } } else { onCancel(dialog) diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ThrowableExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ThrowableExt.kt index d06a7b491..9057a6cc4 100644 --- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ThrowableExt.kt +++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ThrowableExt.kt @@ -59,8 +59,8 @@ fun Throwable.isReportable(): Boolean { return this is Error || this.javaClass in reportableExceptions } -fun Throwable.report(message: String?) { - val exception = CaughtException(this, message) +fun Throwable.report() { + val exception = CaughtException(this, "${javaClass.simpleName}($message)") exception.sendWithAcra() } diff --git a/build.gradle b/build.gradle index afc844c60..61f163ff5 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:7.3.0' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10' - classpath 'com.google.dagger:hilt-android-gradle-plugin:2.43.2' + classpath 'com.google.dagger:hilt-android-gradle-plugin:2.44' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files