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

Tweak mangadex integration

Browse Source
This commit is contained in:
Jobobby04 2021-10-23 13:41:30 -04:00
parent 8c23c07c78
commit 72b33a1c52
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt
View File

@ -78,7 +78,7 @@ class MangaDex(delegate: HttpSource, val context: Context) :
context.getSharedPreferences("source_$id", 0x0000) context.getSharedPreferences("source_$id", 0x0000)
} }
val mangadexAuthServiceLazy = lazy { MangaDexAuthService(baseHttpClient, headers, preferences, mdList) } private val mangadexAuthServiceLazy = lazy { MangaDexAuthService(baseHttpClient, headers, preferences, mdList) }
private val loginHelper = MangaDexLoginHelper(mangadexAuthServiceLazy, preferences, mdList) private val loginHelper = MangaDexLoginHelper(mangadexAuthServiceLazy, preferences, mdList)

4
app/src/main/java/exh/md/network/NoSessionException.kt
View File

@ -1,3 +1,5 @@
package exh.md.network package exh.md.network
class NoSessionException : IllegalArgumentException("Session token does not exist") import java.io.IOException
class NoSessionException : IOException("Session token does not exist")

11
app/src/main/java/exh/md/service/MangaDexAuthService.kt
View File

@ -19,6 +19,7 @@ import exh.md.dto.ResultDto
import exh.md.utils.MdApi import exh.md.utils.MdApi
import exh.md.utils.MdConstants import exh.md.utils.MdConstants
import exh.md.utils.MdUtil import exh.md.utils.MdUtil
import okhttp3.Authenticator
import okhttp3.CacheControl import okhttp3.CacheControl
import okhttp3.Headers import okhttp3.Headers
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
@ -30,6 +31,10 @@ class MangaDexAuthService(
private val preferences: PreferencesHelper, private val preferences: PreferencesHelper,
private val mdList: MdList private val mdList: MdList
) { ) {
private val noAuthenticatorClient = client.newBuilder()
.authenticator(Authenticator.NONE)
.build()
fun getHeaders() = MdUtil.getAuthHeaders( fun getHeaders() = MdUtil.getAuthHeaders(
headers, headers,
preferences, preferences,
@ -37,7 +42,7 @@ class MangaDexAuthService(
) )
suspend fun login(request: LoginRequestDto): LoginResponseDto { suspend fun login(request: LoginRequestDto): LoginResponseDto {
return client.newCall( return noAuthenticatorClient.newCall(
POST( POST(
MdApi.login, MdApi.login,
body = MdUtil.encodeToBody(request), body = MdUtil.encodeToBody(request),
@ -57,7 +62,7 @@ class MangaDexAuthService(
} }
suspend fun checkToken(): CheckTokenDto { suspend fun checkToken(): CheckTokenDto {
return client.newCall( return noAuthenticatorClient.newCall(
GET( GET(
MdApi.checkToken, MdApi.checkToken,
getHeaders(), getHeaders(),
@ -67,7 +72,7 @@ class MangaDexAuthService(
} }
suspend fun refreshToken(request: RefreshTokenDto): LoginResponseDto { suspend fun refreshToken(request: RefreshTokenDto): LoginResponseDto {
return client.newCall( return noAuthenticatorClient.newCall(
POST( POST(
MdApi.refreshToken, MdApi.refreshToken,
getHeaders(), getHeaders(),