null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Split causes non-split images to not load

Browse source 
Fixes GH-91
This commit is contained in:
Ahmad Ansori Palembani 2024-06-10 14:20:59 +07:00
parent b220c0b473
commit 5317dc7cad
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
View file

@ -640,7 +640,7 @@ class PagerPageHolder(
}
if (page.longPage == true && viewer.config.splitPages) {
val imageBitmap = try {
BitmapFactory.decodeStream(imageSource.inputStream())
BitmapFactory.decodeStream(imageSource.peek().inputStream())
} catch (e: Exception) {
Logger.e { "Cannot split page ${e.message}" }
return imageSource
@ -659,7 +659,7 @@ class PagerPageHolder(
if (imageSource2 == null) {
if (viewer.config.splitPages && page.longPage == null) {
val imageBitmap = try {
BitmapFactory.decodeStream(imageSource.inputStream())
BitmapFactory.decodeStream(imageSource.peek().inputStream())
} catch (e: Exception) {
page.longPage = true
splitDoublePages()
@ -691,7 +691,7 @@ class PagerPageHolder(
}
if (page.fullPage == true) return supportHingeIfThere(imageSource)
val imageBitmap = try {
BitmapFactory.decodeStream(imageSource.inputStream())
BitmapFactory.decodeStream(imageSource.peek().inputStream())
} catch (e: Exception) {
closeSources(imageSource2)
page.fullPage = true
@ -739,7 +739,7 @@ class PagerPageHolder(
if (page.index <= 2 && page.isEndPage == null && page.fullPage == null) {
page.endPageConfidence = imageBitmap.isPagePadded(rightSide = !isLTR)
if (extraPage?.index == 1 && extraPage?.isEndPage == null) {
earlyImageBitmap2 = setExtraPageBitmap(imageSource2.inputStream(), isLTR)
earlyImageBitmap2 = setExtraPageBitmap(imageSource2.peek().inputStream(), isLTR)
}
if (page.index == 1 && page.isEndPage == true && viewer.config.shiftDoublePage &&
(isFirstPageNotEnd || isThirdPageNotEnd)
@ -774,7 +774,7 @@ class PagerPageHolder(
}
val imageBitmap2 = earlyImageBitmap2 ?: try {
BitmapFactory.decodeStream(imageSource2.inputStream())
BitmapFactory.decodeStream(imageSource2.peek().inputStream())
} catch (e: Exception) {
closeSources(imageSource2)
extraPage?.fullPage = true
@ -847,7 +847,7 @@ class PagerPageHolder(
private suspend fun supportHingeIfThere(imageSource: BufferedSource): BufferedSource {
if (viewer.config.hingeGapSize > 0 && !ImageUtil.isAnimatedAndSupported(imageSource)) {
val imageBitmap = try {
BitmapFactory.decodeStream(imageSource.inputStream())
BitmapFactory.decodeStream(imageSource.peek().inputStream())
} catch (e: Exception) {
val wasNotFullPage = page.fullPage != true
page.fullPage = true