Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the coroutine dependency and fix issues that were causing the crash

Browse Source
This commit is contained in:
Jobobby04 2020-05-23 00:57:41 -04:00
parent f7d991ab54
commit 9d764781c3
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -281,7 +281,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
final coroutines_version = '1.3.5' final coroutines_version = '1.3.7'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines_version"

10
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOnePresenter.kt
View File

@ -161,7 +161,7 @@ class MangaAllInOnePresenter(
scope.launch(Dispatchers.IO) { scope.launch(Dispatchers.IO) {
var manga2: Manga? = null var manga2: Manga? = null
if (updateInfo) { if (updateInfo) {
manga2 = db.getManga(manga.url, manga.source).executeAsBlocking()!! manga2 = db.getManga(manga.url, manga.source).executeAsBlocking()
updateChapters() updateChapters()
updateChapterInfo() updateChapterInfo()
} }
@ -190,7 +190,7 @@ class MangaAllInOnePresenter(
val networkManga = try { val networkManga = try {
source.fetchMangaDetails(manga).toBlocking().single() source.fetchMangaDetails(manga).toBlocking().single()
} catch (e: Exception) { } catch (e: Exception) {
withContext(Dispatchers.Main) { controller.onFetchMangaError(e) } controller.onFetchMangaError(e)
return@launch return@launch
} }
if (networkManga != null) { if (networkManga != null) {
@ -205,7 +205,7 @@ class MangaAllInOnePresenter(
try { try {
chapters = source.fetchChapterList(manga).toBlocking().single() chapters = source.fetchChapterList(manga).toBlocking().single()
} catch (e: Exception) { } catch (e: Exception) {
withContext(Dispatchers.Main) { controller.onFetchMangaError(e) } controller.onFetchMangaError(e)
return@launch return@launch
} }
} }
@ -220,13 +220,11 @@ class MangaAllInOnePresenter(
updateManga(updateInfo = false) updateManga(updateInfo = false)
controller.onFetchMangaDone() controller.onFetchMangaDone()
} }
} catch (e: java.lang.Exception) { } catch (e: Exception) {
withContext(Dispatchers.Main) {
controller.onFetchMangaError(e) controller.onFetchMangaError(e)
} }
} }
} }
}
/** /**
* Update favorite status of manga, (removes / adds) manga (to / from) library. * Update favorite status of manga, (removes / adds) manga (to / from) library.