fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-03-24 04:20:07 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)
}
}
}

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

@ -22,7 +22,9 @@ class NotesPagerAdapter(fm: FragmentManager, val notes: List<Note>, 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]!!

2
app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
View File

@ -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
}

2
app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt
View File

@ -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