Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Provide app okhttp client instance to subsonic api client. 

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
This commit is contained in:
Yahor Berdnikau 2018-06-24 17:27:33 +02:00
parent f007418298
commit b97e09b14b
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClient.kt
View File

@ -36,7 +36,8 @@ private const val READ_TIMEOUT = 60_000L
* @author Yahor Berdnikau
*/
class SubsonicAPIClient(
config: SubsonicClientConfiguration
config: SubsonicClientConfiguration,
baseOkClient: OkHttpClient = OkHttpClient.Builder().build()
) {
private val versionInterceptor = VersionInterceptor(config.minimalProtocolVersion) {
protocolVersion = it
@ -59,7 +60,7 @@ class SubsonicAPIClient(
wrappedApi.currentApiVersion = field
}
private val okHttpClient = OkHttpClient.Builder()
private val okHttpClient = baseOkClient.newBuilder()
.readTimeout(READ_TIMEOUT, MILLISECONDS)
.apply { if (config.allowSelfSignedCertificate) allowSelfSignedCertificates() }
.addInterceptor { chain ->

2
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/di/SubsonicApiModule.kt
View File

@ -6,5 +6,5 @@ import org.moire.ultrasonic.api.subsonic.SubsonicAPIClient
const val SUBSONIC_API_CLIENT_CONTEXT = "SubsonicApiClientContext"
fun Context.subsonicApiModule() = context(SUBSONIC_API_CLIENT_CONTEXT) {
bean { return@bean SubsonicAPIClient(get()) }
bean { return@bean SubsonicAPIClient(get(), get()) }
}

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt
View File

@ -2,6 +2,7 @@ package org.moire.ultrasonic.app
import android.app.Application
import org.koin.android.ext.android.startKoin
import org.moire.ultrasonic.di.baseNetworkModule
import org.moire.ultrasonic.di.directoriesModule
import org.moire.ultrasonic.di.musicServiceModule
import org.moire.ultrasonic.util.Util
@ -13,6 +14,7 @@ class UApp : Application() {
val sharedPreferences = Util.getPreferences(this)
startKoin(this, listOf(
directoriesModule,
baseNetworkModule,
musicServiceModule(sharedPreferences)
))
}

11
ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/BaseNetworkModule.kt Normal file
View File

@ -0,0 +1,11 @@
package org.moire.ultrasonic.di
import okhttp3.OkHttpClient
import org.koin.dsl.module.applicationContext
/**
* Provides base network dependencies.
*/
val baseNetworkModule = applicationContext {
bean { OkHttpClient.Builder().build() }
}