diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt index f2e454208..8354b77b7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt @@ -190,7 +190,7 @@ class MangaDex(delegate: HttpSource, val context: Context) : @Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getPageList")) override fun fetchPageList(chapter: SChapter): Observable> { - return runAsObservable { pageHandler.fetchPageList(chapter, isLogged(), usePort443Only(), dataSaver(), delegate) } + return runAsObservable { pageHandler.fetchPageList(chapter, usePort443Only(), dataSaver(), delegate) } } override fun fetchImage(page: Page): Observable { diff --git a/app/src/main/java/exh/md/handlers/PageHandler.kt b/app/src/main/java/exh/md/handlers/PageHandler.kt index 1ece5daca..7a5cf64a0 100644 --- a/app/src/main/java/exh/md/handlers/PageHandler.kt +++ b/app/src/main/java/exh/md/handlers/PageHandler.kt @@ -31,7 +31,7 @@ class PageHandler( private val mdList: MdList, ) { - suspend fun fetchPageList(chapter: SChapter, isLogged: Boolean, usePort443Only: Boolean, dataSaver: Boolean, mangadex: Source): List { + suspend fun fetchPageList(chapter: SChapter, usePort443Only: Boolean, dataSaver: Boolean, mangadex: Source): List { return withIOContext { val chapterResponse = service.viewChapter(MdUtil.getChapterId(chapter.url)) @@ -56,12 +56,6 @@ class PageHandler( else -> throw Exception("${chapter.scanlator} not supported") } } else { - val headers = if (isLogged) { - MdUtil.getAuthHeaders(headers, preferences, mdList) - } else { - headers - } - val atHomeRequestUrl = if (usePort443Only) { "${MdApi.atHomeServer}/${MdUtil.getChapterId(chapter.url)}?forcePort443=true" } else { diff --git a/app/src/main/java/exh/md/network/NoSessionException.kt b/app/src/main/java/exh/md/network/NoSessionException.kt deleted file mode 100644 index 5954e8bf6..000000000 --- a/app/src/main/java/exh/md/network/NoSessionException.kt +++ /dev/null @@ -1,5 +0,0 @@ -package exh.md.network - -import java.io.IOException - -class NoSessionException : IOException("Session token does not exist") diff --git a/app/src/main/java/exh/md/utils/MdUtil.kt b/app/src/main/java/exh/md/utils/MdUtil.kt index 1b71d27be..4a9f4e536 100644 --- a/app/src/main/java/exh/md/utils/MdUtil.kt +++ b/app/src/main/java/exh/md/utils/MdUtil.kt @@ -13,7 +13,6 @@ import eu.kanade.tachiyomi.source.online.all.MangaDex import eu.kanade.tachiyomi.util.PkceUtil import exh.md.dto.MangaAttributesDto import exh.md.dto.MangaDataDto -import exh.md.network.NoSessionException import exh.source.getMainSource import exh.util.dropBlank import exh.util.floor @@ -207,16 +206,6 @@ class MdUtil { } } - fun sessionToken(preferences: TrackPreferences, mdList: MdList) = loadOAuth(preferences, mdList)?.access_token - - fun refreshToken(preferences: TrackPreferences, mdList: MdList) = loadOAuth(preferences, mdList)?.refresh_token - - fun getAuthHeaders(headers: Headers, preferences: TrackPreferences, mdList: MdList) = - headers.newBuilder().add( - "Authorization", - "Bearer " + (sessionToken(preferences, mdList) ?: throw NoSessionException()), - ).build() - private var codeVerifier: String? = null fun refreshTokenRequest(oauth: OAuth): Request {