|
@@ -129,7 +129,6 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
|
|
|
|
|
|
dbh = new HostageDBOpenHelper(this.getActivity().getBaseContext());
|
|
dbh = new HostageDBOpenHelper(this.getActivity().getBaseContext());
|
|
pref = PreferenceManager.getDefaultSharedPreferences(getActivity());
|
|
pref = PreferenceManager.getDefaultSharedPreferences(getActivity());
|
|
- //this.addRecordToDB(5, 2);
|
|
|
|
|
|
|
|
// Get the message from the intent
|
|
// Get the message from the intent
|
|
|
|
|
|
@@ -252,7 +251,7 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
|
|
@Override
|
|
@Override
|
|
public void run()
|
|
public void run()
|
|
{
|
|
{
|
|
- //RecordOverviewFragment.this.addRecordToDB(5, 10);
|
|
|
|
|
|
+ RecordOverviewFragment.this.addRecordToDB(5, 10, 0);
|
|
updateUI(doInBackground());
|
|
updateUI(doInBackground());
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1138,8 +1137,9 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
|
|
* This will clear the database at first and than add new attacks.
|
|
* This will clear the database at first and than add new attacks.
|
|
* @param createNetworks number of networks to create
|
|
* @param createNetworks number of networks to create
|
|
* @param attacksPerNetwork maximal number of attack per network
|
|
* @param attacksPerNetwork maximal number of attack per network
|
|
|
|
+ * @param maxMessagePerAttack maximal number of messages per attack
|
|
* */
|
|
* */
|
|
- private void addRecordToDB( int createNetworks, int attacksPerNetwork) {
|
|
|
|
|
|
+ private void addRecordToDB( int createNetworks, int attacksPerNetwork, int maxMessagePerAttack) {
|
|
if ((dbh.getRecordCount() > 0)) dbh.clearData();
|
|
if ((dbh.getRecordCount() > 0)) dbh.clearData();
|
|
|
|
|
|
Calendar cal = Calendar.getInstance();
|
|
Calendar cal = Calendar.getInstance();
|
|
@@ -1165,7 +1165,7 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
|
|
String protocolName = this.getResources().getStringArray(
|
|
String protocolName = this.getResources().getStringArray(
|
|
R.array.protocols)[protocolIndex];
|
|
R.array.protocols)[protocolIndex];
|
|
|
|
|
|
- int numOfAttackPerNetwork = (Math.abs(random.nextInt()) % attacksPerNetwork) + 1;
|
|
|
|
|
|
+ int numOfAttackPerNetwork = (Math.abs(random.nextInt()) % Math.max(1, attacksPerNetwork + 1));
|
|
|
|
|
|
NetworkRecord network = new NetworkRecord();
|
|
NetworkRecord network = new NetworkRecord();
|
|
network.setBssid(bssidName);
|
|
network.setBssid(bssidName);
|
|
@@ -1186,10 +1186,9 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
|
|
// ATTACKS PER NETWORK
|
|
// ATTACKS PER NETWORK
|
|
for (int attackNumber = 0; attackNumber < numOfAttackPerNetwork; attackNumber++) {
|
|
for (int attackNumber = 0; attackNumber < numOfAttackPerNetwork; attackNumber++) {
|
|
|
|
|
|
- int numRecordsPerAttack = (Math.abs(random.nextInt()) % 5) + 1;
|
|
|
|
- /*
|
|
|
|
- * ADD A ATTACK*/
|
|
|
|
|
|
+ int numRecordsPerAttack = (Math.abs(random.nextInt()) % (Math.max( maxMessagePerAttack + 1, 1)));
|
|
|
|
|
|
|
|
+ /* ADD A ATTACK*/
|
|
AttackRecord attack = new AttackRecord();
|
|
AttackRecord attack = new AttackRecord();
|
|
attack.setAttack_id(attackId);
|
|
attack.setAttack_id(attackId);
|
|
|
|
|
|
@@ -1201,7 +1200,7 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
|
|
|
|
|
|
dbh.addAttackRecord(attack);
|
|
dbh.addAttackRecord(attack);
|
|
|
|
|
|
- // RECORDS PER ATTACK
|
|
|
|
|
|
+ // MESSAGE PER ATTACK
|
|
for (int messageID = attackId; messageID < attackId + numRecordsPerAttack; messageID++) {
|
|
for (int messageID = attackId; messageID < attackId + numRecordsPerAttack; messageID++) {
|
|
MessageRecord message = new MessageRecord();
|
|
MessageRecord message = new MessageRecord();
|
|
message.setId(messageID);
|
|
message.setId(messageID);
|