Browse Source

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

Daniel Lazar 10 years ago
parent
commit
bd8237b73f

+ 1 - 1
res/layout/expandable_section_header.xml

@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:padding="8dp"
-    android:background="#d9d9d9">
+    android:background="#ffffff">
 
 
     <TextView

+ 6 - 3
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:padding="5dp" >
+                android:dividerHeight="5dp"
+                android:padding="5dp"
+                android:headerDividersEnabled="false"
+                android:childDivider="@android:color/transparent">
 
     </ExpandableListView>
 

+ 1 - 1
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">

+ 1 - 1
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;

+ 7 - 0
src/de/tudarmstadt/informatik/hostage/ui2/fragment/RecordOverviewFragment.java

@@ -29,6 +29,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Random;
 
 import de.tudarmstadt.informatik.hostage.R;
 import de.tudarmstadt.informatik.hostage.logging.Record;
@@ -155,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();
@@ -606,6 +608,8 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
 		int maxProtocolsIndex = this.getResources().getStringArray(
 				R.array.protocols).length;
 
+		Random random = new Random();
+
 		int numberofRecords = (int) (Math.random() * (50 - 10));
 		for (int i = 0; i < numberofRecords; i++) {
 			Record record = new Record();
@@ -625,6 +629,9 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
 			record.setLocalIP("127.0.0.1");
 			record.setType(TYPE.SEND);
 
+			record.setLatitude(41.889 + random.nextDouble());
+			record.setLongitude(-87.622 + random.nextDouble());
+
 			dbh.addRecord(record);
 		}
 

+ 20 - 8
src/de/tudarmstadt/informatik/hostage/ui2/fragment/ThreatMapFragment.java

@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.view.InflateException;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,6 +29,7 @@ import static com.google.android.gms.common.GooglePlayServicesUtil.*;
  */
 public class ThreatMapFragment extends Fragment {
 	private GoogleMap map = null;
+	private static View view = null;
 
 	/**
 	 * if google play services aren't available an error notification will be displayed
@@ -48,21 +50,31 @@ public class ThreatMapFragment extends Fragment {
 		MapFragment mapFragment = (MapFragment) getFragmentManager()
 				.findFragmentById(R.id.threatmapfragment);
 		map = mapFragment.getMap();
+
+		LatLng mapCenter = new LatLng(41.889, -87.622);
+		map.moveCamera(CameraUpdateFactory.newLatLngZoom(mapCenter, 13));
+		map.addCircle(new CircleOptions().center(mapCenter).radius(200.0).fillColor(Color.argb(127, 240, 80, 60)).strokeWidth(0.0f));
 	}
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 	                         Bundle savedInstanceState) {
-		//super.onCreateView(inflater, container, savedInstanceState);
-		View rootView = inflater.inflate(R.layout.fragment_threatmap, container, false);
+		super.onCreateView(inflater, container, savedInstanceState);
+		if (view != null) {
+			ViewGroup parent = (ViewGroup) view.getParent();
+			if (parent != null)
+				parent.removeView(view);
+		}
+		try {
+			view = inflater.inflate(R.layout.fragment_threatmap, container, false);
+		} catch (InflateException e) {
+        /* map is already there, just return view as it is */
+		}
+
 		if (isGooglePlay()) {
 			loadMapFragment();
 		}
-		if (map != null) {
-			LatLng mapCenter = new LatLng(41.889, -87.622);
-			map.moveCamera(CameraUpdateFactory.newLatLngZoom(mapCenter, 13));
-			map.addCircle(new CircleOptions().center(mapCenter).radius(200.0).fillColor(Color.argb(127, 240, 80, 60)).strokeWidth(0.0f));
-		}
-		return rootView;
+
+		return view;
 	}
 }