diff --git a/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt b/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt
index cbd4149f3..020b0c67c 100644
--- a/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt
+++ b/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt
@@ -139,6 +139,7 @@ class EpubFile(var book: Book) {
epubBook?.let { epubBook ->
val nextChapterFirstResourceHref = chapter.getVariable("nextUrl")?.substringBeforeLast("#")
val currentChapterFirstResourceHref = chapter.url.substringBeforeLast("#")
+ val isLastChapter = nextChapterFirstResourceHref.isNullOrBlank()
val startFragmentId = chapter.startFragmentId
val endFragmentId = chapter.endFragmentId
val elements = Elements()
@@ -154,8 +155,8 @@ class EpubFile(var book: Book) {
elements.add(
getBody(res, startFragmentId, endFragmentId)
)
- // 是否继续遍历
- if (currentChapterFirstResourceHref == nextChapterFirstResourceHref) break
+ // 不是最后章节 且 已经遍历到下一章节的内容时停止
+ if (!isLastChapter && res.href == nextChapterFirstResourceHref) break
continue
}
if (nextChapterFirstResourceHref != res.href) {
diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
index 7fbc800be..5edc862e6 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
@@ -137,6 +137,8 @@ class BookInfoActivity :
viewModel.bookData.value?.isLocalTxt ?: false
menu.findItem(R.id.menu_upload)?.isVisible =
viewModel.bookData.value?.isLocal ?: false
+ menu.findItem(R.id.menu_edit)?.isVisible =
+ !viewModel.bookData.value?.isWebFile ?: true
return super.onMenuOpened(featureId, menu)
}
diff --git a/app/src/main/res/values-es-rES/arrays.xml b/app/src/main/res/values-es-rES/arrays.xml
index abe6357b3..8640121d2 100644
--- a/app/src/main/res/values-es-rES/arrays.xml
+++ b/app/src/main/res/values-es-rES/arrays.xml
@@ -4,6 +4,7 @@
- Texto
- Audio
- Image
+ - File
diff --git a/app/src/main/res/values-pt-rBR/arrays.xml b/app/src/main/res/values-pt-rBR/arrays.xml
index 916fc06f8..4f3755b82 100644
--- a/app/src/main/res/values-pt-rBR/arrays.xml
+++ b/app/src/main/res/values-pt-rBR/arrays.xml
@@ -4,6 +4,7 @@
- Texto
- Áudio
- Image
+ - File
diff --git a/app/src/main/res/values-zh-rHK/arrays.xml b/app/src/main/res/values-zh-rHK/arrays.xml
index e6b328bdb..60863f6cc 100644
--- a/app/src/main/res/values-zh-rHK/arrays.xml
+++ b/app/src/main/res/values-zh-rHK/arrays.xml
@@ -5,6 +5,7 @@
- 文本
- 音頻
- 图片
+ - 文件
diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml
index 4d6b73cd1..b3afb4d76 100644
--- a/app/src/main/res/values-zh-rTW/arrays.xml
+++ b/app/src/main/res/values-zh-rTW/arrays.xml
@@ -4,6 +4,7 @@
- 文字
- 音訊
- 圖片
+ - 資料
diff --git a/app/src/main/res/values-zh/arrays.xml b/app/src/main/res/values-zh/arrays.xml
index 5b20a07f2..bf705abed 100644
--- a/app/src/main/res/values-zh/arrays.xml
+++ b/app/src/main/res/values-zh/arrays.xml
@@ -4,6 +4,7 @@
- 文本
- 音频
- 图片
+ - 文件
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index af8fd4cba..98b87a629 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -9,6 +9,7 @@
- Text
- Audio
- Image
+ - File