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

Fix animated image detection (#5826)

Browse Source 
(cherry picked from commit bd033db84c5b7fe2dbb01886f99c0df456b8f930)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
This commit is contained in:
Ivan Iskandar 2021-09-01 04:43:29 +07:00 committed by Jobobby04
parent 09a6e3661f
commit 44b6983b3d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -362,17 +362,17 @@ class PagerPageHolder(
mergePages(stream, stream2)
}
// SY <--
val bais = ByteArrayInputStream(itemStream.readBytes())
try {
val streamBytes = itemStream.readBytes()
val isAnimated = ImageUtil.isAnimatedAndSupported(stream)
val isAnimated = ImageUtil.isAnimatedAndSupported(bais)
bais.reset()
val background = if (!isAnimated && viewer.config.automaticBackground) {
ByteArrayInputStream(streamBytes).use { bais ->
ImageUtil.chooseBackground(context, bais)
}
ImageUtil.chooseBackground(context, bais)
} else {
null
}
Triple(streamBytes, isAnimated, background)
bais.reset()
Triple(bais, isAnimated, background)
} finally {
stream.close()
itemStream.close()
@ -380,15 +380,15 @@ class PagerPageHolder(
}
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.doOnNext { (streamBytes, isAnimated, background) ->
ByteArrayInputStream(streamBytes).use { bais ->
.doOnNext { (bais, isAnimated, background) ->
bais.use {
if (!isAnimated) {
this.background = background
initSubsamplingImageView().apply {
setImage(ImageSource.inputStream(bais))
setImage(ImageSource.inputStream(it))
}
} else {
initImageView().setImage(bais)
initImageView().setImage(it)
}
}
}