From d9c8729bfdead18aa695ceddac3a12efe6c8b568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Mon, 7 Oct 2013 16:15:50 +0200 Subject: 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. --- src/se/leap/bitmaskclient/EipServiceFragment.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/se/leap/bitmaskclient/EipServiceFragment.java') 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); -- cgit v1.2.3