1 files changed, 14 insertions, 19 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 11cab7e5..f8053f5e 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
@@ -417,62 +417,56 @@ public class EipFragment extends Fragment implements Observer {
         if (eipStatus.isConnecting() ) {
             setMainButtonEnabled(true);
             showConnectionTransitionLayout(true);
-            if (eipStatus.isReconnecting()) {
-                subDescription.setText(getString(R.string.reconnecting));
-            } else {
-                subDescription.setText(R.string.connection_not_connected);
-            }
             locationButton.setText(getString(R.string.finding_best_connection));
-            mainDescription.setText(R.string.eip_state_insecure);
-            locationButton.setVisibility(VISIBLE);
             locationButton.setLocationLoad(UNKNOWN);
             locationButton.showBridgeIndicator(false);
+            locationButton.showRecommendedIndicator(false);
+            mainDescription.setText(R.string.eip_state_insecure);
+            subDescription.setText(null);
         } else if (eipStatus.isConnected()) {
             setMainButtonEnabled(true);
             mainButton.updateState(true, false, false);
             locationButton.setLocationLoad(gatewaysManager.getLoadForLocation(VpnStatus.getLastConnectedVpnName()));
             locationButton.setText(VpnStatus.getLastConnectedVpnName());
             locationButton.showBridgeIndicator(VpnStatus.isUsingBridges());
-            locationButton.setVisibility(VISIBLE);
-            colorBackground();
+            locationButton.showRecommendedIndicator(getPreferredCity(getContext())== null);
             mainDescription.setText(R.string.eip_state_connected);
-            subDescription.setText(getPreferredCity(getContext()) == null ?
-                    R.string.eip_state_connected_recommended :
-                    R.string.eip_state_connected_manual);
+            subDescription.setText(null);
+            colorBackground();
         } else if(isOpenVpnRunningWithoutNetwork()){
             Log.d(TAG, "eip fragment eipStatus - isOpenVpnRunningWithoutNetwork");
             setMainButtonEnabled(true);
             mainButton.updateState(true, false, true);
-            locationButton.setVisibility(VISIBLE);
             locationButton.setText(VpnStatus.getCurrentlyConnectingVpnName());
             locationButton.showBridgeIndicator(VpnStatus.isUsingBridges());
+            locationButton.showBridgeIndicator(VpnStatus.isUsingBridges());
+            locationButton.showRecommendedIndicator(getPreferredCity(getContext())== null);
             colorBackgroundALittle();
-            mainDescription.setText(R.string.eip_state_insecure);
+            mainDescription.setText(R.string.eip_state_connected);
             subDescription.setText(R.string.eip_state_no_network);
         } else if (eipStatus.isDisconnected() && reconnectingWithDifferentGateway()) {
             showConnectionTransitionLayout(true);
             // showRetryToast(activity);
             locationButton.setText(getString(R.string.finding_best_connection));
-            locationButton.setVisibility(VISIBLE);
             locationButton.setLocationLoad(UNKNOWN);
             locationButton.showBridgeIndicator(false);
+            locationButton.showRecommendedIndicator(false);
             mainDescription.setText(R.string.eip_state_insecure);
             subDescription.setText(R.string.reconnecting);
         } else if (eipStatus.isDisconnecting()) {
             setMainButtonEnabled(false);
             showConnectionTransitionLayout(false);
             mainDescription.setText(R.string.eip_state_insecure);
-            subDescription.setText(R.string.connection_not_connected);
         } else if (eipStatus.isBlocking()) {
             setMainButtonEnabled(true);
             mainButton.updateState(true, false, true);
             colorBackgroundALittle();
             locationButton.setText(getString(R.string.finding_best_connection));
-            locationButton.setVisibility(VISIBLE);
             locationButton.setLocationLoad(UNKNOWN);
             locationButton.showBridgeIndicator(false);
+            locationButton.showRecommendedIndicator(false);
             mainDescription.setText(R.string.eip_state_connected);
-            subDescription.setText(R.string.eip_state_blocking);
+            subDescription.setText(getString(R.string.eip_state_blocking, getString(R.string.app_name)));
         } else {
             locationButton.setText(activity.getString(R.string.vpn_button_turn_on));
             setMainButtonEnabled(true);
@@ -480,7 +474,8 @@ public class EipFragment extends Fragment implements Observer {
             greyscaleBackground();
             locationButton.setLocationLoad(UNKNOWN);
             locationButton.showBridgeIndicator(false);
-            locationButton.setVisibility(INVISIBLE);
+            locationButton.setText(getString(R.string.gateway_selection_title));
+            locationButton.showRecommendedIndicator(false);
             mainDescription.setText(R.string.eip_state_insecure);
             subDescription.setText(R.string.connection_not_connected);
         }