FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a different retrofit builder for each service

Browse Source
This commit is contained in:
Shinokuni 2020-10-27 21:30:26 +01:00
parent 81de8985c8
commit da6b68fd2e
1 changed files with 12 additions and 11 deletions

23
api/src/main/java/com/readrops/api/ApiModule.kt

@ -23,6 +23,8 @@ import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
import retrofit2.converter.moshi.MoshiConverterFactory import retrofit2.converter.moshi.MoshiConverterFactory
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
const val BASE_URL = "https://baseurl.com"
val apiModule = module { val apiModule = module {
single(createdAtStart = true) { single(createdAtStart = true) {
@ -38,7 +40,7 @@ val apiModule = module {
//region freshrss //region freshrss
single { single {
FreshRSSDataSource(get<FreshRSSService>()) FreshRSSDataSource(get())
} }
single { single {
@ -47,7 +49,10 @@ val apiModule = module {
} }
single(named("freshrssRetrofit")) { single(named("freshrssRetrofit")) {
get<Retrofit.Builder>() Retrofit.Builder() // url will be set dynamically in an interceptor
.baseUrl(BASE_URL)
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.client(get<OkHttpClient>())
.addConverterFactory(MoshiConverterFactory.create(get<Moshi>(named("freshrssMoshi")))) .addConverterFactory(MoshiConverterFactory.create(get<Moshi>(named("freshrssMoshi"))))
.build() .build()
} }
@ -65,7 +70,7 @@ val apiModule = module {
//region nextcloud news //region nextcloud news
single { single {
NextNewsDataSource(get<NextNewsService>()) NextNewsDataSource(get())
} }
single { single {
@ -74,7 +79,10 @@ val apiModule = module {
} }
single(named("nextcloudNewsRetrofit")) { single(named("nextcloudNewsRetrofit")) {
get<Retrofit.Builder>() Retrofit.Builder() // url will be set dynamically in an interceptor
.baseUrl(BASE_URL)
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.client(get<OkHttpClient>())
.addConverterFactory(MoshiConverterFactory.create(get<Moshi>(named("nextcloudNewsMoshi")))) .addConverterFactory(MoshiConverterFactory.create(get<Moshi>(named("nextcloudNewsMoshi"))))
.build() .build()
} }
@ -89,13 +97,6 @@ val apiModule = module {
//endregion nextcloud news //endregion nextcloud news
single {
Retrofit.Builder() // url will be set dynamically in an interceptor
.baseUrl("https://baseurl.com")
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.client(get<OkHttpClient>())
}
single { single {
AuthInterceptor() AuthInterceptor()
} }