X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fhelpers%2FBookmarksDatabaseHelper.kt;h=fac7001ad6fa2fb1952c8d3ad47c5008912f393d;hb=0b2da52fc661cf302cd94105620e54340d269f1d;hp=12753e1652d5947eb2f0e2d07719dee11f136d76;hpb=38919c77d15eeacbee96ab337afc62b30ddc74ca;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/BookmarksDatabaseHelper.kt b/app/src/main/java/com/stoutner/privacybrowser/helpers/BookmarksDatabaseHelper.kt index 12753e16..fac7001a 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/helpers/BookmarksDatabaseHelper.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/BookmarksDatabaseHelper.kt @@ -26,17 +26,17 @@ import android.database.DatabaseUtils import android.database.sqlite.SQLiteDatabase import android.database.sqlite.SQLiteOpenHelper -// The private constants. +// Define the private class constants. private const val SCHEMA_VERSION = 1 class BookmarksDatabaseHelper(context: Context) : SQLiteOpenHelper(context, BOOKMARKS_DATABASE, null, SCHEMA_VERSION) { // Define the public companion object constants. These can be moved to public class constants once the entire project has migrated to Kotlin. companion object { - // The database constants. + // Define the public database constants. const val BOOKMARKS_DATABASE = "bookmarks.db" const val BOOKMARKS_TABLE = "bookmarks" - // The schema constants. + // Define the public schema constants. const val ID = "_id" const val BOOKMARK_NAME = "bookmarkname" const val BOOKMARK_URL = "bookmarkurl" @@ -45,15 +45,15 @@ class BookmarksDatabaseHelper(context: Context) : SQLiteOpenHelper(context, BOOK const val IS_FOLDER = "isfolder" const val FAVORITE_ICON = "favoriteicon" - // The table creation constant. - const val CREATE_BOOKMARKS_TABLE = "CREATE TABLE " + BOOKMARKS_TABLE + " (" + - ID + " INTEGER PRIMARY KEY, " + - BOOKMARK_NAME + " TEXT, " + - BOOKMARK_URL + " TEXT, " + - PARENT_FOLDER + " TEXT, " + - DISPLAY_ORDER + " INTEGER, " + - IS_FOLDER + " BOOLEAN, " + - FAVORITE_ICON + " BLOB)" + // Define the public table creation constant. + const val CREATE_BOOKMARKS_TABLE = "CREATE TABLE $BOOKMARKS_TABLE (" + + "$ID INTEGER PRIMARY KEY, " + + "$BOOKMARK_NAME TEXT, " + + "$BOOKMARK_URL TEXT, " + + "$PARENT_FOLDER TEXT, " + + "$DISPLAY_ORDER INTEGER, " + + "$IS_FOLDER BOOLEAN, " + + "$FAVORITE_ICON BLOB)" } override fun onCreate(bookmarksDatabase: SQLiteDatabase) {