|
@@ -282,8 +282,8 @@ public class UglyDbHelper extends SQLiteOpenHelper {
|
|
|
ArrayList<Record> recordList = new ArrayList<Record>();
|
|
|
// Select All Query
|
|
|
String selectQuery = "SELECT * FROM " + TABLE_RECORDS
|
|
|
- + " NATURAL JOIN " + TABLE_ATTACK_INFO + " NATURAL JOIN "
|
|
|
- + TABLE_BSSIDS;
|
|
|
+ + " NATURAL JOIN " + TABLE_ATTACK_INFO + " JOIN "
|
|
|
+ + TABLE_BSSIDS + " USING (_bssid)";
|
|
|
|
|
|
SQLiteDatabase db = this.getWritableDatabase();
|
|
|
Cursor cursor = db.rawQuery(selectQuery, null);
|
|
@@ -640,8 +640,7 @@ public class UglyDbHelper extends SQLiteOpenHelper {
|
|
|
Record record = new Record();
|
|
|
record.setId(Integer.parseInt(cursor.getString(0)));
|
|
|
record.setAttack_id(cursor.getLong(1));
|
|
|
- record.setType(cursor.getString(2).equals("SEND") ? TYPE.SEND
|
|
|
- : TYPE.RECEIVE);
|
|
|
+ record.setType(TYPE.valueOf(cursor.getString(2)));
|
|
|
record.setTimestamp(cursor.getLong(3));
|
|
|
record.setPacket(cursor.getString(4));
|
|
|
record.setProtocol(cursor.getString(5));
|