From 18f7612ee584e6f3023d230698ab0bf8866cd2ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 12 Nov 2013 20:36:26 +0100 Subject: In notification: s/hippo.bitmask.net/bitmask.net/ --- src/se/leap/openvpn/OpenVpnService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/se/leap/openvpn/OpenVpnService.java') diff --git a/src/se/leap/openvpn/OpenVpnService.java b/src/se/leap/openvpn/OpenVpnService.java index 620de204..5e5bf3d7 100644 --- a/src/se/leap/openvpn/OpenVpnService.java +++ b/src/se/leap/openvpn/OpenVpnService.java @@ -350,12 +350,13 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac bconfig[4] = getString(R.string.routes_info, joinString(mRoutes)); bconfig[5] = getString(R.string.routes_info6, joinString(mRoutesv6)); - String session = mProfile.mName; + String session = mProfile.mName.substring(mProfile.mName.indexOf(".")+1); + /* we don't want the IP address in the notification bar if(mLocalIP!=null && mLocalIPv6!=null) session = getString(R.string.session_ipv6string,session, mLocalIP, mLocalIPv6); else if (mLocalIP !=null) session= getString(R.string.session_ipv4string, session, mLocalIP); - + */ builder.setSession(session); -- cgit v1.2.3 From f9f69298e7d0b5e4258ea27095f50f9da7c6ff9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 21 Nov 2013 21:41:58 +0100 Subject: OpenVPN notification contains location. Instead of plain domain, we're printing a new variable stored in vpnprofile (parsed in ConfigParser): location. I'm substituing "__" by ", ", but I'm not uppercasing anything. We rely on the raw data from eip-service.json. --- src/se/leap/openvpn/OpenVpnService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/se/leap/openvpn/OpenVpnService.java') diff --git a/src/se/leap/openvpn/OpenVpnService.java b/src/se/leap/openvpn/OpenVpnService.java index 5e5bf3d7..1ef291df 100644 --- a/src/se/leap/openvpn/OpenVpnService.java +++ b/src/se/leap/openvpn/OpenVpnService.java @@ -350,7 +350,7 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac bconfig[4] = getString(R.string.routes_info, joinString(mRoutes)); bconfig[5] = getString(R.string.routes_info6, joinString(mRoutesv6)); - String session = mProfile.mName.substring(mProfile.mName.indexOf(".")+1); + String session = mProfile.mLocation; /* we don't want the IP address in the notification bar if(mLocalIP!=null && mLocalIPv6!=null) session = getString(R.string.session_ipv6string,session, mLocalIP, mLocalIPv6); -- cgit v1.2.3