From de13dbd5c8778a4d94b3f002907f7ef108f47030 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 16 Jun 2017 20:22:37 +0200 Subject: [PATCH] add some null checks at getting current text --- .../com/simplemobiletools/notes/activities/MainActivity.kt | 5 +++-- .../simplemobiletools/notes/adapters/NotesPagerAdapter.kt | 2 +- 2 files changed, 4 insertions(+), 3 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 c8ac9c17..de284778 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt @@ -214,7 +214,8 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener { private fun exportAsFile() { ExportAsDialog(this, mCurrentNote) { - exportNoteValueToFile(it, getCurrentNoteText()) + if (getCurrentNoteText()?.isNotEmpty() == true) + exportNoteValueToFile(it, getCurrentNoteText()!!) } } @@ -307,7 +308,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener { private fun shareText() { val text = getCurrentNoteText() - if (text.isEmpty()) { + if (text == null || text.isEmpty()) { toast(R.string.cannot_share_empty_text) return } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt index 02af0b6e..8c466385 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt @@ -34,7 +34,7 @@ class NotesPagerAdapter(fm: FragmentManager, val notes: List, val activity override fun getPageTitle(position: Int) = notes[position].title - fun getCurrentNoteViewText(position: Int) = fragments[position].getCurrentNoteViewText() + fun getCurrentNoteViewText(position: Int) = fragments[position]?.getCurrentNoteViewText() fun saveCurrentNote(position: Int) = fragments[position]?.saveText()