diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-06-27 20:12:32 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-06-27 20:12:32 +0200 |
| commit | 6057466bc8b4475bf4564b9143c60753c90f9aaa (patch) | |
| tree | d5b00e5e24781753dda142adec337c0a3826da4e /app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java | |
| parent | 482c378c2ff3a37a76ed5788cf4eaef30a63d517 (diff) | |
| parent | fccf31f212eeec368b84d86cfb3775c815fdaa2b (diff) | |
Merge branch 'develop'0.5.3
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java index 446ba1d9..299d89a4 100644 --- a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java @@ -221,7 +221,8 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe mEipStartPending = false; } else if ( level == ConnectionStatus.LEVEL_NONETWORK || level == ConnectionStatus.LEVEL_NOTCONNECTED || level == ConnectionStatus.LEVEL_AUTH_FAILED) { statusMessage = getString(R.string.eip_state_not_connected); - getActivity().findViewById(R.id.eipProgress).setVisibility(View.GONE); + if(getActivity() != null && getActivity().findViewById(R.id.eipProgress) != null) + getActivity().findViewById(R.id.eipProgress).setVisibility(View.GONE); mEipStartPending = false; switchState = false; } else if (level == ConnectionStatus.LEVEL_CONNECTING_SERVER_REPLIED) { |