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

fix checklist handling at mass folder importing

Browse Source
This commit is contained in:
tibbi 2018-12-09 20:18:45 +01:00
parent 58d488b4a7
commit b6f8bea868
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ImportFolderDialog.kt
View File

@ -9,7 +9,9 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.activities.SimpleActivity import com.simplemobiletools.notes.pro.activities.SimpleActivity
import com.simplemobiletools.notes.pro.extensions.notesDB import com.simplemobiletools.notes.pro.extensions.notesDB
import com.simplemobiletools.notes.pro.extensions.parseChecklistItems
import com.simplemobiletools.notes.pro.helpers.NotesHelper import com.simplemobiletools.notes.pro.helpers.NotesHelper
import com.simplemobiletools.notes.pro.helpers.TYPE_CHECKLIST
import com.simplemobiletools.notes.pro.helpers.TYPE_TEXT import com.simplemobiletools.notes.pro.helpers.TYPE_TEXT
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import kotlinx.android.synthetic.main.dialog_import_folder.view.* import kotlinx.android.synthetic.main.dialog_import_folder.view.*
@ -53,13 +55,18 @@ class ImportFolderDialog(val activity: SimpleActivity, val path: String, val cal
val storePath = if (updateFilesOnEdit) it.absolutePath else "" val storePath = if (updateFilesOnEdit) it.absolutePath else ""
val title = it.absolutePath.getFilenameFromPath() val title = it.absolutePath.getFilenameFromPath()
val value = if (updateFilesOnEdit) "" else it.readText() val value = if (updateFilesOnEdit) "" else it.readText()
val fileText = it.readText().trim()
if (updateFilesOnEdit) { val checklistItems = fileText.parseChecklistItems()
activity.handleSAFDialog(path) { if (checklistItems != null) {
saveNote(title, value, storePath) saveNote(title.substringBeforeLast('.'), fileText, TYPE_CHECKLIST, "")
}
} else { } else {
saveNote(title, value, storePath) if (updateFilesOnEdit) {
activity.handleSAFDialog(path) {
saveNote(title, value, TYPE_TEXT, storePath)
}
} else {
saveNote(title, value, TYPE_TEXT, storePath)
}
} }
} }
@ -69,8 +76,8 @@ class ImportFolderDialog(val activity: SimpleActivity, val path: String, val cal
} }
} }
private fun saveNote(title: String, value: String, path: String) { private fun saveNote(title: String, value: String, type: Int, path: String) {
val note = Note(null, title, value, TYPE_TEXT, path) val note = Note(null, title, value, type, path)
NotesHelper(activity).insertOrUpdateNote(note) NotesHelper(activity).insertOrUpdateNote(note)
} }
} }