Merge remote-tracking branch 'origin/master'

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) {

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)
     }
 

app/src/main/res/values-es-rES/arrays.xml

@@ -4,6 +4,7 @@
 		<item>Texto</item>
 		<item>Audio</item>
 		<item>Image</item>
+		<item>File</item>
 	</string-array>
 
 	<string-array name="group_style">

app/src/main/res/values-pt-rBR/arrays.xml

@@ -4,6 +4,7 @@
 		<item>Texto</item>
 		<item>Áudio</item>
 		<item>Image</item>
+		<item>File</item>
 	</string-array>
 
 	<string-array name="group_style">

app/src/main/res/values-zh-rHK/arrays.xml

@@ -5,6 +5,7 @@
         <item>文本</item>
         <item>音頻</item>
         <item>图片</item>
+        <item>文件</item>
     </string-array>
 
     <string-array name="group_style">

app/src/main/res/values-zh-rTW/arrays.xml

@@ -4,6 +4,7 @@
         <item>文字</item>
         <item>音訊</item>
         <item>圖片</item>
+        <item>資料</item>
     </string-array>
 
     <string-array name="group_style">

app/src/main/res/values-zh/arrays.xml

@@ -4,6 +4,7 @@
         <item>文本</item>
         <item>音频</item>
         <item>图片</item>
+        <item>文件</item>
     </string-array>
 
     <string-array name="group_style">

app/src/main/res/values/arrays.xml

@@ -9,6 +9,7 @@
 		<item>Text</item>
 		<item>Audio</item>
 		<item>Image</item>
+		<item>File</item>
 	</string-array>
 
 	<string-array name="group_style">