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

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

@@ -45,6 +45,7 @@ public class ConnectionInfoDialogFragment extends DialogFragment {
 		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), AlertDialog.THEME_HOLO_DARK);
 		builder.setView(view);
 		builder.setTitle(R.string.title_connection_info);
+		builder.setIcon(android.R.drawable.ic_dialog_info);
 		builder.setPositiveButton(R.string.show_records, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {

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

@@ -125,7 +125,7 @@ public class ServicesFragment extends Fragment{
 		for(int i=0; i < protocols.length; i++){
 
 			protocolList.get(i).attacks = String.valueOf(dbh.numBssidSeen(protocolList.get(i).protocol, mConnectionInfo.getString(getString(R.string.connection_info_bssid), null)));
-			protocolList.get(i).initialValue = Integer.valueOf(protocolList.get(i).attacks);
+		//	protocolList.get(i).initialValue = Integer.valueOf(protocolList.get(i).attacks);
 		}
 
 		adapter = new ServicesListAdapter(getActivity().getBaseContext(), protocolList);
@@ -181,6 +181,23 @@ public class ServicesFragment extends Fragment{
 
 	};
 
+	@Override
+	public void onStart(){
+		super.onStart();
+		registerBroadcastReceiver();
+	}
+
+	@Override
+	public void onStop(){
+		super.onStop();
+		unregisterBroadcastReceiver();
+
+	}
+
+	private void unregisterBroadcastReceiver(){
+		LocalBroadcastManager.getInstance(getActivity()).unregisterReceiver(mReceiver);
+	}
+
 	private void setStateActive() {
 		mServicesSwitchService.setChecked(true);
 	}