diff options
author | cyberta <cyberta@riseup.net> | 2017-09-18 11:01:48 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2017-09-18 11:01:48 +0000 |
commit | 64e961fe8ebc1eeb331cef2604cf4c8714e8d8ad (patch) | |
tree | 2f44dc405415cbf03f81eff0c0967f29abec7c7e /app/src/main/java/se/leap/bitmaskclient/VpnFragment.java | |
parent | 14dc607adeaae623e643b1045ed1917d289a19c4 (diff) | |
parent | afa289cbcce4a431f6bd587b490b6470ed6caa50 (diff) |
Merge branch 'develop' into 'master'
Fixes failing tests
See merge request !5
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/VpnFragment.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/VpnFragment.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java b/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java index 9210c6ec..6ffeacc1 100644 --- a/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java @@ -49,6 +49,7 @@ public class VpnFragment extends Fragment implements Observer { private static EipStatus eip_status; private boolean wants_to_connect; + //FIXME: replace with onAttach(Context context) public void onAttach(Activity activity) { super.onAttach(activity); @@ -254,12 +255,15 @@ public class VpnFragment extends Fragment implements Observer { if(eip_status.isConnecting()) { vpn_status_image.showProgress(true); vpn_status_image.setIcon(R.drawable.ic_stat_vpn_empty_halo, R.drawable.ic_stat_vpn_empty_halo); + vpn_status_image.setTag(R.drawable.ic_stat_vpn_empty_halo); } else { vpn_status_image.showProgress(false); vpn_status_image.setIcon(R.drawable.ic_stat_vpn, R.drawable.ic_stat_vpn); + vpn_status_image.setTag(R.drawable.ic_stat_vpn); } } else { vpn_status_image.setIcon(R.drawable.ic_stat_vpn_offline, R.drawable.ic_stat_vpn_offline); + vpn_status_image.setTag(R.drawable.ic_stat_vpn_offline); vpn_status_image.showProgress(false); } } |