From 06f7c7933f1751f704a255c0f3fa96cddeec1b16 Mon Sep 17 00:00:00 2001 From: agk512 Date: Mon, 2 Dec 2013 03:35:22 -0500 Subject: [PATCH] Further Alert cleanup >AGK --- src/com/uncc/gameday/alerts/AlertDB.java | 437 ++++++++++++----------- 1 file changed, 237 insertions(+), 200 deletions(-) diff --git a/src/com/uncc/gameday/alerts/AlertDB.java b/src/com/uncc/gameday/alerts/AlertDB.java index 87bcc62..aa79314 100644 --- a/src/com/uncc/gameday/alerts/AlertDB.java +++ b/src/com/uncc/gameday/alerts/AlertDB.java @@ -1,7 +1,10 @@ package com.uncc.gameday.alerts; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.Date; +import java.util.GregorianCalendar; import java.util.List; import android.content.ContentValues; @@ -16,230 +19,264 @@ import android.database.sqlite.SQLiteOpenHelper; * The Class AlertDB. */ public class AlertDB extends SQLiteOpenHelper { - - /** The Constant DATABASE_VERSION. */ - private static final int DATABASE_VERSION = 1; - - /** The Constant DATABASE_NAME. */ - private static final String DATABASE_NAME = "AlertDataBase"; - - /** The Constant TABLE_ALERTS. */ - private static final String TABLE_ALERTS = "alerts"; + + /** The Constant DATABASE_VERSION. */ + private static final int DATABASE_VERSION = 1; + + /** The Constant DATABASE_NAME. */ + private static final String DATABASE_NAME = "AlertDataBase"; + + /** The Constant TABLE_ALERTS. */ + private static final String TABLE_ALERTS = "alerts"; - /** The Constant KEY_ALARM_DATE. */ - private static final String KEY_ALARM_DATE = "alarm_date"; - - /** The Constant KEY_MESSAGE. */ - private static final String KEY_MESSAGE = "message"; - - /** The Constant KEY_SHOWN. */ - private static final String KEY_SHOWN = "shown"; - - /** The Constant KEY_TYPE. */ - private static final String KEY_TYPE = "type"; - + /** The Constant KEY_ALARM_DATE. */ + private static final String KEY_ALARM_DATE = "alarm_date"; + + /** The Constant KEY_MESSAGE. */ + private static final String KEY_MESSAGE = "message"; + + /** The Constant KEY_SHOWN. */ + private static final String KEY_SHOWN = "shown"; + + /** The Constant KEY_TYPE. */ + private static final String KEY_TYPE = "type"; + - /** - * Instantiates our wrapper around the SQLiteOpenHelper - * - * @param context - The context to open the database in - */ - public AlertDB(Context context){ - super(context, DATABASE_NAME, null, DATABASE_VERSION); - } - - /** - * Create the initial Database - */ - @Override - public void onCreate(SQLiteDatabase db) { - String CREATE_ALERTS_TABLE = "CREATE TABLE " + TABLE_ALERTS + "(" - + KEY_MESSAGE + " STRING PRIMARY KEY," + KEY_ALARM_DATE + " LONG," - + KEY_SHOWN + " INT," + KEY_TYPE + " STRING" + ")"; - db.execSQL(CREATE_ALERTS_TABLE); - } - - /** - * Upgrade the database on application update - */ - @Override - public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - //drop older table if it exists - db.execSQL("DROP OLDER TABLE " + TABLE_ALERTS); - - //recreate tables - onCreate(db); - - } + /** + * Instantiates our wrapper around the SQLiteOpenHelper + * + * @param context - The context to open the database in + */ + public AlertDB(Context context){ + super(context, DATABASE_NAME, null, DATABASE_VERSION); + } + + /** + * Create the initial Database + */ + @Override + public void onCreate(SQLiteDatabase db) { + String CREATE_ALERTS_TABLE = "CREATE TABLE " + TABLE_ALERTS + "(" + + KEY_MESSAGE + " STRING PRIMARY KEY," + KEY_ALARM_DATE + " LONG," + + KEY_SHOWN + " INT," + KEY_TYPE + " STRING" + ")"; + db.execSQL(CREATE_ALERTS_TABLE); + } + + /** + * Upgrade the database on application update + */ + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + //drop older table if it exists + db.execSQL("DROP OLDER TABLE " + TABLE_ALERTS); + + //recreate tables + onCreate(db); + + } - /** - * Persist an alert into the database - * - * @param a - The Alert to persist - */ - public void persist(Alert a) { - - SQLiteDatabase db = this.getWritableDatabase(); - - ContentValues values = new ContentValues(); - values.put(KEY_MESSAGE, a.getMessage()); - - long dateValue = a.getAlarmDate().getTime(); - values.put(KEY_ALARM_DATE, dateValue); - values.put(KEY_SHOWN, a.isShown()); - values.put(KEY_TYPE, a.getType()); + /** + * Persist an alert into the database + * + * @param a - The Alert to persist + */ + public void persist(Alert a) { + + SQLiteDatabase db = this.getWritableDatabase(); + + ContentValues values = new ContentValues(); + values.put(KEY_MESSAGE, a.getMessage()); + + + values.put(KEY_ALARM_DATE, a.getAlarmDate()); + values.put(KEY_SHOWN, a.isShown()); + values.put(KEY_TYPE, a.getType()); - db.insert(TABLE_ALERTS, null, values); - db.close(); - } + db.insert(TABLE_ALERTS, null, values); + db.close(); + } - /** - * Persist a list of alerts into the database - - * helper method for easy iteration - * - * @param alerts - The alerts to store - */ - public void persistMultiple(List alerts) { - - for(int i = 0; i < alerts.size(); i++) - { - persist(alerts.get(i)); - } - - } - - /** - * Fetch an alert by date - * TODO: Unused. Remove? - * - * @param d - The date to fetch an alert from - * @return the Alert - */ - public Alert fetch(Date d) { - - return null; - } - - /** - * Fetch multiple alerts from the Database - * TODO: Unused. Remove? - * - * @param dates the dates to fetch alerts from - * @return the list - */ - public List fetchMultiple(List dates) { - - return null; - } - - /** - * Delete an alert from the Database whenever the Alert message matches - * - * @param alert the alert - */ - public void deleteAlert(Alert alert) { - SQLiteDatabase db = this.getWritableDatabase(); - db.delete(TABLE_ALERTS, KEY_MESSAGE + " = ?", - new String[] { String.valueOf(alert.getMessage()) }); - db.close(); - - } + /** + * Persist a list of alerts into the database - + * helper method for easy iteration + * + * @param alerts - The alerts to store + */ + public void persistMultiple(List alerts) { + + for(int i = 0; i < alerts.size(); i++) + { + persist(alerts.get(i)); + } + + } + + + /** + * Fetch an alert by date + * TODO: Unused. Remove? + * + * @param d - The date to fetch an alert from + * @return the Alert + */ + public Alert fetch(Date d) { + + return null; + } + + /** + * Fetch multiple alerts from the Database + * TODO: Unused. Remove? + * + * @param dates the dates to fetch alerts from + * @return the list + */ + public List fetchMultiple(List dates) { + + return null; + } + + /** + * Delete an alert from the Database whenever the Alert message matches + * + * @param alert the alert + */ + public void deleteAlert(Alert alert) { + SQLiteDatabase db = this.getWritableDatabase(); + db.delete(TABLE_ALERTS, KEY_MESSAGE + " = ?", + new String[] { String.valueOf(alert.getMessage()) }); + db.close(); + + } - - - /** - * Fetch all alerts from the Database, and mark as read - * - * @return the list - */ - public List fetchAll() { + /** + * Fetch all alerts from the Database + * + * @return the list + */ + public List fetchAll() { - List alertList = new ArrayList(); + List alertList = new ArrayList(); - String selectQuery = "SELECT * FROM " + TABLE_ALERTS; + String selectQuery = "SELECT * FROM " + TABLE_ALERTS; - SQLiteDatabase db = this.getWritableDatabase(); - Cursor cursor = db.rawQuery(selectQuery, null); + SQLiteDatabase db = this.getWritableDatabase(); + Cursor cursor = db.rawQuery(selectQuery, null); - //for each alert in database - //add it to alert list to be shown - //and modify it in DB to be classified as shown - if (cursor.moveToFirst()) - { - do - { - Alert alert = new Alert(); - alert.setMessage(cursor.getString(0)); - alert.setAlarmDate(new Date(cursor.getLong(1))); - alert.setShown(cursor.getInt(2)); - updateAlert(alert); + //for each alert in database + //add it to alert list to be shown + //and modify it in DB to be classified as shown + int i = 0; + if (cursor.moveToFirst()) + { + + GregorianCalendar todayDate = new GregorianCalendar(); + long currentDate = todayDate.getTimeInMillis(); + + do + { + if(currentDate >= cursor.getLong(1)) + { + Alert alert = new Alert(); + alert.setMessage(cursor.getString(0)); + alert.setAlarmDate(cursor.getLong(1)); + alert.setShown(cursor.getInt(2)); - alertList.add(alert); - } while (cursor.moveToNext()); + alertList.add(alert); + i++; + } + } while (cursor.moveToNext() && i < 10); - } - db.close(); - return alertList; + } + db.close(); + + //sorts alerts by Date + Collections.sort(alertList, new Comparator() { + @Override + public int compare(Alert a1, Alert a2) { + + String compareDate = Long.toString(a1.getAlarmDate()); + String thisDate = Long.toString(a2.getAlarmDate()); + return thisDate.compareTo(compareDate); + } + + }); + return alertList; } - /** - * Fetch unread alerts from the database, and mark them as read - * - * @return the list - */ - public List fetchUnread() { + /** + * Fetch unread alerts from the database, and mark them as read + * + * @return the list + */ + public List fetchUnread() { - List alertList = new ArrayList(); - String selectQuery = "SELECT * FROM " + TABLE_ALERTS; + List alertList = new ArrayList(); + String selectQuery = "SELECT * FROM " + TABLE_ALERTS; - SQLiteDatabase db = this.getWritableDatabase(); - Cursor cursor = db.rawQuery(selectQuery, null); + SQLiteDatabase db = this.getWritableDatabase(); + Cursor cursor = db.rawQuery(selectQuery, null); - //for each alert in database - //given it is classified as unread - //add it to alert list to be shown - //and modify it in DB to be classified as shown - if (cursor.moveToFirst()) - { - do - { - Alert alert = new Alert(); - if(cursor.getInt(2) == 0) - { - alert.setMessage(cursor.getString(0)); - alert.setAlarmDate(new Date(cursor.getLong(1))); - alert.setShown(cursor.getInt(2)); + //for each alert in database + //given it is classified as unread + //add it to alert list to be shown + //and modify it in DB to be classified as shown + int i = 0; + if (cursor.moveToFirst()) + { + + GregorianCalendar todayDate = new GregorianCalendar(); + long currentDate = todayDate.getTimeInMillis(); + do + { + if(cursor.getInt(2) == 0 && currentDate >= cursor.getLong(1)) + { + Alert alert = new Alert(); + alert.setMessage(cursor.getString(0)); + alert.setAlarmDate(cursor.getLong(1)); + alert.setShown(cursor.getInt(2)); - updateAlert(alert); - alertList.add(alert); - } - } while (cursor.moveToNext()); + updateAlert(alert); + alertList.add(alert); + i++; + } + } while (cursor.moveToNext() && i < 1); + } + db.close(); + + //sorts alerts by Date + Collections.sort(alertList, new Comparator() { + @Override + public int compare(Alert a1, Alert a2) { + + String compareDate = Long.toString(a1.getAlarmDate()); + String thisDate = Long.toString(a2.getAlarmDate()); + return thisDate.compareTo(compareDate); + } - } - db.close(); - return alertList; + }); + return alertList; } - /** - * Update an alert to be marked as shown - * - * @param alert the alert - * @return the int - */ - private int updateAlert(Alert alert) { + /** + * Update an alert to be marked as shown + * + * @param alert the alert + * @return the int + */ + private int updateAlert(Alert alert) { + + SQLiteDatabase db = this.getWritableDatabase(); - SQLiteDatabase db = this.getWritableDatabase(); + ContentValues values = new ContentValues(); - ContentValues values = new ContentValues(); + values.put(KEY_ALARM_DATE, alert.getAlarmDate()); + values.put(KEY_SHOWN, 1); + + return db.update(TABLE_ALERTS, values, KEY_MESSAGE + " = ?", + new String[] { String.valueOf(alert.getMessage()) }); - long dateValue = alert.getAlarmDate().getTime(); - values.put(KEY_ALARM_DATE, dateValue); - values.put(KEY_SHOWN, 1); - - return db.update(TABLE_ALERTS, values, KEY_MESSAGE + " = ?", - new String[] { String.valueOf(alert.getMessage()) }); - - } + } }