Merge remote-tracking branch 'upstream/master'

app/src/main/java/io/legado/app/model/AudioPlay.kt

@@ -105,7 +105,7 @@ object AudioPlay {
                 book.durChapterIndex = index
                 book.durChapterPos = 0
                 durChapter = null
-                saveRead(book)
+                saveRead()
                 play(context)
             }
         }
@@ -120,7 +120,7 @@ object AudioPlay {
                 book.durChapterIndex = book.durChapterIndex - 1
                 book.durChapterPos = 0
                 durChapter = null
-                saveRead(book)
+                saveRead()
                 play(context)
             }
         }
@@ -134,17 +134,11 @@ object AudioPlay {
             book.durChapterIndex = book.durChapterIndex + 1
             book.durChapterPos = 0
             durChapter = null
-            saveRead(book)
+            saveRead()
             play(context)
         }
     }
 
-    fun addTimer() {
-        val intent = Intent(appCtx, AudioPlayService::class.java)
-        intent.action = IntentAction.addTimer
-        appCtx.startService(intent)
-    }
-
     fun setTimer(minute: Int) {
         val intent = Intent(appCtx, AudioPlayService::class.java)
         intent.action = IntentAction.setTimer
@@ -152,16 +146,18 @@ object AudioPlay {
         appCtx.startService(intent)
     }
 
-    fun saveRead(book: Book) {
-        book.lastCheckCount = 0
-        book.durChapterTime = System.currentTimeMillis()
-        Coroutine.async {
-            appDb.bookChapterDao.getChapter(book.bookUrl, book.durChapterIndex)?.let {
-                book.durChapterTitle = it.getDisplayTitle(
-                    ContentProcessor.get(book.name, book.origin).getTitleReplaceRules()
-                )
+    fun saveRead() {
+        book?.let { book ->
+            book.lastCheckCount = 0
+            book.durChapterTime = System.currentTimeMillis()
+            Coroutine.async {
+                appDb.bookChapterDao.getChapter(book.bookUrl, book.durChapterIndex)?.let {
+                    book.durChapterTitle = it.getDisplayTitle(
+                        ContentProcessor.get(book.name, book.origin).getTitleReplaceRules()
+                    )
+                }
+                book.save()
             }
-            book.save()
         }
     }
 

app/src/main/java/io/legado/app/ui/book/audio/AudioPlayViewModel.kt

@@ -37,9 +37,9 @@ class AudioPlayViewModel(application: Application) : BaseViewModel(application)
                             loadChapterList(book)
                         }
                     }
-                    saveRead(book)
                 }
             }
+            saveRead()
         }
     }