nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix episode bottom sheet error when premiereDate is null

Browse source
This commit is contained in:
Jarne Demeulemeester 2022-03-15 17:26:18 +01:00
parent 964659af01
commit c941326742
No known key found for this signature in database
GPG key ID: B61B7B150DB6A6D2
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/dev/jdtech/jellyfin/viewmodels/EpisodeBottomSheetViewModel.kt
View file

@ -10,9 +10,9 @@ import dev.jdtech.jellyfin.models.PlayerItem
import dev.jdtech.jellyfin.repository.JellyfinRepository import dev.jdtech.jellyfin.repository.JellyfinRepository
import dev.jdtech.jellyfin.utils.* import dev.jdtech.jellyfin.utils.*
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.jellyfin.sdk.api.client.exception.ApiClientException import org.jellyfin.sdk.api.client.exception.ApiClientException
import org.jellyfin.sdk.model.DateTime
import org.jellyfin.sdk.model.api.BaseItemDto import org.jellyfin.sdk.model.api.BaseItemDto
import timber.log.Timber import timber.log.Timber
import java.text.DateFormat import java.text.DateFormat
@ -72,7 +72,7 @@ constructor(
val tempItem = jellyfinRepository.getItem(episodeId) val tempItem = jellyfinRepository.getItem(episodeId)
item = tempItem item = tempItem
runTime = "${tempItem.runTimeTicks?.div(600000000)} min" runTime = "${tempItem.runTimeTicks?.div(600000000)} min"
dateString = getDateString(tempItem) dateString = getDateString(tempItem.premiereDate)
played = tempItem.userData?.played == true played = tempItem.userData?.played == true
favorite = tempItem.userData?.isFavorite == true favorite = tempItem.userData?.isFavorite == true
canDownload = tempItem.canDownload == true canDownload = tempItem.canDownload == true
@ -178,8 +178,9 @@ constructor(
deleteDownloadedEpisode(downloadDatabase, playerItems[0].itemId) deleteDownloadedEpisode(downloadDatabase, playerItems[0].itemId)
} }
private fun getDateString(item: BaseItemDto): String { private fun getDateString(datetime: DateTime?): String {
val instant = item.premiereDate?.toInstant(ZoneOffset.UTC) if (datetime == null) return ""
val instant = datetime.toInstant(ZoneOffset.UTC)
val date = Date.from(instant) val date = Date.from(instant)
return DateFormat.getDateInstance(DateFormat.SHORT).format(date) return DateFormat.getDateInstance(DateFormat.SHORT).format(date)
} }