Skip to content

fix: crash when playing video without upload date #6168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 21, 2024
Merged

fix: crash when playing video without upload date #6168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions app/src/main/java/com/github/libretube/api/obj/Streams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ data class Streams(

@Serializable(SafeInstantSerializer::class)
@SerialName("uploadDate")
val uploadTimestamp: Instant,
val uploadTimestamp: Instant?,
val uploaded: Long? = null,

val uploader: String,
val uploaderUrl: String,
Expand Down Expand Up @@ -91,9 +92,9 @@ data class Streams(
uploaderName = uploader,
uploaderUrl = uploaderUrl,
uploaderAvatar = uploaderAvatar,
uploadedDate = uploadTimestamp.toLocalDateTime(TimeZone.currentSystemDefault()).date
.toString(),
uploaded = uploadTimestamp.toEpochMilliseconds(),
uploadedDate = uploadTimestamp?.toLocalDateTime(TimeZone.currentSystemDefault())?.date
?.toString(),
uploaded = uploaded ?: uploadTimestamp?.toEpochMilliseconds() ?: 0,
duration = duration,
views = views,
uploaderVerified = uploaderVerified,
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/github/libretube/services/DownloadService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class DownloadService : LifecycleService() {
streams.description,
streams.uploader,
streams.duration,
streams.uploadTimestamp.toLocalDateTime(TimeZone.currentSystemDefault()).date,
streams.uploadTimestamp?.toLocalDateTime(TimeZone.currentSystemDefault())?.date,
thumbnailTargetPath
)
Database.downloadDao().insertDownload(download)
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,6 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
commentsViewModel.setCommentSheetExpand(null)

updateResolutionOnFullscreenChange(true)

openOrCloseFullscreenDialog(true)

binding.player.updateMarginsByFullscreenMode()
Expand All @@ -691,7 +690,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
fun unsetFullscreen() {
viewModel.isFullscreen.value = false

if (!PlayerHelper.autoFullscreenEnabled) {
if (!PlayerHelper.autoFullscreenEnabled && activity != null) {
mainActivity.requestedOrientation = mainActivity.screenOrientationPref
}

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/github/libretube/ui/views/DescriptionLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,10 @@ class DescriptionLayout(
}

private fun localizeDate(streams: Streams): String {
if (streams.livestream) return ""
if (streams.livestream || streams.uploadTimestamp == null) return ""

val date = streams.uploadTimestamp.toLocalDateTime(TimeZone.currentSystemDefault()).date

return TextUtils.SEPARATOR + TextUtils.localizeDate(date)
}

Expand Down