summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2017-06-23 15:06:30 +0200
committerArne Schwabe <arne@rfc2549.org>2017-06-23 15:06:30 +0200
commit6279ef6e570d8b2cc561c55b18f109d71c15f8c5 (patch)
treee84d372964d75936cb090711c06617c62b2bef28 /main
parent016ffa320a620935f124f829a92de8a1b1e566cb (diff)
Fix lint errors
Diffstat (limited to 'main')
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java7
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java1
2 files changed, 5 insertions, 3 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
index 6dad252b..a4551bf9 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -236,9 +236,11 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
lpNotificationExtras(nbuilder);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ //noinspection NewApi
nbuilder.setChannelId(channel);
if (mProfile != null)
- nbuilder.setShortcutId(mProfile.getUUIDString());
+ //noinspection NewApi
+ nbuilder.setShortcutId(mProfile.getUUIDString());
}
@@ -695,8 +697,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
VpnStatus.logInfo(R.string.last_openvpn_tun_config);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && mProfile.mAllowLocalLAN) {
- //allowAllAFFamilies(builder);
- //Never allow other than IPv4 for PIA
+ allowAllAFFamilies(builder);
}
if (mLocalIP == null && mLocalIPv6 == null) {
diff --git a/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java b/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
index f15515f3..0759ce65 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
@@ -132,6 +132,7 @@ public class VPNLaunchHelper {
Intent startVPN = startprofile.prepareStartService(context);
if (startVPN != null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+ //noinspection NewApi
context.startForegroundService(startVPN);
else
context.startService(startVPN);