fenix
/
Simple-Notes
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add correct note title to all notes at importing a folder

This commit is contained in:
tibbi 2018-05-17 11:39:49 +02:00
parent e5dba29899
commit f00ae5de18
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,15 +48,16 @@ class ImportFolderDialog(val activity: SimpleActivity, val path: String, val cal
else -> true
}
}.forEach {
val storePath = if (updateFilesOnEdit) it.path else ""
val storeContent = if (updateFilesOnEdit) "" else it.readText()
val storePath = if (updateFilesOnEdit) it.absolutePath else ""
val title = it.absolutePath.getFilenameFromPath()
val value = if (updateFilesOnEdit) "" else it.readText()
if (updateFilesOnEdit) {
activity.handleSAFDialog(path) {
lastSavedNoteId = saveNote(storeContent, storePath)
lastSavedNoteId = saveNote(title, value, storePath)
}
} else {
lastSavedNoteId = saveNote(storeContent, storePath)
lastSavedNoteId = saveNote(title, value, storePath)
}
}
@ -67,9 +68,8 @@ class ImportFolderDialog(val activity: SimpleActivity, val path: String, val cal
dialog.dismiss()
}
private fun saveNote(storeContent: String, storePath: String): Int {
val filename = storePath.getFilenameFromPath()
val note = Note(0, filename, storeContent, TYPE_NOTE, storePath)
private fun saveNote(title: String, value: String, path: String): Int {
val note = Note(0, title, value, TYPE_NOTE, path)
return activity.dbHelper.insertNote(note)
}
}

3
app/src/main/kotlin/com/simplemobiletools/notes/helpers/DBHelper.kt
View File

@ -4,6 +4,7 @@ import android.content.ContentValues
import android.content.Context
import android.database.Cursor
import android.database.sqlite.SQLiteDatabase
import android.database.sqlite.SQLiteDatabase.CONFLICT_IGNORE
import android.database.sqlite.SQLiteOpenHelper
import com.simplemobiletools.commons.extensions.getIntValue
import com.simplemobiletools.commons.extensions.getStringValue
@ -57,7 +58,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
fun insertNote(note: Note): Int {
val values = fillContentValues(note)
return mDb.insert(TABLE_NAME, null, values).toInt()
return mDb.insertWithOnConflict(TABLE_NAME, null, values, CONFLICT_IGNORE).toInt()
}
private fun fillContentValues(note: Note): ContentValues {