diff options
author | cyBerta <cyberta@riseup.net> | 2018-03-08 01:42:01 +0100 |
---|---|---|
committer | cyBerta <cyberta@riseup.net> | 2018-03-08 01:42:01 +0100 |
commit | 203043429b2c9c2f60dbf5a66177c0b80830d5eb (patch) | |
tree | 66a58be8550bd0dc60003cad0c43f76e5344ac49 /app/src/main/java/se/leap/bitmaskclient/EipFragment.java | |
parent | 6f9c56bce97759e30892f0a0660dc236b6d1228e (diff) |
#8876 introduce blocking OpenvpnServiceConnection for EIP and cancel connections more rigid
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/EipFragment.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/EipFragment.java | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java index 34120859..797452d9 100644 --- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java @@ -281,24 +281,11 @@ public class EipFragment extends Fragment implements Observer { protected void stopEipIfPossible() { Context context = getContext(); - if (context != null) { - if (isOpenVpnRunningWithoutNetwork()) { - // TODO move to EIP - // TODO see stopEIP function - Bundle resultData = new Bundle(); - resultData.putString(EIP_REQUEST, EIP_ACTION_STOP); - Intent intentUpdate = new Intent(BROADCAST_EIP_EVENT); - intentUpdate.addCategory(Intent.CATEGORY_DEFAULT); - intentUpdate.putExtra(BROADCAST_RESULT_CODE, Activity.RESULT_OK); - intentUpdate.putExtra(BROADCAST_RESULT_KEY, resultData); - Log.d(TAG, "sending broadcast"); - LocalBroadcastManager.getInstance(getActivity()).sendBroadcast(intentUpdate); - } else { - EipCommand.stopVPN(getContext()); - } - } else { + if (context == null) { Log.e(TAG, "context is null when trying to stop EIP"); + return; } + EipCommand.stopVPN(context); } private void askPendingStartCancellation() { |