diff options
| author | cyBerta <cyberta@riseup.net> | 2021-02-24 23:54:37 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2021-02-26 10:03:31 +0100 |
| commit | 23e3e37c4243edb30c793fb972bf5fc9aef84d5f (patch) | |
| tree | 83d0daaa73dd1998795298af5e6ad4149aead011 /app | |
| parent | 842380c10c0dc4976c6ad078953557e5031a85b5 (diff) | |
distinguish between openvpn state RECONNECTING and custom UI_CONNECTING flag
Diffstat (limited to 'app')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java | 6 | ||||
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java | 2 |
2 files changed, 2 insertions, 6 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 5d88d864..b99182ae 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 @@ -320,11 +320,7 @@ public class EipFragment extends Fragment implements Observer { } else { EipCommand.startVPN(context.getApplicationContext(), false); } - EipStatus.getInstance().updateState("RECONNECTING", "", 0, ConnectionStatus.LEVEL_START); - /* vpnStateImage.showProgress(); - routedText.setVisibility(GONE); - vpnRoute.setVisibility(GONE); - colorBackgroundALittle();*/ + EipStatus.getInstance().updateState("UI_CONNECTING", "", 0, ConnectionStatus.LEVEL_START); } protected void stopEipIfPossible() { diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java b/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java index ad84ec5a..bc123683 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java @@ -77,7 +77,7 @@ public class EipStatus extends Observable implements VpnStatus.StateListener { currentStatus.setLocalizedResId(localizedResId); currentStatus.setLevel(level); currentStatus.setEipLevel(level); - if (tmp != currentStatus.getLevel() || "RECONNECTING".equals(state)) { + if (tmp != currentStatus.getLevel() || "RECONNECTING".equals(state) || "UI_CONNECTING".equals(state)) { refresh(); } } |