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

Minor lint fixes

Browse Source
This commit is contained in:
Jobobby04 2021-12-02 20:54:54 -05:00
parent 42da9abe3e
commit 21346eefe2
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
View File

@ -473,8 +473,6 @@ class PreferencesHelper(val context: Context) {
fun useNewSourceNavigation() = flowPrefs.getBoolean(Keys.useNewSourceNavigation, true) fun useNewSourceNavigation() = flowPrefs.getBoolean(Keys.useNewSourceNavigation, true)
fun mangaDexForceLatestCovers() = flowPrefs.getBoolean(Keys.mangaDexForceLatestCovers, false)
fun preferredMangaDexId() = flowPrefs.getString(Keys.preferredMangaDexId, "0") fun preferredMangaDexId() = flowPrefs.getString(Keys.preferredMangaDexId, "0")
fun mangadexSyncToLibraryIndexes() = flowPrefs.getStringSet(Keys.mangadexSyncToLibraryIndexes, emptySet()) fun mangadexSyncToLibraryIndexes() = flowPrefs.getStringSet(Keys.mangadexSyncToLibraryIndexes, emptySet())

4
app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt
View File

@ -167,11 +167,11 @@ class MangaDex(delegate: HttpSource, val context: Context) :
} }
override fun fetchMangaDetails(manga: SManga): Observable<SManga> { override fun fetchMangaDetails(manga: SManga): Observable<SManga> {
return mangaHandler.fetchMangaDetailsObservable(manga, id, preferences.mangaDexForceLatestCovers().get()) return mangaHandler.fetchMangaDetailsObservable(manga, id)
} }
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo { override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo {
return mangaHandler.getMangaDetails(manga, id, preferences.mangaDexForceLatestCovers().get()) return mangaHandler.getMangaDetails(manga, id)
} }
override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> { override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {

1
app/src/main/java/exh/md/handlers/FilterHandler.kt
View File

@ -229,6 +229,7 @@ class FilterHandler {
is TagExclusionMode -> { is TagExclusionMode -> {
queryMap["excludedTagsMode"] = filter.values[filter.state].uppercase(Locale.US) queryMap["excludedTagsMode"] = filter.values[filter.state].uppercase(Locale.US)
} }
else -> Unit
} }
} }
if (originalLanguageList.isNotEmpty()) { if (originalLanguageList.isNotEmpty()) {

6
app/src/main/java/exh/md/handlers/MangaHandler.kt
View File

@ -26,15 +26,15 @@ class MangaHandler(
private val apiMangaParser: ApiMangaParser, private val apiMangaParser: ApiMangaParser,
private val followsHandler: FollowsHandler private val followsHandler: FollowsHandler
) { ) {
suspend fun getMangaDetails(manga: MangaInfo, sourceId: Long, forceLatestCovers: Boolean): MangaInfo { suspend fun getMangaDetails(manga: MangaInfo, sourceId: Long): MangaInfo {
val response = withIOContext { service.viewManga(MdUtil.getMangaId(manga.key)) } val response = withIOContext { service.viewManga(MdUtil.getMangaId(manga.key)) }
val simpleChapters = withIOContext { getSimpleChapters(manga) } val simpleChapters = withIOContext { getSimpleChapters(manga) }
return apiMangaParser.parseToManga(manga, response, simpleChapters, sourceId) return apiMangaParser.parseToManga(manga, response, simpleChapters, sourceId)
} }
fun fetchMangaDetailsObservable(manga: SManga, sourceId: Long, forceLatestCovers: Boolean): Observable<SManga> { fun fetchMangaDetailsObservable(manga: SManga, sourceId: Long): Observable<SManga> {
return runAsObservable { return runAsObservable {
getMangaDetails(manga.toMangaInfo(), sourceId, forceLatestCovers).toSManga() getMangaDetails(manga.toMangaInfo(), sourceId).toSManga()
} }
} }

2
app/src/main/java/exh/ui/intercept/InterceptActivity.kt
View File

@ -88,6 +88,8 @@ class InterceptActivity : BaseViewBindingActivity<EhActivityInterceptBinding>()
.setOnDismissListener { onBackPressed() } .setOnDismissListener { onBackPressed() }
.show() .show()
} }
InterceptResult.Idle -> Unit
InterceptResult.Loading -> Unit
} }
} }
.launchIn(lifecycleScope) .launchIn(lifecycleScope)