-Bugfix: Limit to WiFi Internet (except ThreatMap)

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

@@ -106,7 +106,9 @@ public class ServicesListAdapter extends ArrayAdapter<ServicesListItem> {
                     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                         ServicesListItem item = (ServicesListItem) buttonView.getTag();
                         mProfile = ProfileManager.getInstance().getCurrentActivatedProfile();
-                        if (!HelperUtils.isNetworkAvailable(mActivity)) {
+                        //SK: Temp bugfix
+                        //if (!HelperUtils.isNetworkAvailable(mActivity)) {
+                        if (!HelperUtils.isWifiConnected(mActivity)) {
                             if(!MainActivity.getInstance().getHostageService().hasRunningListeners()) {
                                 new AlertDialog.Builder(mActivity)
                                         .setTitle(R.string.information)

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

@@ -247,7 +247,9 @@ public class HomeFragment extends TrackerFragment {
 		}
 
 		// if the device is connected to an network display the network name
-		if (HelperUtils.isNetworkAvailable(getActivity())) {
+        //SK: Temporary Bugfix
+		//if (HelperUtils.isNetworkAvailable(getActivity())) {
+        if (HelperUtils.isWifiConnected(getActivity())) {
 			setStateConnected();
 			String ssid = mConnectionInfo.getString(getString(R.string.connection_info_ssid), "\"\"");
 			mHomeTextName.setText(ssid.substring(1,ssid.length() - 1));
@@ -374,8 +376,13 @@ public class HomeFragment extends TrackerFragment {
 			mSwitchChangeListener = new CompoundButton.OnCheckedChangeListener() {
 				public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 					// displays a alert dialog if no network is available
-					if (!HelperUtils.isNetworkAvailable(getActivity())) {
-						new AlertDialog.Builder(getActivity()).setTitle(R.string.information).setMessage(R.string.network_not_connected_msg)
+
+                    //SK: Temporary bugfix to limit to wifi
+					//if (!HelperUtils.isNetworkAvailable(getActivity())) {
+                    if (!HelperUtils.isWifiConnected(getActivity())) {
+
+						//new AlertDialog.Builder(getActivity()).setTitle(R.string.information).setMessage(R.string.network_not_connected_msg)
+                        new AlertDialog.Builder(getActivity()).setTitle(R.string.information).setMessage(R.string.wifi_not_connected_msg)
 								.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
 									public void onClick(DialogInterface dialog, int which) {
 

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

@@ -85,7 +85,9 @@ public class ServicesFragment extends TrackerFragment {
      * in detail: the main switch and the textField mServicesTextName
      */
     public void updateUI() {
-        if (!HelperUtils.isNetworkAvailable(getActivity())) {
+        //SK: Temp bugfix
+        //if (!HelperUtils.isNetworkAvailable(getActivity())) {
+        if (!HelperUtils.isWifiConnected(getActivity())) {
             if(!MainActivity.getInstance().getHostageService().hasRunningListeners()) {
                 mServicesSwitchService.setOnCheckedChangeListener(null);
                 setStateNotConnected();
@@ -182,7 +184,9 @@ public class ServicesFragment extends TrackerFragment {
             switchChangeListener = new CompoundButton.OnCheckedChangeListener() {
                 public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                     mProfile = ProfileManager.getInstance().getCurrentActivatedProfile();
-                        if (!HelperUtils.isNetworkAvailable(getActivity())) {
+                    //SK: Temp bugfix
+                        //if (!HelperUtils.isNetworkAvailable(getActivity())) {
+                    if (!HelperUtils.isWifiConnected(getActivity())) {
                             if(!MainActivity.getInstance().getHostageService().hasRunningListeners()) {
                                 new AlertDialog.Builder(getActivity())
                                         .setTitle(R.string.information)