优化

5 years ago · 5b7c6bcaab
parent c1f51e3bd4
commit 5b7c6bcaab
2 changed files with 8 additions and 5 deletions
--- a/app/src/main/java/io/legado/app/base/BaseActivity.kt
+++ b/app/src/main/java/io/legado/app/base/BaseActivity.kt
@ -52,9 +52,12 @@ abstract class BaseActivity(
        } ?: super.onCreateOptionsMenu(menu)
    }

-    override fun onMenuOpened(featureId: Int, menu: Menu): Boolean {
-        menu.applyOpenTint(this)
-        return super.onMenuOpened(featureId, menu)
+    override fun onMenuOpened(featureId: Int, menu: Menu?): Boolean {
+        menu?.let {
+            menu.applyOpenTint(this)
+            return super.onMenuOpened(featureId, menu)
+        }
+        return true
    }

    open fun onCompatCreateOptionsMenu(menu: Menu): Boolean {
--- 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
@ -98,8 +98,8 @@ class BookInfoActivity :
        return super.onCompatOptionsItemSelected(item)
    }

-    override fun onMenuOpened(featureId: Int, menu: Menu): Boolean {
-        menu.findItem(R.id.menu_can_update)?.isChecked =
+    override fun onMenuOpened(featureId: Int, menu: Menu?): Boolean {
+        menu?.findItem(R.id.menu_can_update)?.isChecked =
            viewModel.bookData.value?.canUpdate ?: true
        return super.onMenuOpened(featureId, menu)
    }