From 93a08627ec5b910cd52e8b723238e469cee2df80 Mon Sep 17 00:00:00 2001 From: Horis <8674809+821938089@users.noreply.github.com> Date: Wed, 4 Sep 2024 21:27:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ui/book/audio/AudioPlayActivity.kt | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt index e40b92bf2..747ccd744 100644 --- a/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt @@ -227,24 +227,26 @@ class AudioPlayActivity : } override fun finish() { - AudioPlay.book?.let { - if (!AudioPlay.inBookshelf) { - if (!AppConfig.showAddToShelfAlert) { - viewModel.removeFromBookshelf { super.finish() } - } else { - alert(title = getString(R.string.add_to_bookshelf)) { - setMessage(getString(R.string.check_add_bookshelf, it.name)) - okButton { - AudioPlay.inBookshelf = true - setResult(Activity.RESULT_OK) - } - noButton { viewModel.removeFromBookshelf { super.finish() } } - } + val book = AudioPlay.book ?: return super.finish() + + if (AudioPlay.inBookshelf) { + return super.finish() + } + + if (!AppConfig.showAddToShelfAlert) { + viewModel.removeFromBookshelf { super.finish() } + } else { + alert(title = getString(R.string.add_to_bookshelf)) { + setMessage(getString(R.string.check_add_bookshelf, book.name)) + okButton { + AudioPlay.book?.removeType(BookType.notShelf) + AudioPlay.book?.save() + AudioPlay.inBookshelf = true + setResult(Activity.RESULT_OK) } - } else { - super.finish() + noButton { viewModel.removeFromBookshelf { super.finish() } } } - } ?: super.finish() + } } override fun onDestroy() {