From 41c64b7058c4b8cc040d69160002caeceb922baa Mon Sep 17 00:00:00 2001 From: Carlos <2092019+CarlosEsco@users.noreply.github.com> Date: Sun, 3 May 2020 13:26:47 -0400 Subject: [PATCH] fix anilist jsonnull issue (#300) added chucker to help with debugging stuff upped retrofit version --- app/build.gradle.kts | 7 ++++++- .../eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt | 2 +- .../main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9819a1d520..5ae9d45ecb 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -134,8 +134,13 @@ dependencies { implementation("com.squareup.okhttp3:logging-interceptor:$okhttpVersion") implementation("com.squareup.okio:okio:2.6.0") + //Chucker + val chuckerVersion = "3.2.0" + debugImplementation ("com.github.ChuckerTeam.Chucker:library:$chuckerVersion") + releaseImplementation ("com.github.ChuckerTeam.Chucker:library-no-op:$chuckerVersion") + // REST - val retrofitVersion = "2.7.1" + val retrofitVersion = "2.7.2" implementation("com.squareup.retrofit2:retrofit:$retrofitVersion") implementation("com.squareup.retrofit2:converter-gson:$retrofitVersion") diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt index 8473a54c6e..bc4598fd07 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt @@ -182,7 +182,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { struct["coverImage"]["large"].asString, struct["description"].nullString.orEmpty(), struct["type"].asString, - struct["status"].asString, + struct["status"].nullString.orEmpty(), date, struct["chapters"].nullInt ?: 0 ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt index b190d99c27..e9e4024d19 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt @@ -1,6 +1,7 @@ package eu.kanade.tachiyomi.network import android.content.Context +import com.chuckerteam.chucker.api.ChuckerInterceptor import okhttp3.Cache import okhttp3.OkHttpClient import java.io.File @@ -16,6 +17,7 @@ class NetworkHelper(context: Context) { val client = OkHttpClient.Builder() .cookieJar(cookieManager) .cache(Cache(cacheDir, cacheSize)) + .addInterceptor(ChuckerInterceptor(context)) .build() val cloudflareClient = client.newBuilder()