diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-03-29 01:42:39 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-03-29 01:42:39 +0100 |
| commit | 7a462e907e6813edf8f834b210fe4e8d715ea4b6 (patch) | |
| tree | 5ebc46f69cebc218192722b191afdc57072e4c72 /src | |
| parent | b9fbeace1b3dc36f7d005f971ed6267634764160 (diff) | |
| parent | f07435a05377710c6bb8572ea8c551e3ad858db5 (diff) | |
Merge branch 'bug/eip-switch-toggles-off-momentarily-while-starting-VPN-#3161' into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/se/leap/bitmaskclient/EipServiceFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/se/leap/bitmaskclient/EipServiceFragment.java b/src/se/leap/bitmaskclient/EipServiceFragment.java index 74755a5c..0534838d 100644 --- a/src/se/leap/bitmaskclient/EipServiceFragment.java +++ b/src/se/leap/bitmaskclient/EipServiceFragment.java @@ -179,7 +179,7 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe statusMessage = getString(R.string.eip_state_connected); getActivity().findViewById(R.id.eipProgress).setVisibility(View.GONE); mEipStartPending = false; - } else if ( (state.equals("NOPROCESS") && !mEipStartPending ) || state.equals("EXITING") || state.equals("FATAL")) { + } else if ( (state.equals("NOPROCESS") && !mEipStartPending ) || state.equals("EXITING") && !mEipStartPending || state.equals("FATAL")) { statusMessage = getString(R.string.eip_state_not_connected); getActivity().findViewById(R.id.eipProgress).setVisibility(View.GONE); mEipStartPending = false; |