Merge pull request #314 from yuhan6665/chrome-os

Add tags in AndroidManifest to support PlayStore filtering

V2rayNG/app/src/main/AndroidManifest.xml

@@ -2,6 +2,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.v2ray.ang">
 
+    <supports-screens
+            android:anyDensity="true"
+            android:smallScreens="true"
+            android:normalScreens="true"
+            android:largeScreens="true"
+            android:xlargeScreens="true"/>
+
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET" />

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 {
+    private val defaultNetworkRequest by lazy @RequiresApi(Build.VERSION_CODES.P) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+        NetworkRequest.Builder()
-            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 {
+    private val defaultNetworkCallback by lazy @RequiresApi(Build.VERSION_CODES.P) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+        object : ConnectivityManager.NetworkCallback() {
-            object : ConnectivityManager.NetworkCallback() {
+            override fun onAvailable(network: Network) {
-                override fun onAvailable(network: Network) {
+                setUnderlyingNetworks(arrayOf(network))
-                    setUnderlyingNetworks(arrayOf(network))
+            }
-                }
+            override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities?) {
-                override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities?) {
+                // it's a good idea to refresh capabilities
-                    // it's a good idea to refresh capabilities
+                setUnderlyingNetworks(arrayOf(network))
-                    setUnderlyingNetworks(arrayOf(network))
+            }
-                }
+            override fun onLost(network: Network) {
-                override fun onLost(network: Network) {
+                setUnderlyingNetworks(null)
-                    setUnderlyingNetworks(null)
-                }
             }
-        } else {
-            null
         }
     }
     private var listeningForDefaultNetwork = false