|
@@ -219,6 +219,9 @@ public class HostageDBOpenHelper extends SQLiteOpenHelper {
|
|
|
SQLiteDatabase db = this.getWritableDatabase();
|
|
|
this.insertAttackRecordWithOnConflict(record,db);
|
|
|
db.close(); // Closing database connection
|
|
|
+ ArrayList<SyncDevice> devices = new ArrayList<SyncDevice>();
|
|
|
+ devices.add(SyncDevice.currentDevice());
|
|
|
+ this.updateSyncDevices(devices);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -243,6 +246,9 @@ public class HostageDBOpenHelper extends SQLiteOpenHelper {
|
|
|
db.endTransaction();
|
|
|
}
|
|
|
db.close(); // Closing database connection
|
|
|
+ ArrayList<SyncDevice> devices = new ArrayList<SyncDevice>();
|
|
|
+ devices.add(SyncDevice.currentDevice());
|
|
|
+ this.updateSyncDevices(devices);
|
|
|
}
|
|
|
|
|
|
private void insertAttackRecordWithOnConflict(AttackRecord record, SQLiteDatabase db){
|
|
@@ -1871,15 +1877,15 @@ public class HostageDBOpenHelper extends SQLiteOpenHelper {
|
|
|
SQLiteDatabase db = this.getReadableDatabase();
|
|
|
|
|
|
for (SyncDevice sDevice : updatedDevices){
|
|
|
- String selectQuery = "SELECT * FROM " + AttackEntry.TABLE_NAME + " A " + " NATURAL JOIN " + PacketEntry.TABLE_NAME + " P "
|
|
|
+ String selectQuery = "SELECT * FROM " + AttackEntry.TABLE_NAME + " A " + " , " + PacketEntry.TABLE_NAME + " P "
|
|
|
+ " WHERE "
|
|
|
- +" ( "
|
|
|
+ + " ( "
|
|
|
+ "A." + AttackEntry.COLUMN_NAME_ATTACK_ID + " = " + " P."+ PacketEntry.COLUMN_NAME_ATTACK_ID
|
|
|
+ " AND " + " A." + AttackEntry.COLUMN_NAME_DEVICE + " = " + "'" + sDevice.getDeviceID() + "'"
|
|
|
+ " AND " + " A." + AttackEntry.COLUMN_NAME_SYNC_ID + " > " + sDevice.getHighest_attack_id()
|
|
|
+ " ) "
|
|
|
//+ " GROUP BY " + AttackEntry.TABLE_NAME + "." + AttackEntry.COLUMN_NAME_DEVICE
|
|
|
- + " ORDER BY " + AttackEntry.TABLE_NAME + "." + AttackEntry.COLUMN_NAME_SYNC_ID + " DESC ";
|
|
|
+ + " ORDER BY " + "A" + "." + AttackEntry.COLUMN_NAME_SYNC_ID + " DESC ";
|
|
|
Cursor cursor = db.rawQuery(selectQuery, null);
|
|
|
|
|
|
// looping through all rows and adding to list
|
|
@@ -1915,7 +1921,7 @@ public class HostageDBOpenHelper extends SQLiteOpenHelper {
|
|
|
SQLiteDatabase db = this.getReadableDatabase();
|
|
|
|
|
|
for (SyncDevice sDevice : updatedDevices){
|
|
|
- String selectQuery = "SELECT * FROM " + AttackEntry.TABLE_NAME + " A " + " NATURAL JOIN " + PacketEntry.TABLE_NAME + " P "
|
|
|
+ String selectQuery = "SELECT * FROM " + AttackEntry.TABLE_NAME + " A " + " , " + PacketEntry.TABLE_NAME + " P "
|
|
|
+ " WHERE "
|
|
|
+" ( "
|
|
|
+ "A." + AttackEntry.COLUMN_NAME_ATTACK_ID + " = " + " P."+ PacketEntry.COLUMN_NAME_ATTACK_ID
|
|
@@ -1923,7 +1929,7 @@ public class HostageDBOpenHelper extends SQLiteOpenHelper {
|
|
|
+ " AND " + " A." + AttackEntry.COLUMN_NAME_SYNC_ID + " > " + sDevice.getHighest_attack_id()
|
|
|
+ " ) "
|
|
|
//+ " GROUP BY " + AttackEntry.TABLE_NAME + "." + AttackEntry.COLUMN_NAME_DEVICE
|
|
|
- + " ORDER BY " + AttackEntry.TABLE_NAME + "." + AttackEntry.COLUMN_NAME_SYNC_ID + " DESC ";
|
|
|
+ + " ORDER BY " + " A" + "." + AttackEntry.COLUMN_NAME_SYNC_ID + " DESC ";
|
|
|
Cursor cursor = db.rawQuery(selectQuery, null);
|
|
|
|
|
|
// looping through all rows and adding to list
|