fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-04-06 19:51:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

adding some crashfixes

Browse Source
This commit is contained in:
tibbi 2019-12-07 15:22:32 +01:00
parent bf3f02461d
commit a66d5c0e89
4 changed files with 20 additions and 14 deletions
app/src/main/kotlin/com/simplemobiletools/notes/pro
activities
MainActivity.kt
adapters
NotesPagerAdapter.kt
fragments
ChecklistFragment.ktTextFragment.kt

26
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt

@ -412,19 +412,23 @@ class MainActivity : SimpleActivity() {
private fun openPath(path: String) { private fun openPath(path: String) {
openFile(path, false) { openFile(path, false) {
val title = path.getFilenameFromPath() val title = path.getFilenameFromPath()
val fileText = it.readText().trim() try {
val checklistItems = fileText.parseChecklistItems() val fileText = it.readText().trim()
val note = if (checklistItems != null) { val checklistItems = fileText.parseChecklistItems()
Note(null, title.substringBeforeLast('.'), fileText, TYPE_CHECKLIST) val note = if (checklistItems != null) {
} else { Note(null, title.substringBeforeLast('.'), fileText, TYPE_CHECKLIST)
Note(null, title, "", TYPE_TEXT, path) } else {
} Note(null, title, "", TYPE_TEXT, path)
}
if (mNotes.any { it.title.equals(note.title, true) }) { if (mNotes.any { it.title.equals(note.title, true) }) {
note.title += " (file)" note.title += " (file)"
} }
addNewNote(note) addNewNote(note)
} catch (e: Exception) {
showErrorToast(e)
}
} }
} }

4
app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt

@ -22,7 +22,9 @@ class NotesPagerAdapter(fm: FragmentManager, val notes: List<Note>, val activity
val bundle = Bundle() val bundle = Bundle()
val note = notes[position] val note = notes[position]
val id = note.id val id = note.id
bundle.putLong(NOTE_ID, id!!) if (id != null) {
bundle.putLong(NOTE_ID, id)
}
if (fragments.containsKey(position)) { if (fragments.containsKey(position)) {
return fragments[position]!! return fragments[position]!!

2
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? { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
view = inflater.inflate(R.layout.fragment_checklist, container, false) as ViewGroup view = inflater.inflate(R.layout.fragment_checklist, container, false) as ViewGroup
noteId = arguments!!.getLong(NOTE_ID) noteId = arguments!!.getLong(NOTE_ID, 0L)
return view return view
} }

2
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? { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
view = inflater.inflate(R.layout.fragment_text, container, false) as ViewGroup view = inflater.inflate(R.layout.fragment_text, container, false) as ViewGroup
noteId = arguments!!.getLong(NOTE_ID) noteId = arguments!!.getLong(NOTE_ID, 0L)
retainInstance = true retainInstance = true
val layoutToInflate = if (config!!.enableLineWrap) R.layout.note_view_static else R.layout.note_view_horiz_scrollable val layoutToInflate = if (config!!.enableLineWrap) R.layout.note_view_static else R.layout.note_view_horiz_scrollable