Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-23 02:51:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle null Anilist start dates (fixes #4685)

Browse Source
This commit is contained in:
arkon 2021-03-20 16:36:31 -04:00
parent 78285bdf37
commit 99ba84c810
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt
View File

@ -246,12 +246,9 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
val date = try { val date = try {
val date = Calendar.getInstance() val date = Calendar.getInstance()
date.set( date.set(
struct["startDate"]!!.jsonObject["year"]!!.jsonPrimitive.intOrNull ?: 0, struct["startDate"]!!.jsonObject["year"]!!.jsonPrimitive.int,
( struct["startDate"]!!.jsonObject["month"]!!.jsonPrimitive.int - 1,
struct["startDate"]!!.jsonObject["month"]!!.jsonPrimitive.intOrNull struct["startDate"]!!.jsonObject["day"]!!.jsonPrimitive.int
?: 0
) - 1,
struct["startDate"]!!.jsonObject["day"]!!.jsonPrimitive.intOrNull ?: 0
) )
date.timeInMillis date.timeInMillis
} catch (_: Exception) { } catch (_: Exception) {

24
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
View File

@ -55,24 +55,24 @@ class TrackSearchAdapter(context: Context) :
.into(binding.trackSearchCover) .into(binding.trackSearchCover)
} }
if (track.publishing_status.isBlank()) { val hasStatus = track.publishing_status.isNotBlank()
binding.trackSearchStatus.isVisible = false binding.trackSearchStatus.isVisible = hasStatus
binding.trackSearchStatusResult.isVisible = false binding.trackSearchStatusResult.isVisible = hasStatus
} else { if (hasStatus) {
binding.trackSearchStatusResult.text = track.publishing_status.capitalize() binding.trackSearchStatusResult.text = track.publishing_status.capitalize()
} }
if (track.publishing_type.isBlank()) { val hasType = track.publishing_type.isNotBlank()
binding.trackSearchType.isVisible = false binding.trackSearchType.isVisible = hasType
binding.trackSearchTypeResult.isVisible = false binding.trackSearchTypeResult.isVisible = hasType
} else { if (hasType) {
binding.trackSearchTypeResult.text = track.publishing_type.capitalize() binding.trackSearchTypeResult.text = track.publishing_type.capitalize()
} }
if (track.start_date.isBlank()) { val hasStartDate = track.start_date.isNotBlank()
binding.trackSearchStart.isVisible = false binding.trackSearchStart.isVisible = hasStartDate
binding.trackSearchStartResult.isVisible = false binding.trackSearchStartResult.isVisible = hasStartDate
} else { if (hasStartDate) {
binding.trackSearchStartResult.text = track.start_date binding.trackSearchStartResult.text = track.start_date
} }
} }