From f40b1c391d15ebc0cd6f103e6f68049e4b911a03 Mon Sep 17 00:00:00 2001 From: gedoor Date: Sat, 1 Jan 2022 10:43:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E4=B9=A6=E7=B1=8D=E6=97=A0?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=99=E4=BF=9D=E5=AD=98=E5=88=B0=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E9=80=89=E5=AE=9A=E7=9A=84=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/model/localBook/TextFile.kt | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/localBook/TextFile.kt b/app/src/main/java/io/legado/app/model/localBook/TextFile.kt index 8ebc1a79f..952f68803 100644 --- a/app/src/main/java/io/legado/app/model/localBook/TextFile.kt +++ b/app/src/main/java/io/legado/app/model/localBook/TextFile.kt @@ -6,13 +6,15 @@ import io.legado.app.data.entities.Book import io.legado.app.data.entities.BookChapter import io.legado.app.data.entities.TxtTocRule import io.legado.app.help.DefaultData -import io.legado.app.model.localBook.LocalBook.cacheFolder -import io.legado.app.utils.* +import io.legado.app.utils.EncodingDetect +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.StringUtils +import io.legado.app.utils.isContentScheme import splitties.init.appCtx import java.io.File import java.io.FileInputStream import java.io.FileNotFoundException -import java.io.FileOutputStream +import java.io.InputStream import java.nio.charset.Charset import java.util.regex.Matcher import java.util.regex.Pattern @@ -287,21 +289,10 @@ class TextFile(private val book: Book) { } @Throws(FileNotFoundException::class) - private fun getBookInputStream(book: Book): FileInputStream { + private fun getBookInputStream(book: Book): InputStream { if (book.bookUrl.isContentScheme()) { val uri = Uri.parse(book.bookUrl) - val bookFile = cacheFolder.getFile(book.name) - if (!bookFile.exists()) { - bookFile.createNewFile() - appCtx.contentResolver.openInputStream(uri).use { iStream -> - FileOutputStream(bookFile).use { oStream -> - iStream?.copyTo(oStream) - oStream.flush() - } - } - } - return FileInputStream(bookFile) - //return appCtx.contentResolver.openFileDescriptor(uri, "r")!!.fileDescriptor + return appCtx.contentResolver.openInputStream(uri)!! } return FileInputStream(File(book.bookUrl)) }