Merge pull request #594 from namehillsoftware/chore/remove-okhttp-datasource

davidvedvick · web-flow · commit 8a764b4d24d7 · 2025-11-14T18:45:08.000-06:00
[Chore] Remove OkHttp Datasource
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,11 +1,11 @@
 [versions]
 activityCompose = "1.11.0"
-agp = "8.13.0"
+agp = "8.13.1"
 androidJunit5 = "1.14.0.0"
 annotation = "1.9.1"
 assertjCore = "3.27.6"
-commonsCodec = "1.19.0"
-commonsIo = "2.20.0"
+commonsCodec = "1.20.0"
+commonsIo = "2.21.0"
 compose = "1.9.4"
 coreKtx = "1.17.0"
 desugar_jdk_libs = "2.1.5"
@@ -19,7 +19,7 @@ junitJupiterApi = "6.0.1"
 junitKtx = "1.3.0"
 kotlinxCoroutinesRx3 = "1.10.2"
 kotlin = "2.2.21"
-ktorVersion = "3.3.1"
+ktorVersion = "3.3.2"
 lazyJ = "0.11.0"
 lifecycle = "2.9.4"
 logbackAndroid = "3.0.0"
@@ -57,7 +57,6 @@ androidx-lifecycle-service = { module = "androidx.lifecycle:lifecycle-service",
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
 androidx-media = { module = "androidx.media:media", version.ref = "media" }
-androidx-media3-datasource-okhttp = { module = "androidx.media3:media3-datasource-okhttp", version.ref = "media3" }
 androidx-media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" }
 androidx-palette-ktx = { module = "androidx.palette:palette-ktx", version.ref = "paletteKtx" }
 androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" }
diff --git a/projectBlueWater/build.gradle b/projectBlueWater/build.gradle
@@ -195,7 +195,6 @@ dependencies {
 	implementation libs.androidx.lifecycle.service
 	implementation libs.androidx.lifecycle.runtime.ktx
 	implementation libs.androidx.media3.exoplayer
-	implementation libs.androidx.media3.datasource.okhttp
 	implementation libs.androidx.startup.runtime
 	implementation libs.androidx.compose.ui
 	implementation libs.androidx.compose.material
diff --git a/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/ApplicationDependenciesContainer.kt b/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/ApplicationDependenciesContainer.kt
@@ -132,11 +132,7 @@ object ApplicationDependenciesContainer {
 		}
 
 		override val mediaCenterDataFactories by lazy {
-			ServerHttpDataSourceProvider(
-				mediaCenterHttpClients,
-				okHttpClients.MediaCenterClient(),
-				applicationFeatureConfiguration
-			)
+			ServerHttpDataSourceProvider(mediaCenterHttpClients)
 		}
 
 		override val subsonicHttpClients by lazy {
@@ -148,11 +144,7 @@ object ApplicationDependenciesContainer {
 		}
 
 		override val subsonicDataFactories by lazy {
-			ServerHttpDataSourceProvider(
-				subsonicHttpClients,
-				okHttpClients.SubsonicClient(),
-				applicationFeatureConfiguration
-			)
+			ServerHttpDataSourceProvider(subsonicHttpClients)
 		}
 
 		override val audioCacheStreamSupplier by lazy {
diff --git a/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/connection/http/KtorFactory.kt b/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/connection/http/KtorFactory.kt
@@ -67,7 +67,7 @@ class KtorFactory(private val context: Context) : ProvideHttpPromiseClients {
 				.apply {
 					install(HttpTimeout) {
 						requestTimeoutMillis = null
-						socketTimeoutMillis = 45.seconds.inWholeMilliseconds
+						socketTimeoutMillis = 10.minutes.inWholeMilliseconds
 						connectTimeoutMillis = 45.seconds.inWholeMilliseconds
 					}
 				}
diff --git a/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/connection/http/OkHttpFactory.kt b/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/connection/http/OkHttpFactory.kt
@@ -100,14 +100,14 @@ class OkHttpFactory(private val context: Context) : ProvideHttpPromiseClients {
 		return "$applicationName/$versionName (Linux;Android ${Build.VERSION.RELEASE})"
 	}
 
-	inner class MediaCenterClient() : ProvideHttpPromiseServerClients<MediaCenterConnectionDetails>, ProvideOkHttpServerClients<MediaCenterConnectionDetails> {
+	inner class MediaCenterClient() : ProvideHttpPromiseServerClients<MediaCenterConnectionDetails> {
 		override fun promiseServerClient(connectionDetails: MediaCenterConnectionDetails): Promise<HttpPromiseClient> =
 			OkHttpPromiseClient(getOkHttpClient(connectionDetails)).toPromise()
 
 		override fun promiseStreamingServerClient(connectionDetails: MediaCenterConnectionDetails): Promise<HttpPromiseClient> =
 			OkHttpPromiseClient(getStreamingOkHttpClient(connectionDetails)).toPromise()
 
-		override fun getStreamingOkHttpClient(connectionDetails: MediaCenterConnectionDetails): OkHttpClient =
+		fun getStreamingOkHttpClient(connectionDetails: MediaCenterConnectionDetails): OkHttpClient =
 			getOkHttpClient(connectionDetails)
 				.newBuilder()
 				.configureForStreaming()
@@ -188,14 +188,14 @@ class OkHttpFactory(private val context: Context) : ProvideHttpPromiseClients {
 		}
 	}
 
-	inner class SubsonicClient() : ProvideHttpPromiseServerClients<SubsonicConnectionDetails>, ProvideOkHttpServerClients<SubsonicConnectionDetails> {
+	inner class SubsonicClient() : ProvideHttpPromiseServerClients<SubsonicConnectionDetails> {
 		override fun promiseServerClient(connectionDetails: SubsonicConnectionDetails): Promise<HttpPromiseClient> =
 			OkHttpPromiseClient(getOkHttpClient(connectionDetails)).toPromise()
 
 		override fun promiseStreamingServerClient(connectionDetails: SubsonicConnectionDetails): Promise<HttpPromiseClient> =
 			OkHttpPromiseClient(getStreamingOkHttpClient(connectionDetails)).toPromise()
 
-		override fun getStreamingOkHttpClient(connectionDetails: SubsonicConnectionDetails): OkHttpClient =
+		fun getStreamingOkHttpClient(connectionDetails: SubsonicConnectionDetails): OkHttpClient =
 			getOkHttpClient(connectionDetails)
 				.newBuilder()
 				.configureForStreaming()
diff --git a/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/connection/http/ProvideOkHttpServerClients.kt b/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/connection/http/ProvideOkHttpServerClients.kt
diff --git a/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/playback/exoplayer/ServerHttpDataSourceProvider.kt b/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/playback/exoplayer/ServerHttpDataSourceProvider.kt
@@ -1,29 +1,14 @@
 package com.lasthopesoftware.bluewater.client.playback.exoplayer
 
 import androidx.media3.datasource.DataSource
-import androidx.media3.datasource.okhttp.OkHttpDataSource
-import com.lasthopesoftware.bluewater.client.connection.http.ProvideOkHttpServerClients
 import com.lasthopesoftware.bluewater.client.connection.requests.ProvideHttpPromiseServerClients
-import com.lasthopesoftware.bluewater.features.access.HoldApplicationFeatureConfiguration
-import com.lasthopesoftware.promises.extensions.toPromise
 import com.namehillsoftware.handoff.promises.Promise
 
 class ServerHttpDataSourceProvider<TConnectionDetails>(
 	private val httpPromiseClients: ProvideHttpPromiseServerClients<TConnectionDetails>,
-	private val okHttpClients: ProvideOkHttpServerClients<TConnectionDetails>,
-	private val applicationFeatureConfiguration: HoldApplicationFeatureConfiguration,
 ): ProvideServerHttpDataSource<TConnectionDetails> {
 	override fun promiseDataSourceFactory(connectionDetails: TConnectionDetails): Promise<DataSource.Factory> =
-		applicationFeatureConfiguration
-			.promiseFeatureConfiguration()
-			.eventually { featureConfiguration ->
-				when (featureConfiguration.httpDataSourceType ?: HttpDataSourceType.OkHttp) {
-					HttpDataSourceType.HttpPromiseClient -> httpPromiseClients
-						.promiseStreamingServerClient(connectionDetails)
-						.then(HttpPromiseClientDataSource::Factory)
-					HttpDataSourceType.OkHttp -> OkHttpDataSource.Factory(
-						okHttpClients.getStreamingOkHttpClient(connectionDetails)
-					).toPromise()
-				}
-			}
+		httpPromiseClients
+			.promiseStreamingServerClient(connectionDetails)
+			.then(HttpPromiseClientDataSource::Factory)
 }
diff --git a/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/features/ApplicationFeatureConfiguration.kt b/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/features/ApplicationFeatureConfiguration.kt
@@ -3,11 +3,9 @@ package com.lasthopesoftware.bluewater.features
 import androidx.annotation.Keep
 import com.lasthopesoftware.bluewater.client.connection.http.HttpClientType
 import com.lasthopesoftware.bluewater.client.playback.engine.selection.PlaybackEngineType
-import com.lasthopesoftware.bluewater.client.playback.exoplayer.HttpDataSourceType
 
 @Keep
 data class ApplicationFeatureConfiguration(
     val playbackEngineType: PlaybackEngineType? = null,
-	val httpDataSourceType: HttpDataSourceType? = null,
 	val httpClientType: HttpClientType? = null,
 )
diff --git a/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/settings/hidden/HiddenSettingsView.kt b/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/settings/hidden/HiddenSettingsView.kt
@@ -35,7 +35,6 @@ import com.lasthopesoftware.bluewater.android.ui.theme.Dimensions
 import com.lasthopesoftware.bluewater.android.ui.theme.Dimensions.rowPadding
 import com.lasthopesoftware.bluewater.android.ui.theme.LocalSurfaceColor
 import com.lasthopesoftware.bluewater.client.connection.http.HttpClientType
-import com.lasthopesoftware.bluewater.client.playback.exoplayer.HttpDataSourceType
 import com.lasthopesoftware.bluewater.shared.observables.subscribeAsState
 
 private val optionsPadding = PaddingValues(start = 32.dp, end = 32.dp)
@@ -91,22 +90,22 @@ fun HiddenSettingsView(hiddenSettingsViewModel: HiddenSettingsViewModel) {
 						.selectableGroup()
 				) {
 					Text(
-						text = "HTTP Data Source Factory",
+						text = "HTTP Client Type",
 						modifier = Modifier.padding(rowPadding),
 					)
 
-					val dataSourceType by hiddenSettingsViewModel.dataSourceType.subscribeAsState()
+					val httpClientType by hiddenSettingsViewModel.httpClientType.subscribeAsState()
 					Row(
 						modifier = Modifier.padding(rowPadding)
 					) {
-						val dataSourceOption = HttpDataSourceType.OkHttp
+						val httpClientOption = HttpClientType.OkHttp
 						LabeledSelection(
-							label = dataSourceOption.name,
-							selected = dataSourceType == dataSourceOption,
-							onSelected = { hiddenSettingsViewModel.promiseDataSourceUpdate(dataSourceOption) },
+							label = httpClientOption.name,
+							selected = httpClientType == httpClientOption,
+							onSelected = { hiddenSettingsViewModel.promiseHttpClientType(httpClientOption) },
 							{
 								RadioButton(
-									selected = dataSourceType == dataSourceOption,
+									selected = httpClientType == httpClientOption,
 									onClick = null,
 								)
 							},
@@ -117,71 +116,19 @@ fun HiddenSettingsView(hiddenSettingsViewModel: HiddenSettingsViewModel) {
 					Row(
 						modifier = Modifier.padding(rowPadding)
 					) {
-						Column {
-							val dataSourceOption = HttpDataSourceType.HttpPromiseClient
-							LabeledSelection(
-								label = dataSourceOption.name,
-								selected = dataSourceType == dataSourceOption,
-								onSelected = { hiddenSettingsViewModel.promiseDataSourceUpdate(dataSourceOption) },
-								{
-									RadioButton(
-										selected = dataSourceType == dataSourceOption,
-										onClick = null,
-									)
-								},
-								role = Role.RadioButton,
-							)
-
-							Column(
-								modifier = Modifier
-									.padding(optionsPadding)
-									.selectableGroup()
-							) {
-								Text(
-									text = "HTTP Client Type",
-									modifier = Modifier.padding(rowPadding),
+						val httpClientOption = HttpClientType.Ktor
+						LabeledSelection(
+							label = httpClientOption.name,
+							selected = httpClientType == httpClientOption,
+							onSelected = { hiddenSettingsViewModel.promiseHttpClientType(httpClientOption) },
+							{
+								RadioButton(
+									selected = httpClientType == httpClientOption,
+									onClick = null,
 								)
-
-								val httpClientType by hiddenSettingsViewModel.httpClientType.subscribeAsState()
-								Row(
-									modifier = Modifier.padding(rowPadding)
-								) {
-									val httpClientOption = HttpClientType.OkHttp
-									LabeledSelection(
-										label = httpClientOption.name,
-										selected = httpClientType == httpClientOption,
-										onSelected = { hiddenSettingsViewModel.promiseHttpClientType(httpClientOption) },
-										{
-											RadioButton(
-												selected = httpClientType == httpClientOption,
-												onClick = null,
-											)
-										},
-										role = Role.RadioButton,
-										enabled = dataSourceType == dataSourceOption
-									)
-								}
-
-								Row(
-									modifier = Modifier.padding(rowPadding)
-								) {
-									val httpClientOption = HttpClientType.Ktor
-									LabeledSelection(
-										label = httpClientOption.name,
-										selected = httpClientType == httpClientOption,
-										onSelected = { hiddenSettingsViewModel.promiseHttpClientType(httpClientOption) },
-										{
-											RadioButton(
-												selected = httpClientType == httpClientOption,
-												onClick = null,
-											)
-										},
-										role = Role.RadioButton,
-										enabled = dataSourceType == dataSourceOption
-									)
-								}
-							}
-						}
+							},
+							role = Role.RadioButton,
+						)
 					}
 				}
 			}
diff --git a/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/settings/hidden/HiddenSettingsViewModel.kt b/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/settings/hidden/HiddenSettingsViewModel.kt
@@ -3,7 +3,6 @@ package com.lasthopesoftware.bluewater.settings.hidden
 import androidx.lifecycle.ViewModel
 import com.lasthopesoftware.bluewater.client.browsing.TrackLoadedViewState
 import com.lasthopesoftware.bluewater.client.connection.http.HttpClientType
-import com.lasthopesoftware.bluewater.client.playback.exoplayer.HttpDataSourceType
 import com.lasthopesoftware.bluewater.features.access.HoldApplicationFeatureConfiguration
 import com.lasthopesoftware.bluewater.settings.repository.access.HoldApplicationSettings
 import com.lasthopesoftware.bluewater.shared.observables.MutableInteractionState
@@ -18,11 +17,9 @@ class HiddenSettingsViewModel(
 
 	private val mutableIsLoading = MutableInteractionState(false)
 	private val mutableIsLoggingToFile = MutableInteractionState(false)
-	private val mutableDataSourceType = MutableInteractionState(HttpDataSourceType.OkHttp)
 	private val mutableHttpClientType = MutableInteractionState(HttpClientType.OkHttp)
 
 	val isLoggingToFile = mutableIsLoggingToFile.asInteractionState()
-	val dataSourceType = mutableDataSourceType.asInteractionState()
 	val httpClientType = mutableHttpClientType.asInteractionState()
 
 	override val isLoading = mutableIsLoading.asInteractionState()
@@ -32,7 +29,6 @@ class HiddenSettingsViewModel(
 		val promisedApplicationFeatures = applicationFeatureConfiguration
 			.promiseFeatureConfiguration()
 			.then { f ->
-				mutableDataSourceType.value = f.httpDataSourceType ?: HttpDataSourceType.OkHttp
 				mutableHttpClientType.value = f.httpClientType ?: HttpClientType.OkHttp
 			}
 
@@ -54,11 +50,6 @@ class HiddenSettingsViewModel(
 		return saveSettings()
 	}
 
-	fun promiseDataSourceUpdate(dataSourceType: HttpDataSourceType): Promise<*> {
-		mutableDataSourceType.value = dataSourceType
-		return saveSettings()
-	}
-
 	fun promiseHttpClientType(httpClientType: HttpClientType): Promise<*> {
 		mutableHttpClientType.value = httpClientType
 		return saveSettings()
@@ -78,7 +69,7 @@ class HiddenSettingsViewModel(
 		val promisedFeaturesUpdate = applicationFeatureConfiguration
 			.promiseFeatureConfiguration()
 			.eventually { features ->
-				val newFeatures = features.copy(httpDataSourceType = mutableDataSourceType.value, httpClientType = mutableHttpClientType.value)
+				val newFeatures = features.copy(httpClientType = mutableHttpClientType.value)
 				applicationFeatureConfiguration.promiseUpdatedFeatureConfiguration(newFeatures)
 			}
 			.unitResponse()
diff --git a/projectBlueWater/src/main/java/com/lasthopesoftware/promises/PromiseMachines.kt b/projectBlueWater/src/main/java/com/lasthopesoftware/promises/PromiseMachines.kt
@@ -31,7 +31,6 @@ object PromiseMachines {
 		override fun next(): Promise<Resolution> =
 			function(currentValue, this)
 				.also {
-					doCancel(it)
 					it.then(this)
 					proxyRejection(it)
 				}
diff --git a/projectBlueWater/src/main/java/com/lasthopesoftware/resources/io/BufferedSourcePromisingStream.kt b/projectBlueWater/src/main/java/com/lasthopesoftware/resources/io/BufferedSourcePromisingStream.kt
@@ -3,6 +3,7 @@ package com.lasthopesoftware.resources.io
 import com.lasthopesoftware.promises.extensions.preparePromise
 import com.lasthopesoftware.promises.extensions.toPromise
 import com.lasthopesoftware.resources.executors.ThreadPools
+import com.lasthopesoftware.resources.io.PromisingReadableStream.Companion.readingCancelledException
 import com.namehillsoftware.handoff.promises.Promise
 import okio.BufferedSource
 import java.util.concurrent.Executor
@@ -21,14 +22,11 @@ class BufferedSourcePromisingStream(
 	private val bufferedSource: BufferedSource,
 	private val transferExecutor: Executor? = ThreadPools.io,
 ) : PromisingReadableStream {
-	override fun promiseRead(b: ByteArray, off: Int, len: Int): Promise<Int> = transferExecutor?.preparePromise {
-		bufferedSource.read(b, off, len)
+	override fun promiseRead(b: ByteArray, off: Int, len: Int): Promise<Int> = transferExecutor?.preparePromise { cs ->
+		if (!cs.isCancelled) bufferedSource.read(b, off, len)
+		else throw readingCancelledException()
 	} ?: bufferedSource.read(b, off, len).toPromise()
 
-	override fun promiseReadAllBytes(): Promise<ByteArray> = transferExecutor?.preparePromise {
-		bufferedSource.readByteArray()
-	} ?: bufferedSource.readByteArray().toPromise()
-
 	override fun available(): Int = bufferedSource.buffer.size.toInt()
 
 	override fun promiseClose(): Promise<Unit> = transferExecutor?.preparePromise {
diff --git a/projectBlueWater/src/main/java/com/lasthopesoftware/resources/io/PromisingReadableStream.kt b/projectBlueWater/src/main/java/com/lasthopesoftware/resources/io/PromisingReadableStream.kt
@@ -21,7 +21,7 @@ interface PromisingReadableStream : PromisingCloseable {
 		private val logger by lazyLogger<PromisingReadableStream>()
 
 		fun PromisingReadableStream.readingCancelledException() =
-			CancellationException("Reading stream was cancelled with ${available()} bytes remaining.")
+			CancellationException("Reading stream cancelled with ${available()} bytes remaining.")
 	}
 
 	fun promiseRead(b: ByteArray, off: Int, len: Int): Promise<Int>
diff --git a/projectBlueWater/src/main/java/com/lasthopesoftware/resources/io/PromisingReadableStreamWrapper.kt b/projectBlueWater/src/main/java/com/lasthopesoftware/resources/io/PromisingReadableStreamWrapper.kt
@@ -3,6 +3,7 @@ package com.lasthopesoftware.resources.io
 import com.lasthopesoftware.promises.extensions.preparePromise
 import com.lasthopesoftware.promises.extensions.toPromise
 import com.lasthopesoftware.resources.executors.ThreadPools
+import com.lasthopesoftware.resources.io.PromisingReadableStream.Companion.readingCancelledException
 import com.namehillsoftware.handoff.promises.Promise
 import java.io.InputStream
 import java.util.concurrent.Executor
@@ -22,8 +23,9 @@ class PromisingReadableStreamWrapper(
 	private val transferExecutor: Executor? = ThreadPools.io,
 ) : PromisingReadableStream {
 
-    override fun promiseRead(b: ByteArray, off: Int, len: Int): Promise<Int> = transferExecutor?.preparePromise {
-		inputStream.read(b, off, len)
+    override fun promiseRead(b: ByteArray, off: Int, len: Int): Promise<Int> = transferExecutor?.preparePromise { cs ->
+		if (!cs.isCancelled) inputStream.read(b, off, len)
+		else throw readingCancelledException()
 	} ?: inputStream.read(b, off, len).toPromise()
 
 	override fun available(): Int = inputStream.available()
diff --git a/projectBlueWater/src/test/java/com/lasthopesoftware/bluewater/client/playback/exoplayer/GivenAnHttpPromiseClient/When getting the http data source provider.kt b/projectBlueWater/src/test/java/com/lasthopesoftware/bluewater/client/playback/exoplayer/GivenAnHttpPromiseClient/When getting the http data source provider.kt
diff --git a/projectBlueWater/src/test/java/com/lasthopesoftware/bluewater/client/playback/exoplayer/GivenNullDataSourceIsSelected/When getting the http data source provider.kt b/projectBlueWater/src/test/java/com/lasthopesoftware/bluewater/client/playback/exoplayer/GivenNullDataSourceIsSelected/When getting the http data source provider.kt
diff --git a/projectBlueWater/src/test/java/com/lasthopesoftware/bluewater/client/playback/exoplayer/GivenOkHttpIsSelectedDataSource/When getting the http data source provider.kt b/projectBlueWater/src/test/java/com/lasthopesoftware/bluewater/client/playback/exoplayer/GivenOkHttpIsSelectedDataSource/When getting the http data source provider.kt

Original file line number	Diff line number	Diff line change
`@@ -132,11 +132,7 @@ object ApplicationDependenciesContainer {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`override val mediaCenterDataFactories by lazy {`
`135`		`- ServerHttpDataSourceProvider(`
`136`		`- mediaCenterHttpClients,`
`137`		`- okHttpClients.MediaCenterClient(),`
`138`		`- applicationFeatureConfiguration`
`139`		`- )`
	`135`	`+ ServerHttpDataSourceProvider(mediaCenterHttpClients)`
`140`	`136`	`}`
`141`	`137`
`142`	`138`	`override val subsonicHttpClients by lazy {`
`@@ -148,11 +144,7 @@ object ApplicationDependenciesContainer {`
`148`	`144`	`}`
`149`	`145`
`150`	`146`	`override val subsonicDataFactories by lazy {`
`151`		`- ServerHttpDataSourceProvider(`
`152`		`- subsonicHttpClients,`
`153`		`- okHttpClients.SubsonicClient(),`
`154`		`- applicationFeatureConfiguration`
`155`		`- )`
	`147`	`+ ServerHttpDataSourceProvider(subsonicHttpClients)`
`156`	`148`	`}`
`157`	`149`
`158`	`150`	`override val audioCacheStreamSupplier by lazy {`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class KtorFactory(private val context: Context) : ProvideHttpPromiseClients {`
`67`	`67`	`.apply {`
`68`	`68`	`install(HttpTimeout) {`
`69`	`69`	`requestTimeoutMillis = null`
`70`		`- socketTimeoutMillis = 45.seconds.inWholeMilliseconds`
	`70`	`+ socketTimeoutMillis = 10.minutes.inWholeMilliseconds`
`71`	`71`	`connectTimeoutMillis = 45.seconds.inWholeMilliseconds`
`72`	`72`	`}`
`73`	`73`	`}`