From 90ba9ef2b70b6876569431d9b59c3e3ee1b3bb29 Mon Sep 17 00:00:00 2001
From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com>
Date: Sat, 14 Mar 2020 13:03:51 -0400
Subject: [PATCH] Use annotation to fix lint error

---
 .../com/v2ray/ang/service/V2RayVpnService.kt  | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt
index 89c1766c..3e36ff28 100644
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt
@@ -69,36 +69,28 @@ class V2RayVpnService : VpnService() {
         *
         * Source: https://android.googlesource.com/platform/frameworks/base/+/2df4c7d/services/core/java/com/android/server/ConnectivityService.java#887
         */
-    private val defaultNetworkRequest by lazy {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            NetworkRequest.Builder()
+    private val defaultNetworkRequest by lazy @RequiresApi(Build.VERSION_CODES.P) {
+        NetworkRequest.Builder()
                 .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
                 .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
                 .build()
-        } else {
-            null
-        }
     }
 
 
     private val connectivity by lazy { getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager }
 
-    private val defaultNetworkCallback by lazy {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            object : ConnectivityManager.NetworkCallback() {
-                override fun onAvailable(network: Network) {
-                    setUnderlyingNetworks(arrayOf(network))
-                }
-                override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities?) {
-                    // it's a good idea to refresh capabilities
-                    setUnderlyingNetworks(arrayOf(network))
-                }
-                override fun onLost(network: Network) {
-                    setUnderlyingNetworks(null)
-                }
+    private val defaultNetworkCallback by lazy @RequiresApi(Build.VERSION_CODES.P) {
+        object : ConnectivityManager.NetworkCallback() {
+            override fun onAvailable(network: Network) {
+                setUnderlyingNetworks(arrayOf(network))
+            }
+            override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities?) {
+                // it's a good idea to refresh capabilities
+                setUnderlyingNetworks(arrayOf(network))
+            }
+            override fun onLost(network: Network) {
+                setUnderlyingNetworks(null)
             }
-        } else {
-            null
         }
     }
     private var listeningForDefaultNetwork = false