mirror of
https://github.com/jellyfin/jellyfin-android.git
synced 2026-11-18 20:14:02 +00:00
Merge pull request #427 from nielsvanvelzen/sdk-userid
Update to SDK beta 8
This commit is contained in:
6 files changed
+45
-66
No files matched your search
@@ -18,12 +18,6 @@ class ApiController(
|
||||
private val serverDao: ServerDao,
|
||||
private val userDao: UserDao,
|
||||
) {
|
||||
var currentUser: UUID? = null
|
||||
private set
|
||||
|
||||
var currentDeviceId: String = baseDeviceInfo.id
|
||||
private set
|
||||
|
||||
/**
|
||||
* Migrate from preferences if necessary
|
||||
*/
|
||||
@@ -79,20 +73,15 @@ class ApiController(
|
||||
}
|
||||
|
||||
private fun configureApiClientUser(userId: String, accessToken: String) {
|
||||
currentUser = userId.toUUID()
|
||||
|
||||
// Append user id to device id to ensure uniqueness across sessions
|
||||
currentDeviceId = baseDeviceInfo.id + currentUser.toString()
|
||||
apiClient.deviceInfo = baseDeviceInfo.copy(id = currentDeviceId)
|
||||
apiClient.userId = userId.toUUID()
|
||||
apiClient.accessToken = accessToken
|
||||
// Append user id to device id to ensure uniqueness across sessions
|
||||
apiClient.deviceInfo = baseDeviceInfo.copy(id = baseDeviceInfo.id + userId)
|
||||
}
|
||||
|
||||
private fun resetApiClientUser() {
|
||||
currentUser = null
|
||||
currentDeviceId = baseDeviceInfo.id
|
||||
apiClient.deviceInfo = baseDeviceInfo
|
||||
apiClient.userId = null
|
||||
apiClient.accessToken = null
|
||||
apiClient.deviceInfo = baseDeviceInfo
|
||||
}
|
||||
|
||||
fun requireUser(): UUID = requireNotNull(currentUser) { "Current user is null!" }
|
||||
}
|
||||
@@ -42,14 +42,15 @@ import org.jellyfin.mobile.controller.ApiController
|
||||
import org.jellyfin.mobile.media.car.LibraryBrowser
|
||||
import org.jellyfin.mobile.media.car.LibraryPage
|
||||
import org.jellyfin.mobile.utils.toast
|
||||
import org.jellyfin.sdk.api.client.ApiClient
|
||||
import org.jellyfin.sdk.api.client.exception.ApiClientException
|
||||
import org.koin.android.ext.android.inject
|
||||
import timber.log.Timber
|
||||
import com.google.android.exoplayer2.MediaItem as ExoPlayerMediaItem
|
||||
|
||||
class MediaService : MediaBrowserServiceCompat() {
|
||||
|
||||
private val apiController: ApiController by inject()
|
||||
private val apiClient: ApiClient by inject()
|
||||
private val libraryBrowser: LibraryBrowser by inject()
|
||||
|
||||
private val serviceScope = MainScope()
|
||||
@@ -172,7 +173,12 @@ class MediaService : MediaBrowserServiceCompat() {
|
||||
loadingJob.join()
|
||||
|
||||
val items = try {
|
||||
if (apiController.currentUser != null) libraryBrowser.loadLibrary(parentId) else null
|
||||
if (apiClient.userId != null) {
|
||||
libraryBrowser.loadLibrary(parentId)
|
||||
} else {
|
||||
Timber.e("Missing userId in ApiClient")
|
||||
null
|
||||
}
|
||||
} catch (e: ApiClientException) {
|
||||
Timber.e(e)
|
||||
null
|
||||
|
||||
@@ -12,7 +12,6 @@ import android.support.v4.media.MediaMetadataCompat
|
||||
import androidx.media.MediaBrowserServiceCompat
|
||||
import androidx.media.utils.MediaConstants
|
||||
import org.jellyfin.mobile.R
|
||||
import org.jellyfin.mobile.controller.ApiController
|
||||
import org.jellyfin.mobile.media.MediaService
|
||||
import org.jellyfin.mobile.media.mediaId
|
||||
import org.jellyfin.mobile.media.setAlbum
|
||||
@@ -24,6 +23,7 @@ import org.jellyfin.mobile.media.setMediaId
|
||||
import org.jellyfin.mobile.media.setMediaUri
|
||||
import org.jellyfin.mobile.media.setTitle
|
||||
import org.jellyfin.mobile.media.setTrackNumber
|
||||
import org.jellyfin.sdk.api.client.ApiClient
|
||||
import org.jellyfin.sdk.api.client.exception.ApiClientException
|
||||
import org.jellyfin.sdk.api.operations.GenresApi
|
||||
import org.jellyfin.sdk.api.operations.ImageApi
|
||||
@@ -40,12 +40,12 @@ import org.jellyfin.sdk.model.api.SortOrder
|
||||
import org.jellyfin.sdk.model.serializer.toUUID
|
||||
import org.jellyfin.sdk.model.serializer.toUUIDOrNull
|
||||
import timber.log.Timber
|
||||
import java.util.*
|
||||
import java.util.UUID
|
||||
|
||||
@Suppress("TooManyFunctions")
|
||||
class LibraryBrowser(
|
||||
private val context: Context,
|
||||
private val apiController: ApiController,
|
||||
private val apiClient: ApiClient,
|
||||
private val itemsApi: ItemsApi,
|
||||
private val userViewsApi: UserViewsApi,
|
||||
private val genresApi: GenresApi,
|
||||
@@ -76,8 +76,10 @@ class LibraryBrowser(
|
||||
val split = parentId.split('|')
|
||||
|
||||
@Suppress("MagicNumber")
|
||||
if (split.size !in 1..3)
|
||||
if (split.size !in 1..3) {
|
||||
Timber.e("Invalid libraryId format '$parentId'")
|
||||
return null
|
||||
}
|
||||
|
||||
val type = split[0]
|
||||
val libraryId = split.getOrNull(1)?.toUUIDOrNull()
|
||||
@@ -114,8 +116,10 @@ class LibraryBrowser(
|
||||
suspend fun buildPlayQueue(mediaId: String): Pair<List<MediaMetadataCompat>, Int>? {
|
||||
val split = mediaId.split('|')
|
||||
@Suppress("MagicNumber")
|
||||
if (split.size != 3)
|
||||
if (split.size != 3) {
|
||||
Timber.e("Invalid mediaId format '$mediaId'")
|
||||
return null
|
||||
}
|
||||
|
||||
val type = split[0]
|
||||
val collectionId = split[1].toUUID()
|
||||
@@ -159,8 +163,7 @@ class LibraryBrowser(
|
||||
Timber.d("Searching for artist $artistQuery")
|
||||
searchItems(artistQuery, "MusicArtist")
|
||||
}?.let { artistId ->
|
||||
itemsApi.getItems(
|
||||
userId = apiController.currentUser,
|
||||
itemsApi.getItemsByUserId(
|
||||
artistIds = listOf(artistId),
|
||||
includeItemTypes = listOf("Audio"),
|
||||
sortBy = listOf("Random"),
|
||||
@@ -179,8 +182,7 @@ class LibraryBrowser(
|
||||
|
||||
// Fallback to generic search
|
||||
Timber.d("Searching for '$searchQuery'")
|
||||
val result by itemsApi.getItems(
|
||||
userId = apiController.currentUser,
|
||||
val result by itemsApi.getItemsByUserId(
|
||||
searchTerm = searchQuery,
|
||||
includeItemTypes = listOf("Audio"),
|
||||
recursive = true,
|
||||
@@ -197,8 +199,7 @@ class LibraryBrowser(
|
||||
* Find a single specific item for the given [searchQuery] with a specific [type]
|
||||
*/
|
||||
private suspend fun searchItems(searchQuery: String, type: String): UUID? {
|
||||
val result by itemsApi.getItems(
|
||||
userId = apiController.currentUser,
|
||||
val result by itemsApi.getItemsByUserId(
|
||||
searchTerm = searchQuery,
|
||||
includeItemTypes = listOf(type),
|
||||
recursive = true,
|
||||
@@ -217,16 +218,14 @@ class LibraryBrowser(
|
||||
}
|
||||
|
||||
private suspend fun getLibraries(): List<MediaBrowserCompat.MediaItem> {
|
||||
val userViews by userViewsApi.getUserViews(
|
||||
userId = apiController.currentUser ?: return emptyList()
|
||||
)
|
||||
val userViews by userViewsApi.getUserViews()
|
||||
|
||||
return userViews.items.orEmpty()
|
||||
.filter { item -> item.collectionType.equals("music", ignoreCase = true) }
|
||||
.map { item ->
|
||||
val itemImageUrl = imageApi.getItemImageUrl(
|
||||
itemId = item.id,
|
||||
imageType = ImageType.PRIMARY
|
||||
imageType = ImageType.PRIMARY,
|
||||
)
|
||||
|
||||
val description = MediaDescriptionCompat.Builder().apply {
|
||||
@@ -264,8 +263,7 @@ class LibraryBrowser(
|
||||
}
|
||||
|
||||
private suspend fun getRecents(libraryId: UUID): List<MediaMetadataCompat>? {
|
||||
val result by itemsApi.getItems(
|
||||
userId = apiController.currentUser,
|
||||
val result by itemsApi.getItemsByUserId(
|
||||
parentId = libraryId,
|
||||
includeItemTypes = listOf("Audio"),
|
||||
filters = listOf(ItemFilter.IS_PLAYED),
|
||||
@@ -286,8 +284,7 @@ class LibraryBrowser(
|
||||
filterArtist: UUID? = null,
|
||||
filterGenre: UUID? = null
|
||||
): List<MediaBrowserCompat.MediaItem>? {
|
||||
val result by itemsApi.getItems(
|
||||
userId = apiController.currentUser,
|
||||
val result by itemsApi.getItemsByUserId(
|
||||
parentId = libraryId,
|
||||
artistIds = filterArtist?.let(::listOf),
|
||||
genreIds = filterGenre?.let(::listOf),
|
||||
@@ -303,8 +300,7 @@ class LibraryBrowser(
|
||||
}
|
||||
|
||||
private suspend fun getArtists(libraryId: UUID): List<MediaBrowserCompat.MediaItem>? {
|
||||
val result by itemsApi.getItems(
|
||||
userId = apiController.currentUser,
|
||||
val result by itemsApi.getItemsByUserId(
|
||||
parentId = libraryId,
|
||||
includeItemTypes = listOf("MusicArtist"),
|
||||
sortBy = listOf(ItemFields.SORT_NAME.serialName),
|
||||
@@ -319,7 +315,7 @@ class LibraryBrowser(
|
||||
|
||||
private suspend fun getGenres(libraryId: UUID): List<MediaBrowserCompat.MediaItem>? {
|
||||
val result by genresApi.getGenres(
|
||||
userId = apiController.currentUser,
|
||||
userId = apiClient.userId,
|
||||
parentId = libraryId,
|
||||
imageTypeLimit = 1,
|
||||
enableImageTypes = listOf(ImageType.PRIMARY),
|
||||
@@ -330,8 +326,7 @@ class LibraryBrowser(
|
||||
}
|
||||
|
||||
private suspend fun getPlaylists(libraryId: UUID): List<MediaBrowserCompat.MediaItem>? {
|
||||
val result by itemsApi.getItems(
|
||||
userId = apiController.currentUser,
|
||||
val result by itemsApi.getItemsByUserId(
|
||||
parentId = libraryId,
|
||||
includeItemTypes = listOf("Playlist"),
|
||||
sortBy = listOf("DatePlayed"),
|
||||
@@ -346,8 +341,7 @@ class LibraryBrowser(
|
||||
}
|
||||
|
||||
private suspend fun getAlbum(albumId: UUID): List<MediaMetadataCompat>? {
|
||||
val result by itemsApi.getItems(
|
||||
userId = apiController.currentUser,
|
||||
val result by itemsApi.getItemsByUserId(
|
||||
parentId = albumId,
|
||||
sortBy = listOf(ItemFields.SORT_NAME.serialName),
|
||||
)
|
||||
@@ -357,8 +351,7 @@ class LibraryBrowser(
|
||||
|
||||
private suspend fun getPlaylist(playlistId: UUID): List<MediaMetadataCompat>? {
|
||||
val result by playlistsApi.getPlaylistItems(
|
||||
playlistId = playlistId,
|
||||
userId = apiController.currentUser ?: return null
|
||||
playlistId = playlistId
|
||||
)
|
||||
|
||||
return result.extractItems("${LibraryPage.PLAYLIST}|$playlistId")
|
||||
@@ -389,8 +382,8 @@ class LibraryBrowser(
|
||||
if (item.type.equals("audio", ignoreCase = true)) {
|
||||
val uri = universalAudioApi.getUniversalAudioStreamUrl(
|
||||
itemId = item.id,
|
||||
userId = apiController.currentUser,
|
||||
deviceId = apiController.currentDeviceId,
|
||||
userId = apiClient.userId,
|
||||
deviceId = apiClient.deviceInfo.id,
|
||||
maxStreamingBitrate = 140000000,
|
||||
container = listOf(
|
||||
"opus",
|
||||
|
||||
@@ -26,7 +26,6 @@ import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.launch
|
||||
import org.jellyfin.mobile.BuildConfig
|
||||
import org.jellyfin.mobile.PLAYER_EVENT_CHANNEL
|
||||
import org.jellyfin.mobile.controller.ApiController
|
||||
import org.jellyfin.mobile.player.source.JellyfinMediaSource
|
||||
import org.jellyfin.mobile.player.source.MediaQueueManager
|
||||
import org.jellyfin.mobile.utils.Constants
|
||||
@@ -51,10 +50,8 @@ import org.koin.core.component.KoinComponent
|
||||
import org.koin.core.component.inject
|
||||
import org.koin.core.qualifier.named
|
||||
import timber.log.Timber
|
||||
import java.util.*
|
||||
|
||||
class PlayerViewModel(application: Application) : AndroidViewModel(application), KoinComponent, Player.Listener {
|
||||
private val apiController by inject<ApiController>()
|
||||
private val playStateApi by inject<PlayStateApi>()
|
||||
|
||||
private val lifecycleObserver = PlayerLifecycleObserver(this)
|
||||
@@ -243,10 +240,7 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application),
|
||||
|
||||
// Mark video as watched if playback finished
|
||||
if (hasFinished) {
|
||||
playStateApi.markPlayedItem(
|
||||
userId = apiController.requireUser(),
|
||||
itemId = mediaSource.itemId,
|
||||
)
|
||||
playStateApi.markPlayedItem(itemId = mediaSource.itemId)
|
||||
}
|
||||
} catch (e: ApiClientException) {
|
||||
Timber.e(e, "Failed to report playback stop")
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package org.jellyfin.mobile.player.source
|
||||
|
||||
import org.jellyfin.mobile.controller.ApiController
|
||||
import org.jellyfin.mobile.player.PlayerException
|
||||
import org.jellyfin.sdk.api.client.ApiClient
|
||||
import org.jellyfin.sdk.api.client.exception.ApiClientException
|
||||
import org.jellyfin.sdk.api.operations.ItemsApi
|
||||
import org.jellyfin.sdk.api.operations.MediaInfoApi
|
||||
@@ -12,7 +12,7 @@ import timber.log.Timber
|
||||
import java.util.UUID
|
||||
|
||||
class MediaSourceResolver(
|
||||
private val apiController: ApiController,
|
||||
private val apiClient: ApiClient,
|
||||
private val mediaInfoApi: MediaInfoApi,
|
||||
private val itemsApi: ItemsApi,
|
||||
) {
|
||||
@@ -25,10 +25,10 @@ class MediaSourceResolver(
|
||||
): Result<JellyfinMediaSource> {
|
||||
// Load media source info
|
||||
val mediaSourceInfo = try {
|
||||
val playbackInfoResponse by mediaInfoApi.getPostedPlaybackInfo(
|
||||
val response by mediaInfoApi.getPostedPlaybackInfo(
|
||||
itemId = itemId,
|
||||
data = PlaybackInfoDto(
|
||||
userId = apiController.requireUser(),
|
||||
userId = apiClient.userId,
|
||||
deviceProfile = deviceProfile,
|
||||
startTimeTicks = startTimeTicks,
|
||||
audioStreamIndex = audioStreamIndex,
|
||||
@@ -37,7 +37,7 @@ class MediaSourceResolver(
|
||||
),
|
||||
)
|
||||
|
||||
playbackInfoResponse.mediaSources?.find { source ->
|
||||
response.mediaSources?.find { source ->
|
||||
source.id?.toUUIDOrNull() == itemId
|
||||
} ?: return Result.failure(PlayerException.UnsupportedContent())
|
||||
} catch (e: ApiClientException) {
|
||||
@@ -47,11 +47,8 @@ class MediaSourceResolver(
|
||||
|
||||
// Load additional item info if possible
|
||||
val item = try {
|
||||
val itemsResponse by itemsApi.getItems(
|
||||
userId = apiController.requireUser(),
|
||||
ids = listOf(itemId),
|
||||
)
|
||||
itemsResponse.items?.firstOrNull()
|
||||
val response by itemsApi.getItemsByUserId(ids = listOf(itemId))
|
||||
response.items?.firstOrNull()
|
||||
} catch (e: ApiClientException) {
|
||||
Timber.e(e, "Failed to load item for media source $itemId")
|
||||
null
|
||||
|
||||
@@ -28,7 +28,7 @@ object Dependencies {
|
||||
const val room = "2.3.0"
|
||||
|
||||
// Network
|
||||
const val jellyfinSdk = "1.0.0-beta.7"
|
||||
const val jellyfinSdk = "1.0.0-beta.8"
|
||||
const val jellyfinSdkSnapshot = "master-SNAPSHOT"
|
||||
const val okHttp = "4.9.1"
|
||||
const val coil = "1.1.1"
|
||||
|
||||
Reference in new issue
Block a user