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

Fix for when a request requests page 1 (#14323) 

* Fix for #14276

* increase versionCode

* fixed issue with requests going to page 1

Co-authored-by: Alec <alec.l@digipen.edu>
This commit is contained in:
Ritox2 2022-11-20 12:57:47 -08:00 committed by GitHub
parent f2198c975e
commit 1cefaf0867
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/ehentai/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'E-Hentai' extName = 'E-Hentai'
pkgNameSuffix = 'all.ehentai' pkgNameSuffix = 'all.ehentai'
extClass = '.EHFactory' extClass = '.EHFactory'
extVersionCode = 18 extVersionCode = 19
isNsfw = true isNsfw = true
} }

6
src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt
View File

@ -171,6 +171,7 @@ abstract class EHentai(
if (uri.toString().contains("f_spf") || uri.toString().contains("f_spt")) { if (uri.toString().contains("f_spf") || uri.toString().contains("f_spt")) {
if (page > 1) uri.appendQueryParameter("from", lastMangaId) if (page > 1) uri.appendQueryParameter("from", lastMangaId)
} }
return exGet(uri.toString(), page) return exGet(uri.toString(), page)
} }
@ -181,8 +182,10 @@ abstract class EHentai(
override fun latestUpdatesParse(response: Response) = genericMangaParse(response) override fun latestUpdatesParse(response: Response) = genericMangaParse(response)
private fun exGet(url: String, page: Int? = null, additionalHeaders: Headers? = null, cache: Boolean = true): Request { private fun exGet(url: String, page: Int? = null, additionalHeaders: Headers? = null, cache: Boolean = true): Request {
//pages no longer exist, if app attempts to go to the first page after a request, do not include the page append
val pageIndex = if (page == 1) null else page
return GET( return GET(
page?.let { pageIndex?.let {
addParam(url, "next", lastMangaId) addParam(url, "next", lastMangaId)
} ?: url, } ?: url,
additionalHeaders?.let { header -> additionalHeaders?.let { header ->
@ -194,6 +197,7 @@ abstract class EHentai(
} }
headers.build() headers.build()
} ?: headers } ?: headers
).let { ).let {
if (!cache) { if (!cache) {
it.newBuilder().cacheControl(CacheControl.FORCE_NETWORK).build() it.newBuilder().cacheControl(CacheControl.FORCE_NETWORK).build()