Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-20 08:09:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fallback to single page mode for images that cant be decoded in double page layout

Browse Source
This commit is contained in:
Jays2Kings 2021-05-10 18:59:55 -04:00
parent 31980abf28
commit 154c6d0320
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -660,7 +660,16 @@ class PagerPageHolder(
return imageStream return imageStream
} }
val imageBytes = imageStream.readBytes() val imageBytes = imageStream.readBytes()
val imageBitmap = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size) val imageBitmap = try {
BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
} catch (e: Exception) {
imageStream2.close()
imageStream.close()
page.fullPage = true
skipExtra = true
Timber.e("Cannot combine pages ${e.message}")
return imageBytes.inputStream()
}
scope?.launchUI { progressBar.setProgress(96) } scope?.launchUI { progressBar.setProgress(96) }
val height = imageBitmap.height val height = imageBitmap.height
val width = imageBitmap.width val width = imageBitmap.width
@ -674,7 +683,17 @@ class PagerPageHolder(
} }
val imageBytes2 = imageStream2.readBytes() val imageBytes2 = imageStream2.readBytes()
val imageBitmap2 = BitmapFactory.decodeByteArray(imageBytes2, 0, imageBytes2.size) val imageBitmap2 = try {
BitmapFactory.decodeByteArray(imageBytes2, 0, imageBytes2.size)
} catch (e: Exception) {
imageStream2.close()
imageStream.close()
extraPage?.fullPage = true
skipExtra = true
page.isolatedPage = true
Timber.e("Cannot combine pages ${e.message}")
return imageBytes.inputStream()
}
scope?.launchUI { progressBar.setProgress(97) } scope?.launchUI { progressBar.setProgress(97) }
val height2 = imageBitmap2.height val height2 = imageBitmap2.height
val width2 = imageBitmap2.width val width2 = imageBitmap2.width