Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2

res/layout/expandable_section_header.xml

@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:padding="8dp"
-    android:background="#000000">
+    android:background="#ffffff">
 
 
     <TextView
@@ -14,6 +14,6 @@
         android:layout_height="wrap_content"
         android:paddingLeft="?android:attr/expandableListPreferredItemPaddingLeft"
         android:textSize="17dp"
-        android:textColor="#f9f93d" />
+        android:textColor="#505c6d" />
 
 </LinearLayout>

res/layout/fragment_record_list.xml

@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@android:color/transparent"
     >
 
             <ExpandableListView
@@ -14,11 +15,13 @@
                 android:layout_alignParentTop="true"
                 android:layout_marginLeft="0dp"
                 android:layout_marginTop="0dp"
-                android:background="#F2F2F2"
+                android:background="@android:color/transparent"
                 android:choiceMode="singleChoice"
                 android:divider="@android:color/transparent"
-                android:dividerHeight="10dp"
+                android:dividerHeight="5dp"
-                android:padding="5dp" >
+                android:padding="5dp"
+                android:headerDividersEnabled="false"
+                android:childDivider="@android:color/transparent">
 
     </ExpandableListView>
 

res/layout/record_list_item.xml

@@ -2,7 +2,7 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:padding="5dp"
     android:baselineAligned="false"
     android:background="@drawable/panel_bg">
@@ -14,7 +14,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:text="BSSID"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="#000000" />
 
     <TextView
         android:id="@+id/RecordTextFieldSSID"
@@ -45,6 +46,7 @@
         android:layout_alignBottom="@+id/RecordTextFieldBSSID"
         android:layout_alignRight="@+id/RecordTextFieldTimestamp"
         android:text="Protocol"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="#000000" />
 
 </RelativeLayout>

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

@@ -185,7 +185,7 @@ public class LogFilter implements Parcelable{
     public boolean isSet(){
         boolean hasTime = this.belowTimestamp != Long.MAX_VALUE|| this.aboveTimestamp != Long.MIN_VALUE;
         boolean hasBSSIDs = this.getBSSIDs().size() > 0;
-        boolean hasESSIDs = this.getBSSIDs().size() > 0;
+        boolean hasESSIDs = this.getESSIDs().size() > 0;
         boolean hasProtocols = this.getProtocols().size() > 0;
 
         return hasBSSIDs || hasESSIDs || hasProtocols | hasTime;

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

@@ -156,6 +156,7 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
 		}
 		if(title.equals(FILTER_MENU_TITLE_REMOVE)){
 			this.clearFilter();
+            this.populateListViewFromDB(this.expListView);
 		}
 		if(title.equals(FILTER_MENU_TITLE_TIMESTAMP_BELOW)){
 			this.openTimestampToFilterDialog();