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

change the Note ID type to Long

Browse Source
This commit is contained in:
tibbi
2018-11-07 19:00:06 +01:00
parent 885170edfc
commit 99ee559836
10 changed files with 39 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt
View File

@ -45,13 +45,13 @@ class Config(context: Context) : BaseConfig(context) {
get() = prefs.getInt(GRAVITY, GRAVITY_LEFT)
set(size) = prefs.edit().putInt(GRAVITY, size).apply()
var currentNoteId: Int
get() = prefs.getInt(CURRENT_NOTE_ID, 1)
set(id) = prefs.edit().putInt(CURRENT_NOTE_ID, id).apply()
var currentNoteId: Long
get() = prefs.getLong(CURRENT_NOTE_ID, 1L)
set(id) = prefs.edit().putLong(CURRENT_NOTE_ID, id).apply()
var widgetNoteId: Int
get() = prefs.getInt(WIDGET_NOTE_ID, 1)
set(id) = prefs.edit().putInt(WIDGET_NOTE_ID, id).apply()
var widgetNoteId: Long
get() = prefs.getLong(WIDGET_NOTE_ID, 1L)
set(id) = prefs.edit().putLong(WIDGET_NOTE_ID, id).apply()
var placeCursorToEnd: Boolean
get() = prefs.getBoolean(CURSOR_PLACEMENT, true)

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

@ -7,6 +7,7 @@ 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.getLongValue
import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.models.Note
import com.simplemobiletools.notes.pro.models.Widget
@ -52,11 +53,6 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
db.insert(NOTES_TABLE_NAME, null, values)
}
fun insertNote(note: Note): Int {
val values = fillNoteContentValues(note)
return mDb.insertWithOnConflict(NOTES_TABLE_NAME, null, values, CONFLICT_IGNORE).toInt()
}
fun insertWidget(widget: Widget): Int {
val values = fillWidgetContentValues(widget)
return mDb.insertWithOnConflict(WIDGETS_TABLE_NAME, null, values, CONFLICT_IGNORE).toInt()
@ -78,7 +74,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
}
}
fun deleteNote(id: Int) {
fun deleteNote(id: Long) {
mDb.delete(NOTES_TABLE_NAME, "$COL_ID = $id", null)
mDb.delete(WIDGETS_TABLE_NAME, "$COL_NOTE_ID = $id", null)
}
@ -96,7 +92,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
}
}
fun getNoteId(path: String): Int {
fun getNoteId(path: String): Long {
val cols = arrayOf(COL_ID)
val selection = "$COL_PATH = ?"
val selectionArgs = arrayOf(path)
@ -104,7 +100,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
try {
cursor = mDb.query(NOTES_TABLE_NAME, cols, selection, selectionArgs, null, null, null)
if (cursor?.moveToFirst() == true) {
return cursor.getIntValue(COL_ID)
return cursor.getLongValue(COL_ID)
}
} finally {
cursor?.close()