Merge branch 'feature/remove-legacy-ics-openvpn-classes-that-wont-be-used' into develop

Also merge branch 'feature/change-or-remove-user-facing-references-to-ics-android' into develop

2 files changed, 1 insertions, 22 deletions

diff --git a/src/se/leap/bitmaskclient/Dashboard.java b/src/se/leap/bitmaskclient/Dashboard.java
index 44cf8247..3fddfed5 100644
--- a/src/se/leap/bitmaskclient/Dashboard.java
+++ b/src/se/leap/bitmaskclient/Dashboard.java
@@ -21,7 +21,6 @@ import org.json.JSONObject;
 
 import se.leap.bitmaskclient.R;
 import se.leap.bitmaskclient.ProviderAPIResultReceiver.Receiver;
-import se.leap.openvpn.MainActivity;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.DialogFragment;
@@ -213,10 +212,6 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 			intent = new Intent(this, AboutActivity.class);
 			startActivity(intent);
 			return true;
-		case R.id.legacy_interface:
-			intent = new Intent(this,MainActivity.class);
-			startActivity(intent);
-			return true;
 		case R.id.switch_provider:
 			if (Provider.getInstance().hasEIP()){
 				if (ConfigHelper.getBoolFromSharedPref(EIP.AUTHED_EIP)){
diff --git a/src/se/leap/bitmaskclient/EipServiceFragment.java b/src/se/leap/bitmaskclient/EipServiceFragment.java
index b409394b..74755a5c 100644
--- a/src/se/leap/bitmaskclient/EipServiceFragment.java
+++ b/src/se/leap/bitmaskclient/EipServiceFragment.java
@@ -24,7 +24,7 @@ import android.widget.RelativeLayout;
 import android.widget.Switch;
 import android.widget.TextView;
 
-public class EipServiceFragment extends Fragment implements StateListener, OnClickListener, OnCheckedChangeListener {
+public class EipServiceFragment extends Fragment implements StateListener, OnCheckedChangeListener {
 	
 	private static final String IS_EIP_PENDING = "is_eip_pending";
 	
@@ -58,7 +58,6 @@ public class EipServiceFragment extends Fragment implements StateListener, OnCli
 			eipFragment.findViewById(R.id.eipProgress).setVisibility(View.VISIBLE);
 		
 		eipStatus = (TextView) eipFragment.findViewById(R.id.eipStatus);
-		eipStatus.setOnClickListener(this);
 
 		eipSwitch = (Switch) eipFragment.findViewById(R.id.eipSwitch);
 
@@ -107,21 +106,6 @@ public class EipServiceFragment extends Fragment implements StateListener, OnCli
 	}
 	
 	@Override
-	public void onClick(View buttonView) {
-		if (buttonView.equals(eipStatus))
-			showEIPLog();
-	}
-	
-	/**
-	 * Launches the se.leap.openvpn.LogWindow Activity showing detailed OpenVPN log
-	 */
-	public void showEIPLog(){
-		Intent intent = new Intent(getActivity().getBaseContext(),LogWindow.class);
-		intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-		startActivity(intent);
-	}
-	
-	@Override
 	public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 		if (buttonView.equals(eipSwitch) && !eipAutoSwitched){
 			if (isChecked){