bug fixes

res/layout/record_list_item.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="5dp"
+    android:baselineAligned="false"
+    android:background="@drawable/panel_bg">
+
+    <TextView
+        android:id="@+id/RecordTextFieldBSSID"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:text="BSSID"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <TextView
+        android:id="@+id/RecordTextFieldSSID"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/RecordTextFieldBSSID"
+        android:layout_below="@+id/RecordTextFieldBSSID"
+        android:layout_marginTop="24dp"
+        android:text="ESSID"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <TextView
+        android:id="@+id/RecordTextFieldTimestamp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/RecordTextFieldSSID"
+        android:layout_alignBottom="@+id/RecordTextFieldSSID"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="5dp"
+        android:text="00:00:00"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <TextView
+        android:id="@+id/RecordTextFieldProtocol"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/RecordTextFieldBSSID"
+        android:layout_alignBottom="@+id/RecordTextFieldBSSID"
+        android:layout_alignRight="@+id/RecordTextFieldTimestamp"
+        android:text="Protocol"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+</RelativeLayout>

src/de/tudarmstadt/informatik/hostage/ui/LogFilter.java

@@ -25,8 +25,8 @@ public class LogFilter implements Parcelable{
 				protocol(1),
 				_bssid(1),
 				ssid(3),
-				remoteHostName(5),
-				lcaolHostName(6),
+				//remoteHostName(5),
+				//lcaolHostName(6),
 				_attack_id(7),
 				_id(8);
 		        private final int id;

src/de/tudarmstadt/informatik/hostage/ui2/adapter/RecordListAdapter.java

@@ -0,0 +1,74 @@
+package de.tudarmstadt.informatik.hostage.ui2.adapter;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.SimpleAdapter;
+import android.widget.TextView;
+import de.tudarmstadt.informatik.hostage.R;
+
+public class RecordListAdapter extends SimpleAdapter {
+    private final Context context;
+    private final ArrayList<HashMap<String, String>> values;
+    private String[] from;
+	private int[] to;
+    
+	public RecordListAdapter(Context context, ArrayList<HashMap<String, String>> objects, int resource, String[] from,
+			int[] to) {
+		super(context, objects, resource, from, to);
+        this.context = context;
+        this.values  = objects;
+        this.from = from;
+        this.to = to;
+	}
+	
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        LayoutInflater inflater = (LayoutInflater) context
+                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View rowView = inflater.inflate(R.layout.record_list_item, parent, false);
+        
+        
+        HashMap<String, String> object = this.values.get(position);
+        
+        for(int i = 0; i < this.from.length; i++){
+        	String key = this.from[i];
+        	String text = object.get(key);
+        	int id = this.to[i];
+        	TextView tView = (TextView) rowView.findViewById(id);
+        	tView.setText(text);
+        }
+        
+        return rowView;
+    }
+    
+    
+	
+	/*****************************
+	 * 
+	 *          Date Transform
+	 * 
+	 * ***************************/
+	
+	
+	@SuppressLint("SimpleDateFormat")
+	private String getDateAsString(long timeStamp) {
+
+		try {
+			DateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+			Date netDate = (new Date(timeStamp));
+			return sdf.format(netDate);
+		} catch (Exception ex) {
+			return "xx";
+		}
+	}
+
+}

src/de/tudarmstadt/informatik/hostage/ui2/fragment/RecordOverviewFragment.java

@@ -217,18 +217,6 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
 				return message;
 			}
 
-			@SuppressLint("SimpleDateFormat")
-			private String getDateAsString(long timeStamp) {
-
-				try {
-					DateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-					Date netDate = (new Date(timeStamp));
-					return sdf.format(netDate);
-				} catch (Exception ex) {
-					return "xx";
-				}
-			}
-
 		});
 	}
 	
@@ -245,7 +233,7 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
 	private String getDateAsString(long timeStamp) {
 
 		try {
-			DateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+			DateFormat sdf = new SimpleDateFormat("H:mm  dd/MM/yyyy");
 			Date netDate = (new Date(timeStamp));
 			return sdf.format(netDate);
 		} catch (Exception ex) {
@@ -370,8 +358,8 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
 		titles.add("Protocol");
 		titles.add("BSSID");
 		titles.add("ESSID");
-		titles.add("Remote Host Name");
-		titles.add("Local Host Name");
+		//titles.add("Remote Host Name");
+		//titles.add("Local Host Name");
 		//titles.add("Attack ID");
 		//titles.add("ID");
 		return titles;