diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/UpdateChecker.kt b/app/src/main/java/com/github/damontecres/wholphin/services/UpdateChecker.kt index c7ac435c6..f4aa80dc9 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/services/UpdateChecker.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/services/UpdateChecker.kt @@ -33,7 +33,6 @@ import kotlinx.serialization.json.jsonPrimitive import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response -import okhttp3.internal.headersContentLength import timber.log.Timber import java.io.File import java.io.InputStream @@ -211,7 +210,7 @@ class UpdateChecker if (it.isSuccessful && it.body != null) { Timber.v("Request successful for ${release.downloadUrl}") withContext(Dispatchers.Main) { - callback.contentLength(it.headersContentLength()) + callback.contentLength(it.body.contentLength()) } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { val contentValues = diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/components/VideoStreamDetails.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/components/VideoStreamDetails.kt index 44e2705df..940736aa6 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/components/VideoStreamDetails.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/components/VideoStreamDetails.kt @@ -268,6 +268,7 @@ fun formatVideoRange( when (type) { VideoRangeType.UNKNOWN, VideoRangeType.SDR, + VideoRangeType.DOVI_INVALID, null, -> null @@ -281,6 +282,9 @@ fun formatVideoRange( VideoRangeType.DOVI_WITH_HDR10, VideoRangeType.DOVI_WITH_HLG, VideoRangeType.DOVI_WITH_SDR, + VideoRangeType.DOVI_WITH_EL, + VideoRangeType.DOVI_WITH_HDR10_PLUS, + VideoRangeType.DOVI_WITH_ELHDR10_PLUS, -> context.getString(R.string.dolby_vision) } } diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/CurrentMediaInfo.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/CurrentMediaInfo.kt index 0fe5c564f..a94a0e566 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/CurrentMediaInfo.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/CurrentMediaInfo.kt @@ -1,13 +1,13 @@ package com.github.damontecres.wholphin.ui.playback import com.github.damontecres.wholphin.data.model.Chapter -import org.jellyfin.sdk.model.api.TrickplayInfo +import org.jellyfin.sdk.model.api.TrickplayInfoDto data class CurrentMediaInfo( val audioStreams: List, val subtitleStreams: List, val chapters: List, - val trickPlayInfo: TrickplayInfo?, + val trickPlayInfo: TrickplayInfoDto?, ) { companion object { val EMPTY = CurrentMediaInfo(listOf(), listOf(), listOf(), null) diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackOverlay.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackOverlay.kt index eefc176bd..a2de7887b 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackOverlay.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackOverlay.kt @@ -65,7 +65,7 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.isActive import org.jellyfin.sdk.model.api.ImageType import org.jellyfin.sdk.model.api.MediaSegmentDto -import org.jellyfin.sdk.model.api.TrickplayInfo +import org.jellyfin.sdk.model.api.TrickplayInfoDto import java.time.LocalTime import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds @@ -98,7 +98,7 @@ fun PlaybackOverlay( currentPlayback: CurrentPlayback?, currentSegment: MediaSegmentDto?, modifier: Modifier = Modifier, - trickplayInfo: TrickplayInfo? = null, + trickplayInfo: TrickplayInfoDto? = null, trickplayUrlFor: (Int) -> String? = { null }, playlist: Playlist = Playlist(listOf(), 0), onClickPlaylist: (BaseItem) -> Unit = {}, diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/SeekPreviewImage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/SeekPreviewImage.kt index 1f060b158..b25595733 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/SeekPreviewImage.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/SeekPreviewImage.kt @@ -20,7 +20,7 @@ import coil3.request.ImageRequest import coil3.request.transformations import com.github.damontecres.wholphin.ui.CoilTrickplayTransformation import com.github.damontecres.wholphin.ui.isNotNullOrBlank -import org.jellyfin.sdk.model.api.TrickplayInfo +import org.jellyfin.sdk.model.api.TrickplayInfoDto fun Modifier.offsetByPercent( xPercentage: Float, @@ -74,7 +74,7 @@ fun SeekPreviewImage( seekProgressMs: Long, videoWidth: Int?, videoHeight: Int?, - trickPlayInfo: TrickplayInfo, + trickPlayInfo: TrickplayInfoDto, modifier: Modifier = Modifier, placeHolder: Painter? = null, ) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 94708ac25..205580fd1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,14 +21,14 @@ lifecycleRuntimeKtx = "2.10.0" activityCompose = "1.12.1" androidx-media3 = "1.8.0" coil = "3.3.0" -jellyfin-sdk = "1.7.1" +jellyfin-sdk = "1.8.4" nav3Core = "1.0.0" lifecycleViewmodelNav3 = "2.10.0" material3AdaptiveNav3 = "1.0.0-alpha03" protobuf = "0.9.5" datastore = "1.2.0" kotlinx-serialization = "1.9.0" -protobuf-javalite = "4.33.1" +protobuf-javalite = "4.33.2" hilt = "2.57.2" room = "2.8.4" preferenceKtx = "1.2.1"