From a66d5c0e890199a14cb89f7f369adb46df6bf189 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 7 Dec 2019 15:22:32 +0100 Subject: [PATCH] adding some crashfixes --- .../notes/pro/activities/MainActivity.kt | 26 +++++++++++-------- .../notes/pro/adapters/NotesPagerAdapter.kt | 4 ++- .../notes/pro/fragments/ChecklistFragment.kt | 2 +- .../notes/pro/fragments/TextFragment.kt | 2 +- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt index ac6c9ecf..301139f9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt @@ -412,19 +412,23 @@ class MainActivity : SimpleActivity() { private fun openPath(path: String) { openFile(path, false) { val title = path.getFilenameFromPath() - val fileText = it.readText().trim() - val checklistItems = fileText.parseChecklistItems() - val note = if (checklistItems != null) { - Note(null, title.substringBeforeLast('.'), fileText, TYPE_CHECKLIST) - } else { - Note(null, title, "", TYPE_TEXT, path) - } + try { + val fileText = it.readText().trim() + val checklistItems = fileText.parseChecklistItems() + val note = if (checklistItems != null) { + Note(null, title.substringBeforeLast('.'), fileText, TYPE_CHECKLIST) + } else { + Note(null, title, "", TYPE_TEXT, path) + } - if (mNotes.any { it.title.equals(note.title, true) }) { - note.title += " (file)" - } + if (mNotes.any { it.title.equals(note.title, true) }) { + note.title += " (file)" + } - addNewNote(note) + addNewNote(note) + } catch (e: Exception) { + showErrorToast(e) + } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt index 75bf8388..8e5bbe53 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt @@ -22,7 +22,9 @@ class NotesPagerAdapter(fm: FragmentManager, val notes: List, val activity val bundle = Bundle() val note = notes[position] val id = note.id - bundle.putLong(NOTE_ID, id!!) + if (id != null) { + bundle.putLong(NOTE_ID, id) + } if (fragments.containsKey(position)) { return fragments[position]!! diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt index 93ca46f5..4f2b2be2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt @@ -31,7 +31,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { view = inflater.inflate(R.layout.fragment_checklist, container, false) as ViewGroup - noteId = arguments!!.getLong(NOTE_ID) + noteId = arguments!!.getLong(NOTE_ID, 0L) return view } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt index 39814e0a..47a89718 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt @@ -42,7 +42,7 @@ class TextFragment : NoteFragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { view = inflater.inflate(R.layout.fragment_text, container, false) as ViewGroup - noteId = arguments!!.getLong(NOTE_ID) + noteId = arguments!!.getLong(NOTE_ID, 0L) retainInstance = true val layoutToInflate = if (config!!.enableLineWrap) R.layout.note_view_static else R.layout.note_view_horiz_scrollable