github/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-29 20:43:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Bangumi login (fixes #3994)

Browse source
This commit is contained in:
arkon 2020-11-01 15:00:21 -05:00
parent 6675508b24
commit 9b10e851d1
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiApi.kt
View file

@ -164,7 +164,7 @@ class BangumiApi(private val client: OkHttpClient, interceptor: BangumiIntercept
if (responseBody.isEmpty()) { if (responseBody.isEmpty()) {
throw Exception("Null Response") throw Exception("Null Response")
} }
Json.decodeFromString<OAuth>(responseBody) Json { ignoreUnknownKeys = true }.decodeFromString<OAuth>(responseBody)
} }
} }

2
app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiInterceptor.kt
View file

@ -30,7 +30,7 @@ class BangumiInterceptor(val bangumi: Bangumi) : Interceptor {
if (currAuth.isExpired()) { if (currAuth.isExpired()) {
val response = chain.proceed(BangumiApi.refreshTokenRequest(currAuth.refresh_token!!)) val response = chain.proceed(BangumiApi.refreshTokenRequest(currAuth.refresh_token!!))
if (response.isSuccessful) { if (response.isSuccessful) {
newAuth(Json.decodeFromString<OAuth>(response.body!!.string())) newAuth(Json { ignoreUnknownKeys = true }.decodeFromString<OAuth>(response.body!!.string()))
} else { } else {
response.close() response.close()
} }

2
app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/OAuth.kt
View file

@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable
data class OAuth( data class OAuth(
val access_token: String, val access_token: String,
val token_type: String, val token_type: String,
val created_at: Long, val created_at: Long = System.currentTimeMillis() / 1000,
val expires_in: Long, val expires_in: Long,
val refresh_token: String?, val refresh_token: String?,
val user_id: Long? val user_id: Long?