summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2022-12-09 13:19:06 +0000
committercyberta <cyberta@riseup.net>2022-12-09 13:19:06 +0000
commitd6fb801094ccebfc542c3c527ec6e6245bb543c5 (patch)
treef84397b9e29192c33ef9baf7d83219eaeb9e4f4f /app/src
parent776e29cfd2005d61baa18f4a9fc63991aba62b96 (diff)
parent336b7cf2be7baa2d064c2d04acbd855f63da899f (diff)
Merge branch 'fix_blocking_state' into 'master'
show connecting state background when vpn is actually blocking for now See merge request leap/bitmask_android!225
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
index a5ccb81d..02feafd3 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
@@ -547,16 +547,16 @@ public class EipFragment extends Fragment implements Observer {
setActivityBarColor(R.color.bg_disconnected_top, R.color.bg_disconnected_top_light_transparent);
} else if (eipStatus.isBlocking()) {
setMainButtonEnabled(true);
- mainButton.updateState(true, false, true);
+ mainButton.updateState(false, true, true);
locationButton.setText(R.string.no_location);
locationButton.setLocationLoad(UNKNOWN);
locationButton.showBridgeIndicator(false);
locationButton.showRecommendedIndicator(false);
mainDescription.setText(R.string.eip_state_connected);
subDescription.setText(getString(R.string.eip_state_blocking, getString(R.string.app_name)));
- background.setImageResource(R.drawable.bg_disconnected);
- animateState(R.drawable.state_disconnected);
- setActivityBarColor(R.color.bg_disconnected_top, R.color.bg_disconnected_top_light_transparent);
+ background.setImageResource(R.drawable.bg_connecting);
+ animateState(R.drawable.state_connecting);
+ setActivityBarColor(R.color.bg_connecting_top, R.color.bg_connecting_top_light_transparent);
} else {
locationButton.setText(R.string.vpn_button_turn_on);
setMainButtonEnabled(true);