Alexander Brakowski 10 years ago
parent
commit
7287f7ec9a

+ 30 - 12
src/de/tudarmstadt/informatik/hostage/ui2/fragment/RecordOverviewFragment.java

@@ -1,12 +1,5 @@
 package de.tudarmstadt.informatik.hostage.ui2.fragment;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-
 import android.annotation.SuppressLint;
 import android.app.Fragment;
 import android.content.Context;
@@ -27,6 +20,14 @@ import android.widget.ImageButton;
 import android.widget.PopupMenu;
 import android.widget.PopupMenu.OnMenuItemClickListener;
 import android.widget.Toast;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+
 import de.tudarmstadt.informatik.hostage.R;
 import de.tudarmstadt.informatik.hostage.logging.Record;
 import de.tudarmstadt.informatik.hostage.logging.Record.TYPE;
@@ -181,6 +182,8 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
             i++;
         }
 
+        ArrayList<String>groupTitle = new ArrayList<String>();
+
 		for (Record val : data) {
             // DO GROUPING IN HERE
 			HashMap<String, String> map = new HashMap<String, String>();
@@ -200,11 +203,12 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
             if (items == null) {
                 items = new ArrayList<ExpandableListItem>();
                 sectionData.put(groupID, items);
+                groupTitle.add(groupID);
             }
 			items.add(item);
 		}
 
-        RecordListAdapter adapter = new RecordListAdapter(this.getApplicationContext(),this.getGroupTitle(), sectionData);
+        RecordListAdapter adapter = new RecordListAdapter(this.getApplicationContext(), groupTitle, sectionData);
 
         mylist.setAdapter(adapter);
 	}
@@ -562,7 +566,7 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
 	
 	private void addRecordToDB() {
 
-        if (dbh.getAllRecords().size() > 0) return;
+        if ((dbh.getRecordCount() > 0)) return;
 
 		Calendar cal = Calendar.getInstance();
 
@@ -572,6 +576,8 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
 		int numberofRecords = (int) (Math.random() * (50 - 10));
 		for (int i = 0; i < numberofRecords; i++) {
 			Record record = new Record();
+            record.setId(i);
+            record.setAttack_id(i);
 			record.setBssid("BSSID: " + i);
 			record.setSsid("SSID: w" + i);
 			record.setTimestamp(cal.getTimeInMillis()
@@ -582,15 +588,27 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
 					R.array.protocols)[index];
 
 			record.setProtocol(protocolName);
-			record.setId(i);
-			record.setAttack_id(i);
 
 			record.setLocalIP("127.0.0.1");
 			record.setType(TYPE.SEND);
 
 			dbh.addRecord(record);
 		}
-	}
+
+        int countAllLogs = dbh.getAllRecords().size();
+        int countRecords = dbh.getRecordCount();
+        int countAttacks = dbh.getAttackCount();
+
+        if ((countRecords == 0)) {
+            Record rec = dbh.getRecordOfAttackId(0);
+            Record rec2 = dbh.getRecord(0);
+
+
+            System.out.println(""+"Could not create logs!");
+            System.exit(0);
+        }
+
+    }
 
 
 }