From 42b0321a0dd7a97f9a60b582b066847a3ca5c70a Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Fri, 17 Mar 2023 18:24:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E6=96=87=E4=BB=B6=E5=92=8C?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E6=96=87=E4=BB=B6=E8=87=AA=E5=8A=A8=E6=81=A2?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/updateLog.md | 2 +- app/src/main/java/io/legado/app/model/localBook/LocalBook.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index 1cfcf9441..edf0ac21d 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -15,7 +15,7 @@ * 修复书签界面删除条目后界面错乱bug * 一些带有搜索框的界面自动隐藏软键盘 -* 本地书籍导入界面支持压缩包 +* 本地书籍和远程书籍导入界面支持压缩包 * 内置了两个直链上传配置,可以通过导入默认切换 **2023/03/14** diff --git a/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt b/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt index b72b5c2e1..019bc808a 100644 --- a/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt +++ b/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt @@ -405,8 +405,8 @@ object LocalBook { inputStream.use { if (localBook.isArchive) { // 压缩包 - val fileUri = saveBookFile(it, localBook.archiveName) - localBook = importArchiveFile(fileUri, localBook.originName) { + val archiveUri = saveBookFile(it, localBook.archiveName) + localBook = importArchiveFile(archiveUri, localBook.originName) { it.contains(localBook.originName) }.first() } else {