mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-16 14:07:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to kotlinx.serialization for extensions and update fetching

Browse Source
This commit is contained in:
arkon
2020-10-11 14:53:02 -04:00
parent 19581792fc
commit 7a476abb53
6 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubRelease.kt
View File

@@ -1,7 +1,8 @@
package eu.kanade.tachiyomi.data.updater.github
import com.google.gson.annotations.SerializedName
import eu.kanade.tachiyomi.data.updater.Release
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
/**
* Release object.
@@ -11,10 +12,11 @@ import eu.kanade.tachiyomi.data.updater.Release
* @param info log of latest release.
* @param assets assets of latest release.
*/
@Serializable
class GithubRelease(
@SerializedName("tag_name") val version: String,
@SerializedName("body") override val info: String,
@SerializedName("assets") private val assets: List<Assets>
@SerialName("tag_name") val version: String,
@SerialName("body") override val info: String,
@SerialName("assets") private val assets: List<Assets>
) : Release {
/**
@@ -28,5 +30,6 @@ class GithubRelease(
* Assets class containing download url.
* @param downloadLink download url.
*/
class Assets(@SerializedName("browser_download_url") val downloadLink: String)
@Serializable
class Assets(@SerialName("browser_download_url") val downloadLink: String)
}

6
app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubService.kt
View File

@@ -1,8 +1,10 @@
package eu.kanade.tachiyomi.data.updater.github
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
import eu.kanade.tachiyomi.network.NetworkHelper
import kotlinx.serialization.json.Json
import okhttp3.MediaType.Companion.toMediaType
import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory
import retrofit2.http.GET
import retrofit2.http.Path
import uy.kohesive.injekt.Injekt
@@ -17,7 +19,7 @@ interface GithubService {
fun create(): GithubService {
val restAdapter = Retrofit.Builder()
.baseUrl("https://api.github.com")
.addConverterFactory(GsonConverterFactory.create())
.addConverterFactory(Json { ignoreUnknownKeys = true }.asConverterFactory("application/json".toMediaType()))
.client(Injekt.get<NetworkHelper>().client)
.build()