Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-25 02:02:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix shikimori auth. Change await to withContext(Dispatchers.IO) (#354)

Browse Source 
Co-authored-by: Pavel Mosein <p.mosein@edadeal.ru>
This commit is contained in:
Pavka 2020-05-08 00:03:21 +03:00 committed by GitHub
parent d20c7f41af
commit 40a0094ec0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/ShikimoriApi.kt
View File

@ -13,7 +13,6 @@ import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.data.track.model.TrackSearch import eu.kanade.tachiyomi.data.track.model.TrackSearch
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.network.POST
import eu.kanade.tachiyomi.network.await
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import okhttp3.FormBody import okhttp3.FormBody
@ -130,9 +129,10 @@ class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInter
} }
suspend fun getCurrentUser(): Int { suspend fun getCurrentUser(): Int {
val response = authClient.newCall(GET("$apiUrl/users/whoami")).await() return withContext(Dispatchers.IO) {
val user = response.body?.string() val user = authClient.newCall(GET("$apiUrl/users/whoami")).execute().body?.string()
return JsonParser.parseString(user).obj["id"].asInt JsonParser.parseString(user).obj["id"].asInt
}
} }
suspend fun accessToken(code: String): OAuth { suspend fun accessToken(code: String): OAuth {