Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cd7afbc authored by Anton Cherkashyn's avatar Anton Cherkashyn
Browse files

Remove hardcoded strings from AlarmDatabaseHelper 

Replace hardcoded column ids with constants from Alarm.Columns class.
This also moves table name into a separate String constant "alarms".

Change-Id: Ie359fb0ffdf3d63a3a44c0c47fdfd37a2b914dee
parent 384da82f

src/com/android/deskclock/AlarmDatabaseHelper.java

+21 −16
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.net.Uri; 
class AlarmDatabaseHelper extends SQLiteOpenHelper {



    private static final String DATABASE_NAME = "alarms.db";

    private static final String TABLE_NAME = "alarms";

    private static final int DATABASE_VERSION = 5;



    public AlarmDatabaseHelper(Context context) {
@@ -40,21 +41,24 @@ class AlarmDatabaseHelper extends SQLiteOpenHelper { 


    @Override

    public void onCreate(SQLiteDatabase db) {

        db.execSQL("CREATE TABLE alarms (" +

                   "_id INTEGER PRIMARY KEY," +

                   "hour INTEGER, " +

                   "minutes INTEGER, " +

                   "daysofweek INTEGER, " +

                   "alarmtime INTEGER, " +

                   "enabled INTEGER, " +

                   "vibrate INTEGER, " +

                   "message TEXT, " +

                   "alert TEXT);");

        db.execSQL("CREATE TABLE " + TABLE_NAME + " (" +

                   Alarm.Columns._ID + " INTEGER PRIMARY KEY," +

                   Alarm.Columns.HOUR + " INTEGER, " +

                   Alarm.Columns.MINUTES + " INTEGER, " +

                   Alarm.Columns.DAYS_OF_WEEK + " INTEGER, " +

                   Alarm.Columns.ALARM_TIME + " INTEGER, " +

                   Alarm.Columns.ENABLED + " INTEGER, " +

                   Alarm.Columns.VIBRATE + " INTEGER, " +

                   Alarm.Columns.MESSAGE + " TEXT, " +

                   Alarm.Columns.ALERT + " TEXT);");



        // insert default alarms

        String insertMe = "INSERT INTO alarms " +

                "(hour, minutes, daysofweek, alarmtime, enabled, vibrate, " +

                " message, alert) VALUES ";

        String cs = ", "; //coma and space

        String insertMe = "INSERT INTO " + TABLE_NAME +

                " (" + Alarm.Columns.HOUR + cs + Alarm.Columns.MINUTES + cs +

                Alarm.Columns.DAYS_OF_WEEK + cs + Alarm.Columns.ALARM_TIME + cs +

                Alarm.Columns.ENABLED + cs + Alarm.Columns.VIBRATE + cs +

                Alarm.Columns.MESSAGE + cs + Alarm.Columns.ALERT + ") VALUES ";

        db.execSQL(insertMe + "(8, 30, 31, 0, 0, 1, '', '');");

        db.execSQL(insertMe + "(9, 00, 96, 0, 0, 1, '', '');");

    }
@@ -66,7 +70,7 @@ class AlarmDatabaseHelper extends SQLiteOpenHelper { 
                "Upgrading alarms database from version " +

                oldVersion + " to " + currentVersion +

                ", which will destroy all old data");

        db.execSQL("DROP TABLE IF EXISTS alarms");

        db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);

        onCreate(db);

    }
@@ -81,7 +85,8 @@ class AlarmDatabaseHelper extends SQLiteOpenHelper { 
                int id = (Integer) value;

                if (id > -1) {

                    final Cursor cursor = db

                            .query("alarms", new String[]{Alarm.Columns._ID}, "_id = ?",

                            .query(TABLE_NAME, new String[]{Alarm.Columns._ID},

                                    Alarm.Columns._ID + " = ?",

                                    new String[]{id + ""}, null, null, null);

                    if (cursor.moveToFirst()) {

                        // Record exists. Remove the id so sqlite can generate a new one.
@@ -90,7 +95,7 @@ class AlarmDatabaseHelper extends SQLiteOpenHelper { 
                }

            }



            rowId = db.insert("alarms", Alarm.Columns.MESSAGE, values);

            rowId = db.insert(TABLE_NAME, Alarm.Columns.MESSAGE, values);

            db.setTransactionSuccessful();

        } finally {

            db.endTransaction();