diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-17 12:41:19 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-17 12:41:19 +0100 |
| commit | d58b67f214bdd206cae28911073e450ec593f3dc (patch) | |
| tree | 69c09df37ca692d269a1ad8dba7692a76510b001 /app/src/main/java/se/leap/bitmaskclient/eip/EIP.java | |
| parent | dbd6f2c57e4565d4e7a76b4ae2a5520aa877f121 (diff) | |
| parent | 5d05a628fbd833860abfc85bb450186ec8dedf19 (diff) | |
Merge branch 'bug/Cancelling-failed-connection-leaves-network-blocked-#6446' into develop
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/eip/EIP.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/eip/EIP.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java index 7017e874..3d3070c8 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java @@ -149,7 +149,7 @@ public final class EIP extends IntentService { EipStatus eip_status = EipStatus.getInstance(); Log.d(TAG, "stopEip(): eip is connected? " + eip_status.isConnected()); int result_code = Activity.RESULT_CANCELED; - if(eip_status.isConnected()) + if(eip_status.isConnected() || eip_status.isConnecting()) result_code = Activity.RESULT_OK; tellToReceiver(ACTION_STOP_EIP, result_code); |