summaryrefslogtreecommitdiff
path: root/src/se/leap/openvpn
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-12-19 21:11:22 +0100
committerParménides GV <parmegv@sdf.org>2013-12-19 21:11:22 +0100
commit3f5d756fa1a37dba00c400ca2a6197af5af1071e (patch)
tree3abe8236fe9789b0aebcf50b4cf3c7ebfe0605e1 /src/se/leap/openvpn
parent0669d0bb7c3c50d5ed042564fb3218bdb8237b19 (diff)
parent4d9b896481594297421a157a5906b5a8ead48ab6 (diff)
Merge branch 'feature/UI_improvements' into develop
Diffstat (limited to 'src/se/leap/openvpn')
-rw-r--r--src/se/leap/openvpn/OpenVpnService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/se/leap/openvpn/OpenVpnService.java b/src/se/leap/openvpn/OpenVpnService.java
index 69dd56f4..b5c9c798 100644
--- a/src/se/leap/openvpn/OpenVpnService.java
+++ b/src/se/leap/openvpn/OpenVpnService.java
@@ -114,7 +114,7 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
android.app.Notification.Builder nbuilder = new Notification.Builder(this);
- nbuilder.setContentTitle(getString(R.string.notifcation_title,mProfile.mName));
+ nbuilder.setContentTitle(getString(R.string.notifcation_title,mProfile.mLocation));
nbuilder.setContentText(msg);
nbuilder.setOnlyAlertOnce(true);
nbuilder.setOngoing(persistant);
@@ -482,6 +482,8 @@ 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") || state.equals("ASSIGN_IP")){ //don't show them in the notification message
+ }
else{
persist = true;
showNotification(state, getString(resid) +" " + logmessage,ticker,false,0,persist);