From 72f1d170adbaa08ca846a0e4ec77556c9a7ffc7d Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 16 Dec 2013 20:02:54 +0100 Subject: remove 'Assigning IP address' from the progress notification (#4661) --- src/se/leap/bitmaskclient/EipServiceFragment.java | 5 ++++- src/se/leap/openvpn/OpenVpnService.java | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/se/leap/bitmaskclient/EipServiceFragment.java b/src/se/leap/bitmaskclient/EipServiceFragment.java index e182b3fd..b409394b 100644 --- a/src/se/leap/bitmaskclient/EipServiceFragment.java +++ b/src/se/leap/bitmaskclient/EipServiceFragment.java @@ -202,7 +202,10 @@ public class EipServiceFragment extends Fragment implements StateListener, OnCli switchState = false; } else if (state.equals("NOPROCESS")){ statusMessage = logmessage; - } else { + } else if (state.equals("ASSIGN_IP")){ //don't show assigning message in eipStatus + statusMessage = (String) eipStatus.getText(); + } + else { statusMessage = prefix + " " + logmessage; } diff --git a/src/se/leap/openvpn/OpenVpnService.java b/src/se/leap/openvpn/OpenVpnService.java index f5b932f2..b5c9c798 100644 --- a/src/se/leap/openvpn/OpenVpnService.java +++ b/src/se/leap/openvpn/OpenVpnService.java @@ -482,8 +482,7 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac if (("NOPROCESS".equals(state) ) || ("EXITING").equals(state)){ showNotification(state, getString(R.string.eip_state_not_connected), ticker, false, 0, persist); } - else if (state.equals("GET_CONFIG")){ - + else if (state.equals("GET_CONFIG") || state.equals("ASSIGN_IP")){ //don't show them in the notification message } else{ persist = true; -- cgit v1.2.3