From be8b263f543530eb2142f362d0d7346f013c57c3 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Wed, 7 Aug 2013 00:05:02 +0200 Subject: Always pass context when retrieving vpn config, don't try JB+ extra on ICS (closes issue #188) --- src/de/blinkt/openvpn/core/OpenVpnService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/de/blinkt/openvpn/core/OpenVpnService.java') diff --git a/src/de/blinkt/openvpn/core/OpenVpnService.java b/src/de/blinkt/openvpn/core/OpenVpnService.java index 6aacf891..438f4286 100644 --- a/src/de/blinkt/openvpn/core/OpenVpnService.java +++ b/src/de/blinkt/openvpn/core/OpenVpnService.java @@ -140,7 +140,9 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac // Try to set the priority available since API 16 (Jellybean) - jbNotificationExtras(lowpriority, nbuilder); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) + jbNotificationExtras(lowpriority, nbuilder); + if(tickerText!=null && !tickerText.equals("")) nbuilder.setTicker(tickerText); @@ -298,7 +300,7 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac String nativelibdir = intent.getStringExtra(prefix + ".nativelib"); String profileUUID = intent.getStringExtra(prefix + ".profileUUID"); - mProfile = ProfileManager.get(profileUUID); + mProfile = ProfileManager.get(this,profileUUID); String startTitle = getString(R.string.start_vpn_title, mProfile.mName); String startTicker = getString(R.string.start_vpn_ticker, mProfile.mName); -- cgit v1.2.3