diff options
author | fupduck <fupduck@riseup.net> | 2018-03-23 07:09:21 -0700 |
---|---|---|
committer | fupduck <fupduck@riseup.net> | 2018-03-23 07:09:21 -0700 |
commit | 434c1dd799b11770db148c405845c790b9e2e469 (patch) | |
tree | 971a737e6d0539bd06f36522672ae13cd313f7f6 /app/src/main/java/se/leap/bitmaskclient/EipFragment.java | |
parent | 5122945a6860caeb46359540ae2a1382f8aab415 (diff) | |
parent | 3b57bb6011135c793ca3d81c4034890c79064a54 (diff) |
Merge branch '#8876_eip_service' into 'master'
#8876 eip service
See merge request leap/bitmask_android!66
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 9fcdcac9..098418a9 100644 --- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java @@ -280,24 +280,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() { |