diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index a81b9241..2ecc925f 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -54,7 +54,7 @@
android:largeHeap="true">
sMarkerIDToSSID = new HashMap();
+ private HashMap sMarkerIDToSSID = new HashMap();
private LocationManager mLocationManager;
private String mLocationProvider;
+ private LayoutInflater inflater;
+
// needed for LIVE threat map
private boolean mReceiverRegistered = false;
private BroadcastReceiver mReceiver;
@@ -129,9 +129,6 @@ public void onReceive(Context context, Intent intent) {
*/
@Override
public void onInfoWindowClick(Marker marker) {
- //MainActivity.getInstance().displayView(MainActivity.MainMenuItem.RECORDS.getValue());
- //RecordOverviewFragment recordOverviewFragment = (RecordOverviewFragment)MainActivity.getInstance().getCurrentFragment();
- //if (recordOverviewFragment != null) {
String ssid = sMarkerIDToSSID.get(marker.getId());
ArrayList ssids = new ArrayList();
@@ -202,8 +199,6 @@ private class SSIDArea {
public static final float MAX_DISTANCE = 1000.0f; // 1km
public SSIDArea(LatLng initialLocation) {
- //mMinimum = new Point(360.0, 360.0);
- //mMaximum = new Point(-360.0, -360.0);
mMinimum = new Point(initialLocation.latitude, initialLocation.longitude);
mMaximum = new Point(initialLocation.latitude, initialLocation.longitude);
numPoints = 1;
@@ -317,7 +312,7 @@ private HashMap> doInBackground() {
for (RecordAll record : records) {
LatLng location = new LatLng(record.getLatitude(), record.getLongitude());
- //Log.i("hostage.location", "lat: " + hostage.location.latitude + " long: " + hostage.location.longitude);
+ Log.i("hostage.location ", "lat: " + record.getLatitude() + " long: " + record.getLongitude());
ArrayList areas;
if (threatAreas.containsKey(record.getSsid())) {
areas = threatAreas.get(record.getSsid());
@@ -348,7 +343,7 @@ public void run() {
}
});
- mLoader.start(); // run!
+ mLoader.start();
}
/**
@@ -373,7 +368,7 @@ public View onCreateView(final LayoutInflater inflater, ViewGroup container,
}
View rootView = inflater.inflate(R.layout.fragment_threatmap, container, false);
-
+ this.inflater =inflater;
if (rootView != null) {
ViewGroup parent = (ViewGroup) rootView.getParent();
@@ -384,7 +379,6 @@ public View onCreateView(final LayoutInflater inflater, ViewGroup container,
try {
if (isGooglePlay()) {
-
if(rootView !=null)
mapView = rootView
.findViewById(R.id.threatmapfragment);
@@ -400,7 +394,6 @@ public View onCreateView(final LayoutInflater inflater, ViewGroup container,
.setCancelable(false)
.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
- // :D-|< :D-/< :D-\<
}
});
AlertDialog alert = builder.create();
@@ -411,60 +404,8 @@ public void onClick(DialogInterface dialog, int id) {
e.printStackTrace();
}
- if (sMap != null) {
- sMap.setOnInfoWindowClickListener(this);
- // custom info window layout
- sMap.setInfoWindowAdapter(new GoogleMap.InfoWindowAdapter() {
- @Override
- public View getInfoWindow(Marker marker) {
- return null;
- }
-
- @Override
- public View getInfoContents(Marker marker) {
- View view = inflater.inflate(R.layout.fragment_threatmap_infowindow, null);
- if (view != null) {
- TextView titleTextView = view
- .findViewById(R.id.threatmap_infowindow_title);
- if (titleTextView != null) {
- titleTextView.setText(marker.getTitle());
- }
- }
- return view;
- }
- });
-
- mLocationManager = (LocationManager) activity.getSystemService(Context.LOCATION_SERVICE);
- Criteria criteria = new Criteria();
- criteria.setAccuracy(Criteria.ACCURACY_FINE);
- mLocationProvider = mLocationManager.getBestProvider(criteria, false);
-
- requestPermissionUpdates();
-
- sMap.setMyLocationEnabled(true);
-
- LatLng tudarmstadt = new LatLng(49.86923, 8.6632768); // default hostage.location
- sMap.moveCamera(CameraUpdateFactory.newLatLngZoom(tudarmstadt, 13));
-
- populateMap();
-
- registerBroadcastReceiver();
- }
-
// tell the user to enable wifi so map data can be streamed
- if (activity != null && !HelperUtils.isNetworkAvailable(activity)) {
- new AlertDialog.Builder(activity)
- .setTitle(R.string.information)
- .setMessage(R.string.no_network_connection_threatmap_msg)
- .setPositiveButton(android.R.string.ok,
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog,
- int which) {
- }
- }
- )
- .setIcon(android.R.drawable.ic_dialog_info).show();
- }
+ networkConnectionCheck();
return rootView;
}
@@ -483,9 +424,58 @@ private void requestPermissionUpdates(){
}
+ private void setInfoWindowAdapter(){
+ sMap.setInfoWindowAdapter(new GoogleMap.InfoWindowAdapter() {
+ @Override
+ public View getInfoWindow(Marker marker) {
+ return null;
+ }
+
+ @Override
+ public View getInfoContents(Marker marker) {
+ View view = inflater.inflate(R.layout.fragment_threatmap_infowindow, null);
+ if (view != null) {
+ TextView titleTextView = view
+ .findViewById(R.id.threatmap_infowindow_title);
+ if (titleTextView != null) {
+ titleTextView.setText(marker.getTitle());
+ }
+ }
+ return view;
+ }
+ });
+
+ locationChecker();
+
+ }
+
+
+ private void locationChecker(){
+ final AppCompatActivity activity = (AppCompatActivity) getActivity();
+
+ mLocationManager = (LocationManager) activity.getSystemService(Context.LOCATION_SERVICE);
+ Criteria criteria = new Criteria();
+ criteria.setAccuracy(Criteria.ACCURACY_FINE);
+ mLocationProvider = mLocationManager.getBestProvider(criteria, false);
+
+ requestPermissionUpdates();
+
+ sMap.setMyLocationEnabled(true);
+
+ LatLng tudarmstadt = new LatLng(49.86923, 8.6632768); // default hostage.location
+ sMap.moveCamera(CameraUpdateFactory.newLatLngZoom(tudarmstadt, 13));
+
+ populateMap();
+
+ registerBroadcastReceiver();
+ }
+
@Override
public void onMapReady(GoogleMap googleMap) {
sMap = googleMap;
+ sMap.getUiSettings().setZoomControlsEnabled(true);
+ sMap.setOnInfoWindowClickListener(this);
+ setInfoWindowAdapter();
}
@Override
@@ -508,13 +498,32 @@ public void onResume() {
}
}
+
+ private void networkConnectionCheck(){
+ final AppCompatActivity activity = (AppCompatActivity) getActivity();
+
+ if (activity != null && !HelperUtils.isNetworkAvailable(activity)) {
+ new AlertDialog.Builder(activity)
+ .setTitle(R.string.information)
+ .setMessage(R.string.no_network_connection_threatmap_msg)
+ .setPositiveButton(android.R.string.ok,
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog,
+ int which) {
+ }
+ }
+ )
+ .setIcon(android.R.drawable.ic_dialog_info).show();
+ }
+
+ }
+
/**
* Callback for requestPermission method. Creates an AlertDialog for the user in order to allow the permissions or not.
* @param requestCode
* @param permissions
* @param grantResults
*/
-
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
if (requestCode == 10) {