null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing a few warnings

Browse source
This commit is contained in:
Jays2Kings 2021-09-18 11:18:49 -04:00
parent 20f5ad16d9
commit fa2306a5da
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
View file

@ -96,7 +96,7 @@ class BackupRestoreService : Service() {
private fun destroyJob() { private fun destroyJob() {
backupRestore?.job?.cancel() backupRestore?.job?.cancel()
ioScope?.cancel() ioScope.cancel()
if (wakeLock.isHeld) { if (wakeLock.isHeld) {
wakeLock.release() wakeLock.release()
} }

2
app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt
View file

@ -68,7 +68,7 @@ class CategoryGetResolver : DefaultGetResolver<Category>() {
mangaSort = orderString.first() mangaSort = orderString.first()
mangaOrder = emptyList() mangaOrder = emptyList()
} }
else -> mangaOrder = orderString.split("/")?.mapNotNull { it.toLongOrNull() } else -> mangaOrder = orderString.split("/").mapNotNull { it.toLongOrNull() }
} }
} }
} }

8
app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
View file

@ -94,7 +94,7 @@ interface Manga : SManga {
TYPE_COMIC -> R.string.comic TYPE_COMIC -> R.string.comic
else -> R.string.manga else -> R.string.manga
} }
).toLowerCase(Locale.getDefault()) ).lowercase(Locale.getDefault())
} }
fun getGenres(): List<String>? { fun getGenres(): List<String>? {
@ -113,7 +113,7 @@ interface Manga : SManga {
fun seriesType(useOriginalTags: Boolean = false, customTags: String? = null, sourceManager: SourceManager? = null): Int { fun seriesType(useOriginalTags: Boolean = false, customTags: String? = null, sourceManager: SourceManager? = null): Int {
val sourceName by lazy { (sourceManager ?: Injekt.get()).getOrStub(source).name } val sourceName by lazy { (sourceManager ?: Injekt.get()).getOrStub(source).name }
val tags = customTags ?: if (useOriginalTags) originalGenre else genre val tags = customTags ?: if (useOriginalTags) originalGenre else genre
val currentTags = tags?.split(",")?.map { it.trim().toLowerCase(Locale.US) } ?: emptyList() val currentTags = tags?.split(",")?.map { it.trim().lowercase(Locale.US) } ?: emptyList()
return if (currentTags.any { tag -> isMangaTag(tag) }) { return if (currentTags.any { tag -> isMangaTag(tag) }) {
TYPE_MANGA TYPE_MANGA
} else if (currentTags.any { tag -> isComicTag(tag) } || } else if (currentTags.any { tag -> isComicTag(tag) } ||
@ -173,7 +173,7 @@ interface Manga : SManga {
} }
fun isSeriesTag(tag: String): Boolean { fun isSeriesTag(tag: String): Boolean {
val tagLower = tag.toLowerCase(Locale.ROOT) val tagLower = tag.lowercase(Locale.ROOT)
return isMangaTag(tagLower) || isManhuaTag(tagLower) || return isMangaTag(tagLower) || isManhuaTag(tagLower) ||
isManhwaTag(tagLower) || isComicTag(tagLower) || isWebtoonTag(tagLower) isManhwaTag(tagLower) || isComicTag(tagLower) || isWebtoonTag(tagLower)
} }
@ -188,7 +188,7 @@ interface Manga : SManga {
fun isLongStrip(): Boolean { fun isLongStrip(): Boolean {
val currentTags = val currentTags =
genre?.split(",")?.map { it.trim().toLowerCase(Locale.US) } ?: emptyList() genre?.split(",")?.map { it.trim().lowercase(Locale.US) } ?: emptyList()
val sourceName by lazy { Injekt.get<SourceManager>().getOrStub(source).name } val sourceName by lazy { Injekt.get<SourceManager>().getOrStub(source).name }
return currentTags.any { it == "long strip" } || sourceName.contains("webtoon", true) return currentTags.any { it == "long strip" } || sourceName.contains("webtoon", true)
} }