From a6d4b0a9996f09766fd5cc127c6726c989a93c54 Mon Sep 17 00:00:00 2001 From: Carlos Date: Sat, 14 Mar 2020 20:10:40 -0400 Subject: [PATCH] remove rx call adapter since its not used anymore --- app/build.gradle.kts | 1 - .../java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt | 4 ++-- .../java/eu/kanade/tachiyomi/data/track/kitsu/KitsuApi.kt | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6e347b7bae..4c9ef098c0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -135,7 +135,6 @@ dependencies { val retrofit_version = "2.7.1" implementation("com.squareup.retrofit2:retrofit:$retrofit_version") implementation("com.squareup.retrofit2:converter-gson:$retrofit_version") - implementation("com.squareup.retrofit2:adapter-rxjava:$retrofit_version") // JSON implementation("com.google.code.gson:gson:2.8.6") diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt index 2af8d3dfda..31fdc880ba 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt @@ -123,11 +123,11 @@ class Bangumi(private val context: Context, id: Int) : TrackService(id) { } companion object { - const val READING = 3 + const val PLANNING = 1 const val COMPLETED = 2 + const val READING = 3 const val ON_HOLD = 4 const val DROPPED = 5 - const val PLANNING = 1 const val DEFAULT_STATUS = READING const val DEFAULT_SCORE = 0 diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuApi.kt index 272206f034..76aad53386 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuApi.kt @@ -14,7 +14,6 @@ import eu.kanade.tachiyomi.network.POST import okhttp3.FormBody import okhttp3.OkHttpClient import retrofit2.Retrofit -import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory import retrofit2.converter.gson.GsonConverterFactory import retrofit2.http.Body import retrofit2.http.Field @@ -35,7 +34,6 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor) .baseUrl(baseUrl) .client(authClient) .addConverterFactory(GsonConverterFactory.create(GsonBuilder().serializeNulls().create())) - .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) .build() .create(KitsuApi.Rest::class.java) @@ -43,7 +41,6 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor) .baseUrl(algoliaKeyUrl) .client(authClient) .addConverterFactory(GsonConverterFactory.create()) - .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) .build() .create(KitsuApi.SearchKeyRest::class.java) @@ -51,7 +48,6 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor) .baseUrl(algoliaUrl) .client(client) .addConverterFactory(GsonConverterFactory.create()) - .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) .build() .create(KitsuApi.AgoliaSearchRest::class.java) @@ -142,7 +138,6 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor) .baseUrl(loginUrl) .client(client) .addConverterFactory(GsonConverterFactory.create()) - .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) .build() .create(KitsuApi.LoginRest::class.java) .requestAccessToken(username, password)