Merge pull request #314 from yuhan6665/chrome-os

Add tags in AndroidManifest to support PlayStore filtering

README.md

@@ -3,4 +3,3 @@
 <a href="https://play.google.com/store/apps/details?id=com.v2ray.ang">
 <img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" width="165" height="64" />
 </a>
-

V2rayNG/app/build.gradle

@@ -91,6 +91,7 @@ dependencies {
     implementation "com.android.support:cardview-v7:$supportLibVersion"
     implementation "com.android.support:preference-v7:$supportLibVersion"
     implementation "com.android.support:recyclerview-v7:$supportLibVersion"
+    implementation "com.android.support:multidex:1.0.3"
     // DSL
     implementation "org.jetbrains.anko:anko-sdk15:$ankoVersion"
     implementation "org.jetbrains.anko:anko-support-v4:$ankoVersion"

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/AngApplication.kt

@@ -1,12 +1,12 @@
 package com.v2ray.ang
 
-import android.app.Application
 //import com.squareup.leakcanary.LeakCanary
+import android.support.multidex.MultiDexApplication
 import com.v2ray.ang.util.AngConfigManager
 import me.dozen.dpreference.DPreference
 import org.jetbrains.anko.defaultSharedPreferences
 
-class AngApplication : Application() {
+class AngApplication : MultiDexApplication() {
     companion object {
         const val PREF_LAST_VERSION = "pref_last_version"
     }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt

@@ -28,14 +28,9 @@ import libv2ray.Libv2ray
 import libv2ray.V2RayVPNServiceSupportsSet
 import rx.Observable
 import rx.Subscription
-import java.net.InetAddress
-import java.io.IOException
 import java.io.File
-import java.io.FileDescriptor
-import java.io.FileInputStream
 import java.lang.ref.SoftReference
 import android.os.Build
-import android.annotation.TargetApi
 import android.util.Log
 import go.Seq
 import org.jetbrains.anko.doAsync
@@ -74,16 +69,18 @@ class V2RayVpnService : VpnService() {
         *
         * Source: https://android.googlesource.com/platform/frameworks/base/+/2df4c7d/services/core/java/com/android/server/ConnectivityService.java#887
         */
-    @TargetApi(28)
-    private val defaultNetworkRequest = 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()
+    }
 
 
     private val connectivity by lazy { getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager }
-    @TargetApi(28)
-    private val defaultNetworkCallback = object : ConnectivityManager.NetworkCallback() {
+
+    private val defaultNetworkCallback by lazy @RequiresApi(Build.VERSION_CODES.P) {
+        object : ConnectivityManager.NetworkCallback() {
             override fun onAvailable(network: Network) {
                 setUnderlyingNetworks(arrayOf(network))
             }
@@ -95,6 +92,7 @@ class V2RayVpnService : VpnService() {
                 setUnderlyingNetworks(null)
             }
         }
+    }
     private var listeningForDefaultNetwork = false
 
     override fun onCreate() {
@@ -176,7 +174,7 @@ class V2RayVpnService : VpnService() {
         }
 
 
-        if (Build.VERSION.SDK_INT >= 28) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             connectivity.requestNetwork(defaultNetworkRequest, defaultNetworkCallback)
             listeningForDefaultNetwork = true
         }
@@ -260,7 +258,7 @@ class V2RayVpnService : VpnService() {
 //        val emptyInfo = VpnNetworkInfo()
 //        val info = loadVpnNetworkInfo(configName, emptyInfo)!! + (lastNetworkInfo ?: emptyInfo)
 //        saveVpnNetworkInfo(configName, info)
-        if (Build.VERSION.SDK_INT >= 28) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             if (listeningForDefaultNetwork) {
                 connectivity.unregisterNetworkCallback(defaultNetworkCallback)
                 listeningForDefaultNetwork = false

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/LogcatActivity.kt

@@ -1,6 +1,8 @@
 package com.v2ray.ang.ui
 
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.text.method.ScrollingMovementMethod
 import android.view.Menu
 import android.view.MenuItem
@@ -24,15 +26,22 @@ class LogcatActivity : BaseActivity() {
         title = getString(R.string.title_logcat)
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        logcat()
+        logcat(false)
     }
 
-    private fun logcat() {
+    private fun logcat(shouldFlushLog: Boolean) {
 
         try {
             pb_waiting.visibility = View.VISIBLE
 
             doAsync {
+                if (shouldFlushLog) {
+                    val lst = LinkedHashSet<String>()
+                    lst.add("logcat")
+                    lst.add("-c")
+                    val process = Runtime.getRuntime().exec(lst.toTypedArray())
+                    process.waitFor()
+                }
                 val lst = LinkedHashSet<String>()
                 lst.add("logcat")
                 lst.add("-d")
@@ -49,9 +58,11 @@ class LogcatActivity : BaseActivity() {
                     tv_logcat.text = allText
                     tv_logcat.movementMethod = ScrollingMovementMethod()
                     pb_waiting.visibility = View.GONE
+                    Handler(Looper.getMainLooper()).post { sv_logcat.fullScroll(View.FOCUS_DOWN) }
                 }
             }
         } catch (e: IOException) {
+            e.printStackTrace()
         }
     }
 
@@ -66,7 +77,10 @@ class LogcatActivity : BaseActivity() {
             toast(R.string.toast_success)
             true
         }
-
+        R.id.delete -> {
+            logcat(true)
+            true
+        }
         else -> super.onOptionsItemSelected(item)
     }
 }

V2rayNG/app/src/main/res/menu/menu_logcat.xml

@@ -6,4 +6,9 @@
         android:icon="@drawable/ic_copy_white"
         android:title="@string/logcat_copy"
         app:showAsAction="always" />
+    <item
+        android:id="@+id/delete"
+        android:icon="@drawable/ic_delete_white_24dp"
+        android:title="@string/logcat_delete"
+        app:showAsAction="ifRoom" />
 </menu>

V2rayNG/app/src/main/res/values-zh-rCN/strings.xml

@@ -135,6 +135,7 @@
 
     <string name="title_logcat">Logcat</string>
     <string name="logcat_copy">复制</string>
+    <string name="logcat_delete">删除</string>
     <string name="title_export_all">导出全部配置至剪贴板</string>
     <string name="title_sub_setting">订阅设置</string>
     <string name="sub_setting_remarks">备注</string>

V2rayNG/app/src/main/res/values-zh-rTW/strings.xml

@@ -137,6 +137,7 @@
 
     <string name="title_logcat">Logcat</string>
     <string name="logcat_copy">複製</string>
+    <string name="logcat_delete">刪除</string>
     <string name="title_export_all">匯出全部配置至剪貼簿</string>
     <string name="title_sub_setting">訂閱設定</string>
     <string name="sub_setting_remarks">備註</string>

V2rayNG/app/src/main/res/values/strings.xml

@@ -136,6 +136,7 @@
 
     <string name="title_logcat">Logcat</string>
     <string name="logcat_copy">Copy</string>
+    <string name="logcat_delete">Delete</string>
     <string name="title_export_all">Export all config to clipboard</string>
     <string name="title_sub_setting">Subscription setting</string>
     <string name="sub_setting_remarks">remarks</string>