diff options
| author | cyBerta <richy@cyborgsociety.org> | 2013-12-20 18:37:13 +0100 |
|---|---|---|
| committer | cyBerta <richy@cyborgsociety.org> | 2013-12-20 18:37:13 +0100 |
| commit | 8bc035e5785b8a14c26cdb6ab409242b66554992 (patch) | |
| tree | 3abe8236fe9789b0aebcf50b4cf3c7ebfe0605e1 /src/se/leap/openvpn/OpenVpnService.java | |
| parent | a651099981ddc9ed5c17a25b2bb618b161cec048 (diff) | |
| parent | 3f5d756fa1a37dba00c400ca2a6197af5af1071e (diff) | |
Merge branch 'develop' of ssh://leap.se:22/bitmask_android into develop
Diffstat (limited to 'src/se/leap/openvpn/OpenVpnService.java')
| -rw-r--r-- | src/se/leap/openvpn/OpenVpnService.java | 4 |
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); |