diff options
| author | Parménides GV <parmegv@sdf.org> | 2013-10-14 13:23:51 +0200 |
|---|---|---|
| committer | cyBerta <richy@cyborgsociety.org> | 2013-11-16 00:30:07 +0100 |
| commit | a904408946b058496e6c34e4987212ede32e469a (patch) | |
| tree | 714bf67c0e682afa4e44d391672aa9445f839b80 /src/se/leap/bitmaskclient/EipServiceFragment.java | |
| parent | df580ff4ca160bee13bb071e1db86c0a0945557e (diff) | |
Going back from providerdetails show all providers
I missed a notifyDataSetChanged.
Diffstat (limited to 'src/se/leap/bitmaskclient/EipServiceFragment.java')
| -rw-r--r-- | src/se/leap/bitmaskclient/EipServiceFragment.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/se/leap/bitmaskclient/EipServiceFragment.java b/src/se/leap/bitmaskclient/EipServiceFragment.java index 0d73f544..4d778b1a 100644 --- a/src/se/leap/bitmaskclient/EipServiceFragment.java +++ b/src/se/leap/bitmaskclient/EipServiceFragment.java @@ -178,11 +178,8 @@ 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")) { |