Merge branch 'UI_tweaks' into 'master'

Ui tweaks

See merge request leap/bitmask_android!90

1 files changed, 4 insertions, 0 deletions

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 d52ebac1..fa28a875 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
@@ -20,6 +20,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 import se.leap.bitmaskclient.R;
 
+import static se.leap.bitmaskclient.utils.ConfigHelper.getProviderFormattedString;
+
 public class VpnStatus {
 
 
@@ -103,6 +105,8 @@ public class VpnStatus {
 
         if (mLastStateresid == R.string.state_waitconnectretry) {
             return c.getString(R.string.state_waitconnectretry, mLaststatemsg);
+        } else if (mLastStateresid == R.string.void_vpn_establish) {
+            return getProviderFormattedString(c.getResources(), R.string.void_vpn_establish);
         }
 
         String prefix = c.getString(mLastStateresid);