Skip to content

Commit 6e9dcd4

Browse files
committed
Make OpenVPN 3.x paused status a bit nicer
1 parent 017fa17 commit 6e9dcd4

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -311,17 +311,22 @@ public void log(ClientAPI_LogInfo arg0) {
311311
public void event(ClientAPI_Event event) {
312312
String name = event.getName();
313313
String info = event.getInfo();
314-
if (name.equals("INFO")) {
315-
if (info.startsWith("OPEN_URL:") || info.startsWith("CR_TEXT:")
316-
|| info.startsWith("WEB_AUTH:")) {
317-
mService.trigger_sso(info);
318-
} else {
319-
VpnStatus.logInfo(R.string.info_from_server, info);
314+
switch (name) {
315+
case "INFO" -> {
316+
if (info.startsWith("OPEN_URL:") || info.startsWith("CR_TEXT:")
317+
|| info.startsWith("WEB_AUTH:")) {
318+
mService.trigger_sso(info);
319+
} else {
320+
VpnStatus.logInfo(R.string.info_from_server, info);
321+
}
320322
}
321-
} else if (name.equals("COMPRESSION_ENABLED") || name.equals(("WARN"))) {
322-
VpnStatus.logInfo(String.format(Locale.US, "%s: %s", name, info));
323-
} else {
324-
VpnStatus.updateStateString(name, info);
323+
case "COMPRESSION_ENABLED", "WARN" ->
324+
VpnStatus.logInfo(String.format(Locale.US, "%s: %s", name, info));
325+
case "PAUSE" ->
326+
VpnStatus.updateStateString(name, "VPN connection paused", R.string.state_userpause, ConnectionStatus.LEVEL_VPNPAUSED);
327+
case "RESUME" ->
328+
VpnStatus.updateStateString(name, "VPN connection resumed", R.string.state_reconnecting, ConnectionStatus.LEVEL_CONNECTING_NO_SERVER_REPLY_YET);
329+
default -> VpnStatus.updateStateString(name, info);
325330
}
326331
/* if (event.name.equals("DYNAMIC_CHALLENGE")) {
327332
ClientAPI_DynamicChallenge challenge = new ClientAPI_DynamicChallenge();

0 commit comments

Comments
 (0)