diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-17 12:41:53 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-17 12:41:53 +0100 |
| commit | 0cc14918f54619fd39ef4297ddb9564ba981772a (patch) | |
| tree | 40cb2d14f67cf22a2b4a516403c02248cd5c0a66 /app/src/main/java/se/leap/bitmaskclient/eip/EIP.java | |
| parent | 2571d03aca9f240017dd1f00e0963abc13b35890 (diff) | |
| parent | d58b67f214bdd206cae28911073e450ec593f3dc (diff) | |
Merge branch 'develop' into release-0.8.1
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); |