up

app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt

@@ -217,14 +217,11 @@ class BookInfoActivity :
         }
         tv_toc.onClick {
             if (!viewModel.inBookshelf) {
-                toast(R.string.after_add_bookshelf)
+                viewModel.saveBook {
-                return@onClick
+                    openChapterList()
-            }
+                }
-            viewModel.bookData.value?.let {
+            } else {
-                startActivityForResult<ChapterListActivity>(
+                openChapterList()
-                    requestCodeChapterList,
-                    Pair("bookUrl", it.bookUrl)
-                )
             }
         }
         tv_group.onClick {
@@ -232,6 +229,15 @@ class BookInfoActivity :
         }
     }
 
+    private fun openChapterList() {
+        viewModel.bookData.value?.let {
+            startActivityForResult<ChapterListActivity>(
+                requestCodeChapterList,
+                Pair("bookUrl", it.bookUrl)
+            )
+        }
+    }
+
     private fun readBook(book: Book) {
         if (!viewModel.inBookshelf) {
             viewModel.saveBook {
@@ -306,6 +312,10 @@ class BookInfoActivity :
                         readBook(it)
                     }
                 }
+            } else {
+                if (!viewModel.inBookshelf) {
+                    viewModel.delBook {}
+                }
             }
         }
     }