Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert the converter factory back to gson

Browse Source
This commit is contained in:
Jobobby04 2020-10-13 11:43:46 -04:00
parent b67db6a25e
commit 543e089982
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
View File

@ -8,6 +8,8 @@ import eu.kanade.tachiyomi.extension.util.ExtensionLoader
import exh.source.BlacklistedSources import exh.source.BlacklistedSources
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonArray import kotlinx.serialization.json.JsonArray
import kotlinx.serialization.json.int import kotlinx.serialization.json.int
import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonObject
@ -23,7 +25,8 @@ internal class ExtensionGithubApi {
val service: ExtensionGithubService = ExtensionGithubService.create() val service: ExtensionGithubService = ExtensionGithubService.create()
return withContext(Dispatchers.IO) { return withContext(Dispatchers.IO) {
val response = service.getRepo() val response = Json.decodeFromString<JsonArray>(service.getRepo().toString())
parseResponse(response) parseResponse(response)
} }
} }

8
app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubService.kt
View File

@ -1,11 +1,9 @@
package eu.kanade.tachiyomi.extension.api package eu.kanade.tachiyomi.extension.api
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import com.google.gson.JsonArray
import eu.kanade.tachiyomi.network.NetworkHelper import eu.kanade.tachiyomi.network.NetworkHelper
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonArray
import okhttp3.MediaType.Companion.toMediaType
import retrofit2.Retrofit import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory
import retrofit2.http.GET import retrofit2.http.GET
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
@ -31,7 +29,7 @@ interface ExtensionGithubService {
fun create(): ExtensionGithubService { fun create(): ExtensionGithubService {
val adapter = Retrofit.Builder() val adapter = Retrofit.Builder()
.baseUrl(ExtensionGithubApi.BASE_URL) .baseUrl(ExtensionGithubApi.BASE_URL)
.addConverterFactory(Json.asConverterFactory("application/json".toMediaType())) .addConverterFactory(GsonConverterFactory.create())
.client(client) .client(client)
.build() .build()