From be78cc0820bd5075944680509aad84ff5edac15d Mon Sep 17 00:00:00 2001
From: Stephen Michel <stephen.michel@tufts.edu>
Date: Sat, 17 Dec 2016 13:51:57 -0500
Subject: [PATCH] clean up while statement in onOptionsItemSelected

---
 .../notes/activities/MainActivity.kt          | 38 +++++--------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
index 6e5aabcf..c38b33aa 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
@@ -86,37 +86,19 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.open_note -> {
-                displayOpenNoteDialog()
-                true
-            }
-            R.id.new_note -> {
-                displayNewNoteDialog()
-                true
-            }
-            R.id.rename_note -> {
-                displayRenameDialog()
-                true
-            }
-            R.id.share -> {
-                shareText()
-                true
-            }
-            R.id.delete_note -> {
-                displayDeleteNotePrompt()
-                true
-            }
-            R.id.settings -> {
+        when (item.itemId) {
+            R.id.open_note   -> displayOpenNoteDialog()
+            R.id.new_note    -> displayNewNoteDialog()
+            R.id.rename_note -> displayRenameDialog()
+            R.id.share       -> shareText()
+            R.id.delete_note -> displayDeleteNotePrompt()
+            R.id.settings ->
                 startActivity(Intent(applicationContext, SettingsActivity::class.java))
-                true
-            }
-            R.id.about -> {
+            R.id.about ->
                 startActivity(Intent(applicationContext, AboutActivity::class.java))
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
+            else -> return super.onOptionsItemSelected(item)
         }
+        return true
     }
 
     private fun displayRenameDialog() {