adapt EIP main screen and strings to simply secure proposals

3 files changed, 42 insertions, 8 deletions

diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
index 9ed2054e..ae38a59b 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -377,6 +377,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
         // connections[n], n>0 gets choosen?
 
         Connection connection = mProfile.mConnections[0];
+        VpnStatus.setCurrentlyConnectingProfile(mProfile);
 
         VpnStatus.logInfo(R.string.building_configration);
         VpnStatus.updateStateString("VPN_GENERATE_CONFIG", "", R.string.building_configration, ConnectionStatus.LEVEL_START);
diff --git a/app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java b/app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
index 8007f7c5..a8fed675 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
@@ -48,6 +48,7 @@ public class VpnStatus {
     final static java.lang.Object readFileLock = new Object();
 
     private static VpnProfile lastConnectedProfile;
+    private static VpnProfile currentlyConnectingProfile;
 
     public static TrafficHistory trafficHistory;
 
@@ -170,6 +171,15 @@ public class VpnStatus {
     }
 
 
+    public static void setCurrentlyConnectingProfile(VpnProfile connectingProfile) {
+        currentlyConnectingProfile = connectingProfile;
+    }
+
+    public static String getCurrentlyConnectingVpnName() {
+        return currentlyConnectingProfile != null ? currentlyConnectingProfile.mName : null;
+    }
+
+
     public static String getLastConnectedVpnName() {
         return lastConnectedProfile != null ? lastConnectedProfile.mName : null;
     }
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 af34b7a5..e9402468 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
@@ -39,6 +39,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatTextView;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
@@ -50,6 +51,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
+import de.blinkt.openvpn.VpnProfile;
 import de.blinkt.openvpn.core.ConnectionStatus;
 import de.blinkt.openvpn.core.IOpenVPNServiceInternal;
 import de.blinkt.openvpn.core.OpenVPNService;
@@ -84,6 +86,7 @@ import static se.leap.bitmaskclient.base.models.Constants.REQUEST_CODE_LOG_IN;
 import static se.leap.bitmaskclient.base.models.Constants.REQUEST_CODE_SWITCH_PROVIDER;
 import static se.leap.bitmaskclient.base.models.Constants.SHARED_PREFERENCES;
 import static se.leap.bitmaskclient.base.utils.ConfigHelper.isDefaultBitmask;
+import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getPreferredCity;
 import static se.leap.bitmaskclient.base.utils.ViewHelper.convertDimensionToPx;
 import static se.leap.bitmaskclient.eip.EipSetupObserver.gatewayOrder;
 import static se.leap.bitmaskclient.eip.EipSetupObserver.reconnectingWithDifferentGateway;
@@ -109,6 +112,12 @@ public class EipFragment extends Fragment implements Observer {
     @BindView(R.id.gateway_location_button)
     LocationButton locationButton;
 
+    @BindView(R.id.main_description)
+    AppCompatTextView mainDescription;
+
+    @BindView(R.id.sub_description)
+    AppCompatTextView subDescription;
+
     private Unbinder unbinder;
     private EipStatus eipStatus;
 
@@ -408,21 +417,20 @@ public class EipFragment extends Fragment implements Observer {
             return;
         }
 
-        //Log.d(TAG, "eip fragment eipStatus state: " + eipStatus.getState() + " - level: " + eipStatus.getLevel() + " - is reconnecting: " + eipStatus.isReconnecting());
-
-
+        Log.d(TAG, "eip fragment eipStatus state: " + eipStatus.getState() + " - level: " + eipStatus.getLevel() + " - is reconnecting: " + eipStatus.isReconnecting());
         if (eipStatus.isConnecting() ) {
             setMainButtonEnabled(true);
             showConnectingLayout(activity);
             if (eipStatus.isReconnecting()) {
-                locationButton.setText(getString(R.string.reconnecting));
+                subDescription.setText(getString(R.string.reconnecting));
             } else {
-                locationButton.setText(getString(R.string.finding_best_connection));
+                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);
-        } else if (eipStatus.isConnected() ) {
-            locationButton.setText(activity.getString(R.string.vpn_button_turn_off));
+        } else if (eipStatus.isConnected()) {
             setMainButtonEnabled(true);
             vpnStateImage.setStateIcon(R.drawable.vpn_connected);
             vpnStateImage.stopProgress(false);
@@ -430,23 +438,34 @@ public class EipFragment extends Fragment implements Observer {
             locationButton.setText(VpnStatus.getLastConnectedVpnName());
             locationButton.setVisibility(VISIBLE);
             colorBackground();
+            mainDescription.setText(R.string.eip_state_connected);
+            subDescription.setText(getPreferredCity(getContext()) == null ?
+                    R.string.eip_state_connected_recommended :
+                    R.string.eip_state_connected_manual);
         } else if(isOpenVpnRunningWithoutNetwork()){
-            locationButton.setText(activity.getString(R.string.vpn_button_turn_off));
+            Log.d(TAG, "eip fragment eipStatus - isOpenVpnRunningWithoutNetwork");
             setMainButtonEnabled(true);
             vpnStateImage.setStateIcon(R.drawable.vpn_disconnected);
             vpnStateImage.stopProgress(false);
             locationButton.setVisibility(VISIBLE);
+            locationButton.setText(VpnStatus.getCurrentlyConnectingVpnName());
             setVpnRouteText();
             colorBackgroundALittle();
+            mainDescription.setText(R.string.eip_state_insecure);
+            subDescription.setText(R.string.eip_state_no_network);
         } else if (eipStatus.isDisconnected() && reconnectingWithDifferentGateway()) {
             showConnectingLayout(activity);
             // showRetryToast(activity);
             locationButton.setText(getString(R.string.finding_best_connection));
             locationButton.setVisibility(VISIBLE);
             locationButton.setLocationLoad(UNKNOWN);
+            mainDescription.setText(R.string.eip_state_insecure);
+            subDescription.setText(R.string.reconnecting);
         } else if (eipStatus.isDisconnecting()) {
             setMainButtonEnabled(false);
             showDisconnectingLayout(activity);
+            mainDescription.setText(R.string.eip_state_insecure);
+            subDescription.setText(R.string.connection_not_connected);
         } else if (eipStatus.isBlocking()) {
             setMainButtonEnabled(true);
             vpnStateImage.setStateIcon(R.drawable.vpn_blocking);
@@ -455,6 +474,8 @@ public class EipFragment extends Fragment implements Observer {
             locationButton.setText(getString(R.string.finding_best_connection));
             locationButton.setVisibility(VISIBLE);
             locationButton.setLocationLoad(UNKNOWN);
+            mainDescription.setText(R.string.eip_state_connected);
+            subDescription.setText(R.string.eip_state_blocking);
         } else {
             locationButton.setText(activity.getString(R.string.vpn_button_turn_on));
             setMainButtonEnabled(true);
@@ -463,6 +484,8 @@ public class EipFragment extends Fragment implements Observer {
             greyscaleBackground();
             locationButton.setLocationLoad(UNKNOWN);
             locationButton.setVisibility(GONE);
+            mainDescription.setText(R.string.eip_state_insecure);
+            subDescription.setText(R.string.connection_not_connected);
         }
     }