Skip to content

Update jellyfin-sdk-kotlin #389

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

Draft
damontecres wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Update jellyfin-sdk-kotlin #389

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
3 changes: 1 addition & 2 deletions app/src/main/java/com/github/damontecres/wholphin/services/UpdateChecker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 =
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/com/github/damontecres/wholphin/ui/components/VideoStreamDetails.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ fun formatVideoRange(
when (type) {
VideoRangeType.UNKNOWN,
VideoRangeType.SDR,
VideoRangeType.DOVI_INVALID,
null,
-> null

Expand All @@ -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)
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/github/damontecres/wholphin/ui/playback/CurrentMediaInfo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<AudioStream>,
val subtitleStreams: List<SubtitleStream>,
val chapters: List<Chapter>,
val trickPlayInfo: TrickplayInfo?,
val trickPlayInfo: TrickplayInfoDto?,
) {
companion object {
val EMPTY = CurrentMediaInfo(listOf(), listOf(), listOf(), null)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackOverlay.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 = {},
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/github/damontecres/wholphin/ui/playback/SeekPreviewImage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -74,7 +74,7 @@ fun SeekPreviewImage(
seekProgressMs: Long,
videoWidth: Int?,
videoHeight: Int?,
trickPlayInfo: TrickplayInfo,
trickPlayInfo: TrickplayInfoDto,
modifier: Modifier = Modifier,
placeHolder: Painter? = null,
) {
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading