StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
Fix Jellyfin auth handling on PR 125
David Nashash6858ae6fa249
diff --git a/app/src/main/java/com/streamvault/app/StreamVaultApp.kt b/app/src/main/java/com/streamvault/app/StreamVaultApp.ktindex f5495b66..d8a478b1 100644--- a/app/src/main/java/com/streamvault/app/StreamVaultApp.kt+++ b/app/src/main/java/com/streamvault/app/StreamVaultApp.kt@@ -6,11 +6,13 @@ import coil3.PlatformContextimport coil3.SingletonImageLoaderimport coil3.disk.DiskCacheimport coil3.memory.MemoryCache+import coil3.network.okhttp.OkHttpNetworkFetcherFactoryimport coil3.request.crossfadeimport com.streamvault.app.diagnostics.CrashReportStoreimport com.streamvault.app.diagnostics.RuntimeDiagnosticsManagerimport com.streamvault.app.update.GitHubReleaseCheckerimport com.streamvault.app.ui.accessibility.isReducedMotionEnabled+import com.streamvault.data.remote.jellyfin.JellyfinImageAuthInterceptorimport com.streamvault.data.preferences.PreferencesRepositoryimport com.streamvault.domain.model.Resultimport dagger.hilt.android.HiltAndroidApp@@ -31,6 +33,7 @@ import com.streamvault.data.sync.ProviderSyncWorkerimport com.streamvault.data.sync.XtreamIndexWorkerimport com.streamvault.player.timeshift.TimeshiftDiskManagerimport javax.inject.Inject+import okhttp3.OkHttpClient@HiltAndroidAppclass StreamVaultApp : Application(), SingletonImageLoader.Factory {@@ -43,6 +46,18 @@ class StreamVaultApp : Application(), SingletonImageLoader.Factory {@Injectlateinit var gitHubReleaseChecker: GitHubReleaseChecker+ @Inject+ lateinit var okHttpClient: OkHttpClient++ @Inject+ lateinit var jellyfinImageAuthInterceptor: JellyfinImageAuthInterceptor++ private val imageOkHttpClient: OkHttpClient by lazy {+ okHttpClient.newBuilder()+ .addInterceptor(jellyfinImageAuthInterceptor)+ .build()+ }+override fun onCreate() {super.onCreate()CrashReportStore.install(this)@@ -118,6 +133,13 @@ class StreamVaultApp : Application(), SingletonImageLoader.Factory {override fun newImageLoader(context: PlatformContext): ImageLoader {return ImageLoader.Builder(context)+ .components {+ add(+ OkHttpNetworkFetcherFactory(+ callFactory = { imageOkHttpClient }+ )+ )+ }.memoryCache {MemoryCache.Builder().maxSizePercent(context, 0.15) // Conservative TV memory cachediff --git a/data/src/main/java/com/streamvault/data/local/dao/Daos.kt b/data/src/main/java/com/streamvault/data/local/dao/Daos.ktindex 90bbe201..78a94d67 100644--- a/data/src/main/java/com/streamvault/data/local/dao/Daos.kt+++ b/data/src/main/java/com/streamvault/data/local/dao/Daos.kt@@ -2,6 +2,7 @@ package com.streamvault.data.local.daoimport androidx.room.*import com.streamvault.data.local.entity.*+import com.streamvault.domain.model.ProviderTypeimport kotlinx.coroutines.flow.Flowdata class RemoteIdMapping(@@ -42,6 +43,9 @@ abstract class ProviderDao {@Query("SELECT * FROM providers WHERE id IN (:ids)")abstract suspend fun getByIds(ids: List<Long>): List<ProviderEntity>+ @Query("SELECT * FROM providers WHERE type = :type")+ abstract fun getByTypeSync(type: ProviderType): List<ProviderEntity>+@Insert(onConflict = OnConflictStrategy.REPLACE)protected abstract suspend fun insertDirect(provider: ProviderEntity): Longdiff --git a/data/src/main/java/com/streamvault/data/remote/jellyfin/JellyfinImageAuthInterceptor.kt b/data/src/main/java/com/streamvault/data/remote/jellyfin/JellyfinImageAuthInterceptor.ktnew file mode 100644index 00000000..6a6e2302--- /dev/null+++ b/data/src/main/java/com/streamvault/data/remote/jellyfin/JellyfinImageAuthInterceptor.kt@@ -0,0 +1,77 @@+package com.streamvault.data.remote.jellyfin++import com.streamvault.data.local.dao.ProviderDao+import com.streamvault.data.local.entity.ProviderEntity+import com.streamvault.data.security.CredentialCrypto+import com.streamvault.domain.model.ProviderType+import javax.inject.Inject+import javax.inject.Singleton+import okhttp3.HttpUrl+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull+import okhttp3.Interceptor++@Singleton+class JellyfinImageAuthInterceptor @Inject constructor(+ private val providerDao: ProviderDao,+ private val credentialCrypto: CredentialCrypto+) : Interceptor {+ private companion object {+ private const val CACHE_TTL_MILLIS = 30_000L+ }++ @Volatile+ private var cachedProviders: List<ProviderEntity> = emptyList()++ @Volatile+ private var cacheExpiresAtMillis: Long = 0L++ override fun intercept(chain: Interceptor.Chain): okhttp3.Response {+ val request = chain.request()+ if (!request.header("Authorization").isNullOrBlank()) {+ return chain.proceed(request)+ }++ val provider = jellyfinProviders().firstOrNull { candidate -> candidate.matches(request.url) }+ ?: return chain.proceed(request)+ val accessToken = runCatching { credentialCrypto.decryptIfNeeded(provider.password) }+ .getOrNull()+ ?.takeIf { it.isNotBlank() }+ ?: return chain.proceed(request)++ return chain.proceed(+ request.newBuilder()+ .header(+ "Authorization",+ buildJellyfinAuthorizationHeader(provider.serverUrl, provider.username, accessToken)+ )+ .build()+ )+ }++ private fun jellyfinProviders(): List<ProviderEntity> {+ val now = System.currentTimeMillis()+ if (now < cacheExpiresAtMillis) {+ return cachedProviders+ }+ val refreshed = runCatching { providerDao.getByTypeSync(ProviderType.JELLYFIN) }+ .getOrDefault(emptyList())+ cachedProviders = refreshed+ cacheExpiresAtMillis = now + CACHE_TTL_MILLIS+ return refreshed+ }++ private fun ProviderEntity.matches(url: HttpUrl): Boolean {+ val baseUrl = serverUrl.toHttpUrlOrNull() ?: return false+ if (url.scheme != baseUrl.scheme || url.host != baseUrl.host || url.port != baseUrl.port) {+ return false+ }++ val baseSegments = baseUrl.pathSegments.filter { it.isNotEmpty() }+ val requestSegments = url.pathSegments.filter { it.isNotEmpty() }+ if (requestSegments.size < baseSegments.size) {+ return false+ }++ return baseSegments.indices.all { index -> requestSegments[index] == baseSegments[index] }+ }+}\ No newline at end of filediff --git a/data/src/main/java/com/streamvault/data/remote/jellyfin/JellyfinProvider.kt b/data/src/main/java/com/streamvault/data/remote/jellyfin/JellyfinProvider.ktindex c99e2f32..8669b812 100644--- a/data/src/main/java/com/streamvault/data/remote/jellyfin/JellyfinProvider.kt+++ b/data/src/main/java/com/streamvault/data/remote/jellyfin/JellyfinProvider.kt@@ -225,9 +225,9 @@ class JellyfinProvider @Inject constructor(return MovieEntity(streamId = stableRemoteId(remoteId),name = item.name.orEmpty(),- posterUrl = buildImageUrl(provider.serverUrl, remoteId, "Primary", item.imageTags?.get("Primary"), provider.password),+ posterUrl = buildImageUrl(provider.serverUrl, remoteId, "Primary", item.imageTags?.get("Primary")),backdropUrl = item.backdropImageTags?.firstOrNull()?.let { tag ->- buildImageUrl(provider.serverUrl, remoteId, "Backdrop", tag, provider.password, imageIndex = 0)+ buildImageUrl(provider.serverUrl, remoteId, "Backdrop", tag, imageIndex = 0)},categoryId = MOVIE_CATEGORY_ID,categoryName = "Movies",@@ -253,9 +253,9 @@ class JellyfinProvider @Inject constructor(seriesId = stableRemoteId(remoteId),providerSeriesId = remoteId,name = item.name.orEmpty(),- posterUrl = buildImageUrl(provider.serverUrl, remoteId, "Primary", item.imageTags?.get("Primary"), provider.password),+ posterUrl = buildImageUrl(provider.serverUrl, remoteId, "Primary", item.imageTags?.get("Primary")),backdropUrl = item.backdropImageTags?.firstOrNull()?.let { tag ->- buildImageUrl(provider.serverUrl, remoteId, "Backdrop", tag, provider.password, imageIndex = 0)+ buildImageUrl(provider.serverUrl, remoteId, "Backdrop", tag, imageIndex = 0)},categoryId = SERIES_CATEGORY_ID,categoryName = "Series",@@ -282,7 +282,7 @@ class JellyfinProvider @Inject constructor(seasonNumber = item.parentIndexNumber ?: 0,streamUrl = buildStreamUrl(provider.serverUrl, remoteId),containerExtension = item.primaryMediaSource?.container?.takeIf { it.isNotBlank() },- coverUrl = buildImageUrl(provider.serverUrl, remoteId, "Primary", item.imageTags?.get("Primary"), provider.password),+ coverUrl = buildImageUrl(provider.serverUrl, remoteId, "Primary", item.imageTags?.get("Primary")),plot = item.overview,duration = item.runTimeTicks?.let(::ticksToDurationString),durationSeconds = item.runTimeTicks?.let(::ticksToSeconds)?.toInt() ?: 0,@@ -323,9 +323,8 @@ class JellyfinProvider @Inject constructor(private fun buildStreamUrl(baseUrl: String, itemId: String): String ="${baseUrl.trimEnd('/')}/Videos/$itemId/stream"- private fun buildImageUrl(baseUrl: String, itemId: String, imageType: String, tag: String?, apiKey: String?, imageIndex: Int? = null): String {+ private fun buildImageUrl(baseUrl: String, itemId: String, imageType: String, tag: String?, imageIndex: Int? = null): String {val qs = buildList {- apiKey?.takeIf { it.isNotBlank() }?.let { add("api_key=${enc(it)}") }tag?.takeIf { it.isNotBlank() }?.let { add("tag=${enc(it)}") }}.joinToString("&")val path = if (imageIndex != null) "/Items/$itemId/Images/$imageType/$imageIndex" else "/Items/$itemId/Images/$imageType"diff --git a/data/src/main/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolver.kt b/data/src/main/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolver.ktindex 735c3053..6a207d2b 100644--- a/data/src/main/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolver.kt+++ b/data/src/main/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolver.kt@@ -2,6 +2,7 @@ package com.streamvault.data.remote.xtreamimport com.streamvault.data.local.dao.ProviderDaoimport com.streamvault.data.local.entity.ProviderEntity+import com.streamvault.data.remote.jellyfin.buildJellyfinAuthorizationHeaderimport com.streamvault.data.remote.http.toGenericRequestProfileimport com.streamvault.data.remote.stalker.StalkerProviderimport com.streamvault.data.remote.stalker.StalkerApiService@@ -121,6 +122,13 @@ class XtreamStreamUrlResolver @Inject constructor(fallbackContainerExtension = fallbackContainerExtension)?.let { return it }}+ if (provider?.type == ProviderType.JELLYFIN) {+ resolveDirectJellyfinUrl(+ provider = provider,+ url = url,+ fallbackContainerExtension = fallbackContainerExtension+ )?.let { return it }+ }return provider.applyPlaybackRequestProfile(ResolvedStreamUrl(url = url,@@ -248,6 +256,31 @@ class XtreamStreamUrlResolver @Inject constructor()}+ private fun resolveDirectJellyfinUrl(+ provider: ProviderEntity,+ url: String,+ fallbackContainerExtension: String?+ ): ResolvedStreamUrl? {+ if (url.isBlank()) {+ return null+ }+ val decryptedPassword = credentialCrypto.decryptIfNeeded(provider.password)+ return provider.applyPlaybackRequestProfile(+ ResolvedStreamUrl(+ url = url,+ expirationTime = extractStreamExpirationTime(url),+ containerExtension = fallbackContainerExtension,+ headers = mapOf(+ "Authorization" to buildJellyfinAuthorizationHeader(+ provider.serverUrl,+ provider.username,+ decryptedPassword+ )+ )+ )+ )+ }+private suspend fun resolveDirectStalkerUrl(provider: ProviderEntity,url: String,diff --git a/data/src/main/java/com/streamvault/data/sync/SyncManager.kt b/data/src/main/java/com/streamvault/data/sync/SyncManager.ktindex 548d557f..81d8f9cb 100644--- a/data/src/main/java/com/streamvault/data/sync/SyncManager.kt+++ b/data/src/main/java/com/streamvault/data/sync/SyncManager.kt@@ -4093,9 +4093,8 @@ class SyncManager @Inject constructor(val warnings = mutableListOf<String>()try {val decryptedPassword = credentialCrypto.decryptIfNeeded(provider.password)- val tokenPreview = decryptedPassword.take(8)- android.util.Log.e("JellyfinSync", "syncJellyfin: provider=${provider.id} url=${provider.serverUrl} user=${provider.username} pwd.len=${provider.password.length} pwd.prefix=${provider.password.take(10)} decrypted.len=${decryptedPassword.length} token=$tokenPreview")val decryptedProvider = provider.copy(password = decryptedPassword)+ android.util.Log.d("JellyfinSync", "Starting Jellyfin sync for provider=${provider.id}")progress(provider.id, onProgress, "Loading Jellyfin library...")val (resolvedMovies, resolvedSeries) = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {val movieResult = jellyfinProvider.fetchMovies(decryptedProvider)diff --git a/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt b/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.ktindex 6f767bd5..f382ba77 100644--- a/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt+++ b/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt@@ -533,6 +533,8 @@ class XtreamStreamUrlResolverTest {override suspend fun getById(id: Long): ProviderEntity? = provider?.takeIf { it.id == id }override suspend fun getByIds(ids: List<Long>): List<ProviderEntity> =listOfNotNull(provider).filter { it.id in ids }+ override fun getByTypeSync(type: ProviderType): List<ProviderEntity> =+ listOfNotNull(provider).filter { it.type == type }override suspend fun insertDirect(provider: ProviderEntity): Long = provider.idoverride suspend fun updateDirect(provider: ProviderEntity) = Unitoverride suspend fun insert(provider: ProviderEntity): Long = provider.iddiff --git a/data/src/test/java/com/streamvault/data/repository/ProviderRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/ProviderRepositoryImplTest.ktindex 20440a91..fd5388aa 100644--- a/data/src/test/java/com/streamvault/data/repository/ProviderRepositoryImplTest.kt+++ b/data/src/test/java/com/streamvault/data/repository/ProviderRepositoryImplTest.kt@@ -13,6 +13,7 @@ import com.streamvault.data.local.entity.CategoryEntityimport com.streamvault.data.manager.recording.RecordingAlarmSchedulerimport com.streamvault.data.manager.reminder.ProgramReminderAlarmSchedulerimport com.streamvault.data.preferences.PreferencesRepository+import com.streamvault.data.remote.jellyfin.JellyfinProviderimport com.streamvault.data.remote.stalker.StalkerApiServiceimport com.streamvault.data.remote.xtream.XtreamApiServiceimport com.streamvault.data.remote.dto.XtreamAuthResponse@@ -60,6 +61,7 @@ class ProviderRepositoryImplTest {private val syncMetadataRepository: SyncMetadataRepository = mock()private val recordingAlarmScheduler: RecordingAlarmScheduler = mock()private val programReminderAlarmScheduler: ProgramReminderAlarmScheduler = mock()+ private val jellyfinProvider: JellyfinProvider = mock()private val transactionRunner = object : DatabaseTransactionRunner {override suspend fun <T> inTransaction(block: suspend () -> T): T = block()}@@ -81,7 +83,8 @@ class ProviderRepositoryImplTest {syncMetadataRepository = syncMetadataRepository,transactionRunner = transactionRunner,recordingAlarmScheduler = recordingAlarmScheduler,- programReminderAlarmScheduler = programReminderAlarmScheduler+ programReminderAlarmScheduler = programReminderAlarmScheduler,+ jellyfinProvider = jellyfinProvider)private val repository = createRepository()diff --git a/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.ktindex fb5010b5..bd25cf8a 100644--- a/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt+++ b/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt@@ -18,6 +18,7 @@ import com.streamvault.data.local.entity.SeriesBrowseEntityimport com.streamvault.data.local.entity.ProviderEntityimport com.streamvault.data.local.entity.XtreamIndexJobEntityimport com.streamvault.data.preferences.PreferencesRepository+import com.streamvault.data.remote.jellyfin.JellyfinProviderimport com.streamvault.data.remote.dto.XtreamSeasonimport com.streamvault.data.remote.dto.XtreamSeriesInfoResponseimport com.streamvault.data.remote.stalker.StalkerCategoryRecord@@ -78,6 +79,7 @@ class SeriesRepositoryImplTest {private val preferencesRepository: PreferencesRepository = mock()private val xtreamStreamUrlResolver: XtreamStreamUrlResolver = mock()private val seriesCategoryHydrationDao: SeriesCategoryHydrationDao = mock()+ private val jellyfinProvider: JellyfinProvider = mock()private val xtreamContentIndexDao: XtreamContentIndexDao = mock()private val xtreamIndexJobDao: XtreamIndexJobDao = mock()private val syncManager: SyncManager = mock()@@ -773,6 +775,7 @@ class SeriesRepositoryImplTest {xtreamContentIndexDao = xtreamContentIndexDao,xtreamIndexJobDao = xtreamIndexJobDao,syncManager = syncManager,- seriesCategoryHydrationDao = seriesCategoryHydrationDao+ seriesCategoryHydrationDao = seriesCategoryHydrationDao,+ jellyfinProvider = jellyfinProvider)}diff --git a/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt b/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.ktindex 0c19cb31..6c81e4ec 100644--- a/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt+++ b/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt@@ -10,6 +10,7 @@ import com.streamvault.data.local.dao.CatalogSyncDaoimport com.streamvault.data.local.dao.ChannelStageCategorySummaryimport com.streamvault.data.local.dao.CategoryDaoimport com.streamvault.data.local.dao.ChannelDao+import com.streamvault.data.local.dao.EpisodeDaoimport com.streamvault.data.local.dao.MovieCategoryHydrationDaoimport com.streamvault.data.local.dao.MovieDaoimport com.streamvault.data.local.dao.ProgramDao@@ -46,6 +47,7 @@ import com.streamvault.data.remote.stalker.StalkerProgramRecordimport com.streamvault.data.remote.stalker.StalkerProviderProfileimport com.streamvault.data.remote.stalker.StalkerSessionimport com.streamvault.data.remote.stalker.StalkerApiService+import com.streamvault.data.remote.jellyfin.JellyfinProviderimport com.streamvault.data.preferences.PreferencesRepositoryimport com.streamvault.domain.model.ContentTypeimport kotlinx.coroutines.CompletableDeferred@@ -110,6 +112,8 @@ class SyncManagerTest {override fun getAll() = kotlinx.coroutines.flow.flowOf(listOfNotNull(provider))override suspend fun getAllSync(): List<ProviderEntity> = listOfNotNull(provider)override fun getActive() = kotlinx.coroutines.flow.flowOf(provider)+ override fun getByTypeSync(type: ProviderType): List<ProviderEntity> =+ listOfNotNull(provider).filter { it.type == type }override suspend fun insertDirect(provider: ProviderEntity) = this.provider?.id ?: 0Loverride suspend fun updateDirect(provider: ProviderEntity) = Unitoverride suspend fun insert(provider: ProviderEntity) = this.provider?.id ?: 0L@@ -213,6 +217,7 @@ class SyncManagerTest {private val channelDao: ChannelDao = mock()private val movieDao: MovieDao = mock()private val seriesDao: SeriesDao = mock()+ private val episodeDao: EpisodeDao = mock()private val programDao: ProgramDao = mock()private val categoryDao: CategoryDao = mock()private val catalogSyncDao: CatalogSyncDao = mock()@@ -226,6 +231,7 @@ class SyncManagerTest {private val epgSourceRepo: EpgSourceRepository = mock()private val preferencesRepo: PreferencesRepository = mock()private val stalkerApiService: StalkerApiService = mock()+ private val jellyfinProvider: JellyfinProvider = mock()private val xtreamBackend = FakeXtreamBackend()private val xtreamJson = Json {ignoreUnknownKeys = true@@ -350,6 +356,8 @@ class SyncManagerTest {xtreamIndexJobDao = xtreamIndexJobDao,xtreamLiveOnboardingDao = xtreamLiveOnboardingDao,stalkerApiService = stalkerApiService,+ episodeDao = episodeDao,+ jellyfinProvider = jellyfinProvider,xtreamJson = xtreamJson,m3uParser = M3uParser(),epgRepository = epgRepo,diff --git a/domain/src/test/java/com/streamvault/domain/usecase/SyncProviderTest.kt b/domain/src/test/java/com/streamvault/domain/usecase/SyncProviderTest.ktindex 7ee90604..d56cc956 100644--- a/domain/src/test/java/com/streamvault/domain/usecase/SyncProviderTest.kt+++ b/domain/src/test/java/com/streamvault/domain/usecase/SyncProviderTest.kt@@ -158,6 +158,23 @@ private class FakeSyncProviderRepository(id: Long?): Result<Provider> = error("Not used in test")+ override suspend fun loginJellyfin(+ serverUrl: String,+ username: String,+ password: String,+ name: String,+ onProgress: ((String) -> Unit)?,+ id: Long?+ ): Result<Provider> = error("Not used in test")++ override suspend fun loginJellyfinQuickConnect(+ serverUrl: String,+ name: String,+ onCode: ((String) -> Unit)?,+ onProgress: ((String) -> Unit)?,+ id: Long?+ ): Result<Provider> = error("Not used in test")+override suspend fun refreshProviderData(providerId: Long,force: Boolean,diff --git a/domain/src/test/java/com/streamvault/domain/usecase/ValidateAndAddProviderTest.kt b/domain/src/test/java/com/streamvault/domain/usecase/ValidateAndAddProviderTest.ktindex 088a18db..8ae0fd90 100644--- a/domain/src/test/java/com/streamvault/domain/usecase/ValidateAndAddProviderTest.kt+++ b/domain/src/test/java/com/streamvault/domain/usecase/ValidateAndAddProviderTest.kt@@ -3,6 +3,8 @@ package com.streamvault.domain.usecaseimport com.google.common.truth.Truth.assertThatimport com.streamvault.domain.manager.ProviderCredentialsimport com.streamvault.domain.manager.ProviderSetupInputValidator+import com.streamvault.domain.manager.ValidatedJellyfinProviderInput+import com.streamvault.domain.manager.ValidatedJellyfinQuickConnectProviderInputimport com.streamvault.domain.model.Programimport com.streamvault.domain.manager.ValidatedM3uProviderInputimport com.streamvault.domain.manager.ValidatedStalkerProviderInput@@ -506,6 +508,20 @@ private class FakeProviderSetupInputValidator(timezone = "UTC",locale = "en")+ ),+ private val jellyfinResult: Result<ValidatedJellyfinProviderInput> = Result.success(+ ValidatedJellyfinProviderInput(+ serverUrl = "https://jellyfin.example.com",+ username = "user",+ password = "secret",+ name = "Jellyfin"+ )+ ),+ private val jellyfinQuickConnectResult: Result<ValidatedJellyfinQuickConnectProviderInput> = Result.success(+ ValidatedJellyfinQuickConnectProviderInput(+ serverUrl = "https://jellyfin.example.com",+ name = "Jellyfin"+ ))) : ProviderSetupInputValidator {override fun validateXtream(@@ -541,6 +557,19 @@ private class FakeProviderSetupInputValidator(deviceId2: String,signature: String): Result<ValidatedStalkerProviderInput> = stalkerResult++ override fun validateJellyfin(+ serverUrl: String,+ username: String,+ password: String,+ name: String,+ allowBlankPassword: Boolean+ ): Result<ValidatedJellyfinProviderInput> = jellyfinResult++ override fun validateJellyfinQuickConnect(+ serverUrl: String,+ name: String+ ): Result<ValidatedJellyfinQuickConnectProviderInput> = jellyfinQuickConnectResult}private data class XtreamCall(@@ -698,6 +727,40 @@ private class FakeProviderRepository : ProviderRepository {)}+ override suspend fun loginJellyfin(+ serverUrl: String,+ username: String,+ password: String,+ name: String,+ onProgress: ((String) -> Unit)?,+ id: Long?+ ): Result<Provider> {+ return Result.success(+ provider(id = id ?: 4L, name = name, type = ProviderType.JELLYFIN).copy(+ serverUrl = serverUrl,+ username = username,+ password = password+ )+ )+ }++ override suspend fun loginJellyfinQuickConnect(+ serverUrl: String,+ name: String,+ onCode: ((String) -> Unit)?,+ onProgress: ((String) -> Unit)?,+ id: Long?+ ): Result<Provider> {+ onCode?.invoke("ABCD")+ return Result.success(+ provider(id = id ?: 5L, name = name, type = ProviderType.JELLYFIN).copy(+ serverUrl = serverUrl,+ username = name,+ password = "quick-connect-token"+ )+ )+ }+override suspend fun refreshProviderData(providerId: Long,force: Boolean,