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

parse the Path field of notes too

Browse Source
This commit is contained in:
tibbi 2017-03-08 20:05:59 +01:00
parent d29473aa47
commit 8ae1a99379
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
db.execSQL("ALTER TABLE $TABLE_NAME ADD COLUMN $COL_TYPE INTEGER DEFAULT 0") db.execSQL("ALTER TABLE $TABLE_NAME ADD COLUMN $COL_TYPE INTEGER DEFAULT 0")
if (oldVersion < 3) if (oldVersion < 3)
db.execSQL("ALTER TABLE $TABLE_NAME ADD COLUMN $COL_PATH TEXT") db.execSQL("ALTER TABLE $TABLE_NAME ADD COLUMN $COL_PATH TEXT DEFAULT ''")
} }
private fun insertFirstNote(db: SQLiteDatabase) { private fun insertFirstNote(db: SQLiteDatabase) {
@ -61,6 +61,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
return ContentValues().apply { return ContentValues().apply {
put(COL_TITLE, note.title) put(COL_TITLE, note.title)
put(COL_VALUE, note.value) put(COL_VALUE, note.value)
put(COL_PATH, note.path)
put(COL_TYPE, 0) put(COL_TYPE, 0)
} }
} }
@ -84,7 +85,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
fun getNotes(): List<Note> { fun getNotes(): List<Note> {
val notes = ArrayList<Note>() val notes = ArrayList<Note>()
val cols = arrayOf(COL_ID, COL_TITLE, COL_VALUE, COL_TYPE) val cols = arrayOf(COL_ID, COL_TITLE, COL_VALUE, COL_TYPE, COL_PATH)
var cursor: Cursor? = null var cursor: Cursor? = null
try { try {
cursor = mDb.query(TABLE_NAME, cols, null, null, null, null, "$COL_TITLE COLLATE NOCASE ASC") cursor = mDb.query(TABLE_NAME, cols, null, null, null, null, "$COL_TITLE COLLATE NOCASE ASC")
@ -95,7 +96,8 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
val title = cursor.getStringValue(COL_TITLE) val title = cursor.getStringValue(COL_TITLE)
val value = cursor.getStringValue(COL_VALUE) val value = cursor.getStringValue(COL_VALUE)
val type = cursor.getIntValue(COL_TYPE) val type = cursor.getIntValue(COL_TYPE)
val note = Note(id, title, value, type) val path = cursor.getStringValue(COL_PATH) ?: ""
val note = Note(id, title, value, type, path)
notes.add(note) notes.add(note)
} catch (e: Exception) { } catch (e: Exception) {
continue continue
@ -110,7 +112,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
} }
fun getNote(id: Int): Note? { fun getNote(id: Int): Note? {
val cols = arrayOf(COL_TITLE, COL_VALUE, COL_TYPE) val cols = arrayOf(COL_TITLE, COL_VALUE, COL_TYPE, COL_PATH)
val selection = "$COL_ID = ?" val selection = "$COL_ID = ?"
val selectionArgs = arrayOf(id.toString()) val selectionArgs = arrayOf(id.toString())
var note: Note? = null var note: Note? = null
@ -121,7 +123,8 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
val title = cursor.getStringValue(COL_TITLE) val title = cursor.getStringValue(COL_TITLE)
val value = cursor.getStringValue(COL_VALUE) val value = cursor.getStringValue(COL_VALUE)
val type = cursor.getIntValue(COL_TYPE) val type = cursor.getIntValue(COL_TYPE)
note = Note(id, title, value, type) val path = cursor.getStringValue(COL_PATH) ?: ""
note = Note(id, title, value, type, path)
} }
} finally { } finally {
cursor?.close() cursor?.close()

3
app/src/main/kotlin/com/simplemobiletools/notes/models/Note.kt
View File

@ -1,4 +1,3 @@
package com.simplemobiletools.notes.models package com.simplemobiletools.notes.models
data class Note(var id: Int, var title: String, var value: String, val type: Int) data class Note(var id: Int, var title: String, var value: String, val type: Int, val path: String = "")