From d246e4e0b571874de0927cacf72fb193baabdca9 Mon Sep 17 00:00:00 2001 From: Sean Leonard Date: Tue, 4 Feb 2014 16:56:31 -0800 Subject: Deleted unused classes from ics-openvpn. This classes were an obvious choice, there may be more unused classes around there. Conflicts: src/se/leap/bitmaskclient/ProviderListFragment.java --- src/se/leap/bitmaskclient/Dashboard.java | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/se/leap/bitmaskclient') 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)){ -- cgit v1.2.3 From 53be6c97314d2a0c96be8b7c9a3c7e5ae493c901 Mon Sep 17 00:00:00 2001 From: Sean Leonard Date: Tue, 4 Feb 2014 17:56:49 -0800 Subject: Remove launch log function and click listener from EIP status line. Log window Activity is gone with ics-openvpn purge. We will want it back, but we will bring back only what's needed. --- src/se/leap/bitmaskclient/EipServiceFragment.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'src/se/leap/bitmaskclient') 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); @@ -106,21 +105,6 @@ public class EipServiceFragment extends Fragment implements StateListener, OnCli outState.putBoolean(IS_EIP_PENDING, mEipStartPending); } - @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){ -- cgit v1.2.3