diff options
| author | Parménides GV <parmegv@sdf.org> | 2013-10-07 16:15:50 +0200 |
|---|---|---|
| committer | cyBerta <richy@cyborgsociety.org> | 2013-11-15 23:53:51 +0100 |
| commit | d9c8729bfdead18aa695ceddac3a12efe6c8b568 (patch) | |
| tree | 2d498408730d65b8b943f2133459a709bfd177e7 /src/se/leap/bitmaskclient/EipServiceFragment.java | |
| parent | 76d52773a237da8fcae3670a959bbe2bfe609796 (diff) | |
Dashboard asks for real VPN state.
Right now, the answer is always "disconnected", I think it's a problem in EIP.isRunning().
I've also added some new strings, trying to minimize the number of them scattered through litterals around the code.
Diffstat (limited to 'src/se/leap/bitmaskclient/EipServiceFragment.java')
| -rw-r--r-- | src/se/leap/bitmaskclient/EipServiceFragment.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/se/leap/bitmaskclient/EipServiceFragment.java b/src/se/leap/bitmaskclient/EipServiceFragment.java index 1b2cfb20..0d73f544 100644 --- a/src/se/leap/bitmaskclient/EipServiceFragment.java +++ b/src/se/leap/bitmaskclient/EipServiceFragment.java @@ -178,11 +178,17 @@ public class EipServiceFragment extends Fragment implements StateListener, OnCli String statusMessage = ""; String prefix = getString(localizedResId); if (state.equals("CONNECTED")){ +<<<<<<< HEAD statusMessage = getString(R.string.eip_state_connected); +======= + statusMessage = getResources().getString(R.string.connection_secure); +>>>>>>> Dashboard asks for real VPN state. getActivity().findViewById(R.id.eipProgress).setVisibility(View.GONE); mEipStartPending = false; } else if (state.equals("BYTECOUNT")) { - statusMessage = logmessage; + 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")) { statusMessage = getString(R.string.eip_state_not_connected); getActivity().findViewById(R.id.eipProgress).setVisibility(View.GONE); |