Update AngConfigManager.kt

Bypass private IP at VPN service

AndroidLibV2rayLite/VPN/vpnservice_support.go

@@ -24,6 +24,7 @@ type resolved struct {
 	domain       string
 	IPs          []net.IP
 	Port         int
+	lastResolved time.Time
 	ipIdx        uint8
 	ipLock       sync.Mutex
 	lastSwitched time.Time
@@ -97,7 +98,7 @@ func (d *ProtectedDialer) PrepareResolveChan() {
 	d.resolveChan = make(chan struct{})
 }
 
-func (d *ProtectedDialer) ResolveChan() <-chan struct{} {
+func (d *ProtectedDialer) ResolveChan() chan struct{} {
 	return d.resolveChan
 }
 
@@ -137,9 +138,10 @@ func (d *ProtectedDialer) lookupAddr(addr string) (*resolved, error) {
 	}
 
 	rs := &resolved{
-		domain: host,
+		domain:       host,
-		IPs:    IPs,
+		IPs:          IPs,
-		Port:   portnum,
+		Port:         portnum,
+		lastResolved: time.Now(),
 	}
 
 	return rs, nil
@@ -150,7 +152,6 @@ func (d *ProtectedDialer) PrepareDomain(domainName string, closeCh <-chan struct
 	log.Printf("Preparing Domain: %s", domainName)
 	d.currentServer = domainName
 
-	defer close(d.resolveChan)
 	maxRetry := 10
 	for {
 		if maxRetry == 0 {
@@ -212,6 +213,10 @@ func (d *ProtectedDialer) Dial(ctx context.Context,
 			}
 		}
 
+		if time.Now().Sub(d.vServer.lastResolved) > time.Minute * 30 {
+			d.PrepareDomain(Address, nil)
+		}
+
 		fd, err := d.getFd(dest.Network)
 		if err != nil {
 			return nil, err

AndroidLibV2rayLite/interact.go

@@ -71,7 +71,10 @@ func (v *V2RayPoint) RunLoop() (err error) {
 	if !v.status.IsRunning {
 		v.closeChan = make(chan struct{})
 		v.dialer.PrepareResolveChan()
-		go v.dialer.PrepareDomain(v.DomainName, v.closeChan)
+		go func() {
+		    v.dialer.PrepareDomain(v.DomainName, v.closeChan)
+		    close(v.dialer.ResolveChan())
+		}()
 		go func() {
 			select {
 			// wait until resolved
@@ -116,7 +119,7 @@ func (v V2RayPoint) QueryStats(tag string, direct string) int64 {
 	if v.statsManager == nil {
 		return 0
 	}
-	counter := v.statsManager.GetCounter(fmt.Sprintf("inbound>>>%s>>>traffic>>>%s", tag, direct))
+	counter := v.statsManager.GetCounter(fmt.Sprintf("outbound>>>%s>>>traffic>>>%s", tag, direct))
 	if counter == nil {
 		return 0
 	}

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

@@ -84,6 +84,10 @@ dependencies {
     implementation project(':dpreference')
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.2" // 1.3.x has compile error:
+    // More than one file was found with OS independent path 'META-INF/proguard/coroutines.pro'
+
     // Android support library
     implementation "com.android.support:support-v4:$supportLibVersion"
     implementation "com.android.support:appcompat-v7:$supportLibVersion"
@@ -91,6 +95,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" />
@@ -83,16 +93,16 @@
                 android:value="true" />
         </service>
 
-        <!--<receiver android:name=".receiver.WidgetProvider">-->
+        <receiver android:name=".receiver.WidgetProvider"
-        <!--<meta-data-->
+                android:process=":RunSoLibV2RayDaemon">
-        <!--android:name="android.appwidget.provider"-->
+            <meta-data
-        <!--android:resource="@xml/app_widget_provider" />-->
+                    android:name="android.appwidget.provider"
-
+                    android:resource="@xml/app_widget_provider" />
-        <!--<intent-filter>-->
+            <intent-filter>
-        <!--<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />-->
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-        <!--<action android:name="com.v2ray.ang.action.widget.click" />-->
+                <action android:name="com.v2ray.ang.action.widget.click" />
-        <!--</intent-filter>-->
+            </intent-filter>
-        <!--</receiver>-->
+        </receiver>
 
         <service
             android:name=".service.QSTileService"

V2rayNG/app/src/main/assets/v2ray_config.json

@@ -13,8 +13,8 @@
         }
       },
       "system": {
-        "statsInboundUplink": true,
+        "statsOutboundUplink": true,
-        "statsInboundDownlink": true
+        "statsOutboundDownlink": true
       }
   },
   "inbounds": [{

V2rayNG/app/src/main/java/com/v2ray/ang/helper/ItemTouchHelperAdapter.java

@@ -43,6 +43,8 @@ public interface ItemTouchHelperAdapter {
     boolean onItemMove(int fromPosition, int toPosition);
 
 
+    void onItemMoveCompleted();
+
     /**
      * Called when an item has been dismissed by a swipe.<br/>
      * <br/>

V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.java

@@ -112,6 +112,8 @@ public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
     public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
         super.clearView(recyclerView, viewHolder);
 
+        mAdapter.onItemMoveCompleted();
+
         viewHolder.itemView.setAlpha(ALPHA_FULL);
 
         if (viewHolder instanceof ItemTouchHelperViewHolder) {

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/dto/V2rayConfig.kt

@@ -64,22 +64,21 @@ data class V2rayConfig(
 
         data class StreamSettingsBean(var network: String,
                                       var security: String,
-                                      var tcpSettings: TcpsettingsBean?,
+                                      var tcpSettings: TcpSettingsBean?,
-                                      var kcpsettings: KcpsettingsBean?,
+                                      var kcpSettings: KcpSettingsBean?,
-                                      var wssettings: WssettingsBean?,
+                                      var wsSettings: WsSettingsBean?,
-                                      var httpsettings: HttpsettingsBean?,
+                                      var httpSettings: HttpSettingsBean?,
-                                      var tlssettings: TlssettingsBean?,
+                                      var tlsSettings: TlsSettingsBean?,
-                                      var quicsettings: QuicsettingBean?
+                                      var quicSettings: QuicSettingBean?
         ) {
 
-            data class TcpsettingsBean(var connectionReuse: Boolean = true,
+            data class TcpSettingsBean(var header: HeaderBean = HeaderBean()) {
-                                       var header: HeaderBean = HeaderBean()) {
                 data class HeaderBean(var type: String = "none",
                                       var request: Any? = null,
                                       var response: Any? = null)
             }
 
-            data class KcpsettingsBean(var mtu: Int = 1350,
+            data class KcpSettingsBean(var mtu: Int = 1350,
                                        var tti: Int = 20,
                                        var uplinkCapacity: Int = 12,
                                        var downlinkCapacity: Int = 100,
@@ -90,20 +89,20 @@ data class V2rayConfig(
                 data class HeaderBean(var type: String = "none")
             }
 
-            data class WssettingsBean(var connectionReuse: Boolean = true,
+            data class WsSettingsBean(var path: String = "",
-                                      var path: String = "",
                                       var headers: HeadersBean = HeadersBean()) {
                 data class HeadersBean(var Host: String = "")
             }
 
-            data class HttpsettingsBean(var host: List<String> = ArrayList<String>(), var path: String = "")
+            data class HttpSettingsBean(var host: List<String> = ArrayList(),
+                                        var path: String = "")
 
-            data class TlssettingsBean(var allowInsecure: Boolean = true,
+            data class TlsSettingsBean(var allowInsecure: Boolean = true,
                                        var serverName: String = "")
 
-            data class QuicsettingBean(var security: String = "none",
+            data class QuicSettingBean(var security: String = "none",
-                                        var key: String = "",
+                                       var key: String = "",
-                                        var header: HeaderBean = HeaderBean()) {
+                                       var header: HeaderBean = HeaderBean()) {
                 data class HeaderBean(var type: String = "none")
             }
         }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/extension/_Ext.kt

@@ -27,34 +27,37 @@ const val divisor = 1024F
 fun Long.toSpeedString() = toTrafficString() + "/s"
 
 fun Long.toTrafficString(): String {
+    if (this == 0L)
+        return "\t\t\t0\t  B"
+
     if (this < threshold)
-        return "$this B"
+        return "${this.toFloat().toShortString()}\t  B"
 
     val kib = this / divisor
     if (kib < threshold)
-        return "${kib.toShortString()} KB"
+        return "${kib.toShortString()}\t KB"
 
     val mib = kib / divisor
     if (mib < threshold)
-        return "${mib.toShortString()} MB"
+        return "${mib.toShortString()}\t MB"
 
     val gib = mib / divisor
     if (gib < threshold)
-        return "${gib.toShortString()} GB"
+        return "${gib.toShortString()}\t GB"
 
     val tib = gib / divisor
     if (tib < threshold)
-        return "${tib.toShortString()} TB"
+        return "${tib.toShortString()}\t TB"
 
     val pib = tib / divisor
     if (pib < threshold)
-        return "${pib.toShortString()} PB"
+        return "${pib.toShortString()}\t PB"
 
     return "∞"
 }
 
 private fun Float.toShortString(): String {
-    val s = toString()
+    val s = "%.2f".format(this)
     if (s.length <= 4)
         return s
     return s.substring(0, 4).removeSuffix(".")

V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt

@@ -3,14 +3,13 @@ package com.v2ray.ang.receiver
 import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
 import android.appwidget.AppWidgetProvider
+import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
-import android.os.Bundle
 import android.widget.RemoteViews
 import com.v2ray.ang.R
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.util.Utils
-import org.jetbrains.anko.toast
 
 class WidgetProvider : AppWidgetProvider() {
     /**
@@ -19,10 +18,21 @@ class WidgetProvider : AppWidgetProvider() {
     override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
         super.onUpdate(context, appWidgetManager, appWidgetIds)
 
+        val isRunning = Utils.isServiceRun(context, "com.v2ray.ang.service.V2RayVpnService")
+        updateWidgetBackground(context, appWidgetManager, appWidgetIds, isRunning)
+    }
+
+    private fun updateWidgetBackground(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray, isRunning: Boolean) {
         val remoteViews = RemoteViews(context.packageName, R.layout.widget_switch)
-        val intent = Intent(AppConfig.BROADCAST_ACTION_WIDGET_CLICK)
+        val intent = Intent(context, WidgetProvider::class.java)
+        intent.setAction(AppConfig.BROADCAST_ACTION_WIDGET_CLICK)
         val pendingIntent = PendingIntent.getBroadcast(context, R.id.layout_switch, intent, PendingIntent.FLAG_UPDATE_CURRENT)
         remoteViews.setOnClickPendingIntent(R.id.layout_switch, pendingIntent)
+        if (isRunning) {
+            remoteViews.setInt(R.id.layout_switch, "setBackgroundResource", R.drawable.ic_rounded_corner_theme);
+        } else {
+            remoteViews.setInt(R.id.layout_switch, "setBackgroundResource", R.drawable.ic_rounded_corner_grey);
+        }
 
         for (appWidgetId in appWidgetIds) {
             appWidgetManager.updateAppWidget(appWidgetId, remoteViews)
@@ -44,7 +54,9 @@ class WidgetProvider : AppWidgetProvider() {
 //                context.toast(R.string.toast_services_start)
                 Utils.startVService(context)
             }
+            val manager = AppWidgetManager.getInstance(context)
+            updateWidgetBackground(context, manager, manager.getAppWidgetIds(ComponentName(context, WidgetProvider::class.java)),
+                    !isRunning);
         }
     }
-
 }

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

@@ -28,15 +28,11 @@ 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
 
 class V2RayVpnService : VpnService() {
@@ -44,6 +40,7 @@ class V2RayVpnService : VpnService() {
         const val NOTIFICATION_ID = 1
         const val NOTIFICATION_PENDING_INTENT_CONTENT = 0
         const val NOTIFICATION_PENDING_INTENT_STOP_V2RAY = 1
+        const val NOTIFICATION_ICON_THRESHOLD = 3000
 
         fun startV2Ray(context: Context) {
             val intent = Intent(context.applicationContext, V2RayVpnService::class.java)
@@ -56,6 +53,7 @@ class V2RayVpnService : VpnService() {
     }
 
     private val v2rayPoint = Libv2ray.newV2RayPoint(V2RayCallback())
+    private var lastQueryTime = 0L
     private lateinit var configContent: String
     private lateinit var mInterface: ParcelFileDescriptor
     val fd: Int get() = mInterface.fd
@@ -73,25 +71,28 @@ 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 by lazy @RequiresApi(Build.VERSION_CODES.P) {
-    private val defaultNetworkRequest = NetworkRequest.Builder()
+        NetworkRequest.Builder()
-            .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-            .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
+                .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
-            .build()
+                .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) {
-        override fun onAvailable(network: Network) {
+        object : ConnectivityManager.NetworkCallback() {
-            setUnderlyingNetworks(arrayOf(network))
+            override fun onAvailable(network: Network) {
-        }
+                setUnderlyingNetworks(arrayOf(network))
-        override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities?) {
+            }
-            // it's a good idea to refresh capabilities
+            override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities?) {
-            setUnderlyingNetworks(arrayOf(network))
+                // it's a good idea to refresh capabilities
-        }
+                setUnderlyingNetworks(arrayOf(network))
-        override fun onLost(network: Network) {
+            }
-            setUnderlyingNetworks(null)
+            override fun onLost(network: Network) {
+                setUnderlyingNetworks(null)
+            }
         }
     }
     private var listeningForDefaultNetwork = false
@@ -130,6 +131,7 @@ class V2RayVpnService : VpnService() {
         // Configure a builder while parsing the parameters.
         val builder = Builder()
         val enableLocalDns = defaultDPreference.getPrefBoolean(SettingsActivity.PREF_LOCAL_DNS_ENABLED, false)
+        val routingMode = defaultDPreference.getPrefString(SettingsActivity.PREF_ROUTING_MODE, "0")
 
         parameters.split(" ")
                 .map { it.split(",") }
@@ -138,7 +140,20 @@ class V2RayVpnService : VpnService() {
                         'm' -> builder.setMtu(java.lang.Short.parseShort(it[1]).toInt())
                         's' -> builder.addSearchDomain(it[1])
                         'a' -> builder.addAddress(it[1], Integer.parseInt(it[2]))
-                        'r' -> builder.addRoute(it[1], Integer.parseInt(it[2]))
+                        'r' -> {
+                            if (routingMode == "1" || routingMode == "3") {
+                                if (it[1] == "::") { //not very elegant, should move Vpn setting in Kotlin, simplify go code
+                                    builder.addRoute("2000::", 3)
+                                } else {
+                                    resources.getStringArray(R.array.bypass_private_ip_address).forEach {
+                                        val addr = it.split('/')
+                                        builder.addRoute(addr[0], addr[1].toInt())
+                                    }
+                                }
+                            } else {
+                                builder.addRoute(it[1], Integer.parseInt(it[2]))
+                            }
+                        }
                         'd' -> builder.addDnsServer(it[1])
                     }
                 }
@@ -175,7 +190,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
         }
@@ -183,6 +198,7 @@ class V2RayVpnService : VpnService() {
         // Create a new interface using the builder and save the parameters.
         mInterface = builder.establish()
         sendFd()
+        lastQueryTime = System.currentTimeMillis()
         startSpeedNotification()
     }
 
@@ -259,7 +275,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
@@ -358,9 +374,16 @@ class V2RayVpnService : VpnService() {
         mSubscription = null
     }
 
-    private fun updateNotification(contentText: String) {
+    private fun updateNotification(contentText: String, proxyTraffic: Long, directTraffic: Long) {
         if (mBuilder != null) {
-            mBuilder?.setContentTitle(contentText)
+            if (proxyTraffic < NOTIFICATION_ICON_THRESHOLD && directTraffic < NOTIFICATION_ICON_THRESHOLD) {
+                mBuilder?.setSmallIcon(R.drawable.ic_v)
+            } else if (proxyTraffic > directTraffic) {
+                mBuilder?.setSmallIcon(R.drawable.ic_stat_proxy)
+            } else {
+                mBuilder?.setSmallIcon(R.drawable.ic_stat_direct)
+            }
+            mBuilder?.setStyle(NotificationCompat.BigTextStyle().bigText(contentText))
             getNotificationManager().notify(NOTIFICATION_ID, mBuilder?.build())
         }
     }
@@ -381,13 +404,22 @@ class V2RayVpnService : VpnService() {
 
             mSubscription = Observable.interval(3, java.util.concurrent.TimeUnit.SECONDS)
                     .subscribe {
-                        val uplink = v2rayPoint.queryStats("socks", "uplink")
+                        val proxyUplink = v2rayPoint.queryStats("proxy", "uplink")
-                        val downlink = v2rayPoint.queryStats("socks", "downlink")
+                        val proxyDownlink = v2rayPoint.queryStats("proxy", "downlink")
-                        val zero_speed = (uplink == 0L && downlink == 0L)
+                        val directUplink = v2rayPoint.queryStats("direct", "uplink")
+                        val directDownlink = v2rayPoint.queryStats("direct", "downlink")
+                        val zero_speed = (proxyUplink == 0L && proxyDownlink == 0L && directUplink == 0L && directDownlink == 0L)
+                        val queryTime = System.currentTimeMillis()
                         if (!zero_speed || !last_zero_speed) {
-                            updateNotification("${cf_name}  •  ${(uplink / 3).toSpeedString()}↑  ${(downlink / 3).toSpeedString()}↓")
+                            val sinceLastQueryInSeconds = (queryTime - lastQueryTime) / 1000.0
+                            updateNotification("proxy\t•  ${(proxyUplink / sinceLastQueryInSeconds).toLong().toSpeedString()}↑  " +
+                                    "${(proxyDownlink / sinceLastQueryInSeconds).toLong().toSpeedString()}↓\n" +
+                                    "direct\t•  ${(directUplink / sinceLastQueryInSeconds).toLong().toSpeedString()}↑  " +
+                                    "${(directDownlink / sinceLastQueryInSeconds).toLong().toSpeedString()}↓",
+                                    proxyDownlink + proxyUplink, directDownlink + directUplink)
                         }
                         last_zero_speed = zero_speed
+                        lastQueryTime = queryTime
                     }
         }
     }
@@ -399,7 +431,7 @@ class V2RayVpnService : VpnService() {
             mSubscription = null
 
             val cf_name = defaultDPreference.getPrefString(AppConfig.PREF_CURR_CONFIG_NAME, "")
-            updateNotification(cf_name)
+            updateNotification(cf_name, 0, 0)
         }
     }
 

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

@@ -55,7 +55,6 @@ abstract class BaseDrawerActivity : BaseActivity() {
                         this@BaseDrawerActivity, R.anim.fade_in, R.anim.fade_out).toBundle()
                 var activityClass: Class<*>? = null
                 when (mItemToOpenWhenDrawerCloses) {
-                    R.id.server_profile -> activityClass = MainActivity::class.java
                     R.id.sub_setting -> activityClass = SubSettingActivity::class.java
                     R.id.settings -> activityClass = SettingsActivity::class.java
                     R.id.logcat -> {
@@ -195,9 +194,7 @@ abstract class BaseDrawerActivity : BaseActivity() {
             true
         }
 
-        if (MainActivity::class.java.isAssignableFrom(javaClass)) {
+        if (SubSettingActivity::class.java.isAssignableFrom(javaClass)) {
-            navigationView.setCheckedItem(R.id.server_profile)
-        } else if (SubSettingActivity::class.java.isAssignableFrom(javaClass)) {
             navigationView.setCheckedItem(R.id.sub_setting)
         } else if (SettingsActivity::class.java.isAssignableFrom(javaClass)) {
             navigationView.setCheckedItem(R.id.settings)

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/kotlin/com/v2ray/ang/ui/MainActivity.kt

@@ -33,6 +33,7 @@ import rx.android.schedulers.AndroidSchedulers
 import java.util.concurrent.TimeUnit
 import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
 import com.v2ray.ang.util.AngConfigManager.configs
+import kotlinx.coroutines.*
 
 class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener {
     companion object {
@@ -58,6 +59,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 
     private val adapter by lazy { MainRecyclerAdapter(this) }
     private var mItemTouchHelper: ItemTouchHelper? = null
+    private val testingJobs = ArrayList<Job>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -240,18 +242,25 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         }
 
         R.id.ping_all -> {
+            testingJobs.forEach {
+                it.cancel()
+            }
+            testingJobs.clear()
+            Utils.closeAllTcpSockets()
             for (k in 0 until configs.vmess.count()) {
                 configs.vmess[k].testResult = ""
                 adapter.updateConfigList()
             }
             for (k in 0 until configs.vmess.count()) {
                 if (configs.vmess[k].configType != AppConfig.EConfigType.Custom) {
-                    doAsync {
+                    testingJobs.add(GlobalScope.launch(Dispatchers.IO) {
                         configs.vmess[k].testResult = Utils.tcping(configs.vmess[k].address, configs.vmess[k].port)
-                        uiThread {
+                        val myJob = coroutineContext[Job]
+                        launch(Dispatchers.Main) {
+                            testingJobs.remove(myJob)
                             adapter.updateSelectedItem(k)
                         }
-                    }
+                    })
                 }
             }
             true
@@ -570,4 +579,4 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         drawer_layout.closeDrawer(GravityCompat.START)
         return true
     }
-}
+}

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

@@ -265,4 +265,8 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
         updateSelectedItem(if (fromPosition < toPosition) fromPosition else toPosition)
         return true
     }
+
+    override fun onItemMoveCompleted() {
+        AngConfigManager.storeConfigFile()
+    }
 }

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

@@ -1,9 +1,11 @@
 package com.v2ray.ang.ui
 
 import android.os.Bundle
+import android.text.Editable
 import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem
+import com.google.gson.Gson
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.defaultDPreference
@@ -12,6 +14,7 @@ import com.v2ray.ang.util.AngConfigManager
 import com.v2ray.ang.util.Utils
 import kotlinx.android.synthetic.main.activity_server2.*
 import org.jetbrains.anko.*
+import java.lang.Exception
 
 
 class Server2Activity : BaseActivity() {
@@ -50,7 +53,7 @@ class Server2Activity : BaseActivity() {
      */
     fun bindingServer(vmess: AngConfig.VmessBean): Boolean {
         et_remarks.text = Utils.getEditable(vmess.remarks)
-        tv_content.text = defaultDPreference.getPrefString(AppConfig.ANG_CONFIG + edit_guid, "")
+        tv_content.text = Editable.Factory.getInstance().newEditable(defaultDPreference.getPrefString(AppConfig.ANG_CONFIG + edit_guid, ""))
         return true
     }
 
@@ -66,21 +69,40 @@ class Server2Activity : BaseActivity() {
      * save server config
      */
     fun saveServer(): Boolean {
+        var saveSuccess: Boolean
         val vmess = configs.vmess[edit_index]
 
         vmess.remarks = et_remarks.text.toString()
 
         if (TextUtils.isEmpty(vmess.remarks)) {
             toast(R.string.server_lab_remarks)
-            return false
+            saveSuccess = false
         }
 
+
         if (AngConfigManager.addCustomServer(vmess, edit_index) == 0) {
             toast(R.string.toast_success)
+            saveSuccess = true
+        } else {
+            toast(R.string.toast_failure)
+            saveSuccess = false
+        }
+
+
+        try {
+            Gson().fromJson<Object>(tv_content.text.toString(), Object::class.java)
+        } catch (e: Exception) {
+            e.printStackTrace()
+            toast(R.string.toast_malformed_josn)
+            saveSuccess = false
+        }
+
+        if (saveSuccess) {
+            //update config
+            defaultDPreference.setPrefString(AppConfig.ANG_CONFIG + edit_guid, tv_content.text.toString())
             finish()
             return true
         } else {
-            toast(R.string.toast_failure)
             return false
         }
     }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt

@@ -2,7 +2,6 @@ package com.v2ray.ang.util
 
 import android.graphics.Bitmap
 import android.text.TextUtils
-import android.util.Log
 import com.google.gson.Gson
 import com.v2ray.ang.AngApplication
 import com.v2ray.ang.AppConfig
@@ -16,12 +15,9 @@ import com.v2ray.ang.AppConfig.VMESS_PROTOCOL
 import com.v2ray.ang.R
 import com.v2ray.ang.dto.AngConfig
 import com.v2ray.ang.dto.VmessQRCode
-import com.v2ray.ang.extension.defaultDPreference
+import java.net.URI
-import org.jetbrains.anko.toast
 import java.net.URLDecoder
 import java.util.*
-import java.net.*
-import java.math.BigInteger
 
 object AngConfigManager {
     private lateinit var app: AngApplication
@@ -104,16 +100,7 @@ object AngConfigManager {
             angConfig.vmess.removeAt(index)
 
             //移除的是活动的
-            if (angConfig.index == index) {
+            adjustIndexForRemovalAt(index)
-                if (angConfig.vmess.count() > 0) {
-                    angConfig.index = 0
-                } else {
-                    angConfig.index = -1
-                }
-            } else if (index < angConfig.index)//移除活动之前的
-            {
-                angConfig.index--
-            }
 
             storeConfigFile()
         } catch (e: Exception) {
@@ -123,6 +110,19 @@ object AngConfigManager {
         return 0
     }
 
+    private fun adjustIndexForRemovalAt(index: Int) {
+        if (angConfig.index == index) {
+            if (angConfig.vmess.count() > 0) {
+                angConfig.index = 0
+            } else {
+                angConfig.index = -1
+            }
+        } else if (index < angConfig.index)//移除活动之前的
+        {
+            angConfig.index--
+        }
+    }
+
     fun swapServer(fromPosition: Int, toPosition: Int): Int {
         try {
             Collections.swap(angConfig.vmess, fromPosition, toPosition)
@@ -133,7 +133,7 @@ object AngConfigManager {
             } else if (index == toPosition) {
                 angConfig.index = fromPosition
             }
-            storeConfigFile()
+            //storeConfigFile()
         } catch (e: Exception) {
             e.printStackTrace()
             return -1
@@ -241,7 +241,7 @@ object AngConfigManager {
     /**
      * import config form qrcode or...
      */
-    fun importConfig(server: String?, subid: String): Int {
+    fun importConfig(server: String?, subid: String, removedSelectedServer: AngConfig.VmessBean?): Int {
         try {
             if (server == null || TextUtils.isEmpty(server)) {
                 return R.string.toast_none_data
@@ -252,7 +252,11 @@ object AngConfigManager {
             if (server.startsWith(VMESS_PROTOCOL)) {
 
                 val indexSplit = server.indexOf("?")
-                if (indexSplit > 0) {
+                val newVmess = tryParseNewVmess(server)
+                if (newVmess != null) {
+                    vmess = newVmess
+                    vmess.subid = subid
+                } else if (indexSplit > 0) {
                     vmess = ResolveVmess4Kitsunebi(server)
                 } else {
 
@@ -361,6 +365,12 @@ object AngConfigManager {
             } else {
                 return R.string.toast_incorrect_protocol
             }
+            if (removedSelectedServer != null &&
+                    vmess.subid.equals(removedSelectedServer.subid) &&
+                    vmess.address.equals(removedSelectedServer.address) &&
+                    vmess.port.equals(removedSelectedServer.port)) {
+                setActiveServer(configs.vmess.count() - 1)
+            }
         } catch (e: Exception) {
             e.printStackTrace()
             return -1
@@ -368,6 +378,61 @@ object AngConfigManager {
         return 0
     }
 
+    fun tryParseNewVmess(uri: String): AngConfig.VmessBean? {
+        return runCatching {
+            val uri = URI(uri)
+            check(uri.scheme == "vmess")
+            val (_, protocol, tlsStr, uuid, alterId) =
+                    Regex("(tcp|http|ws|kcp|quic)(\\+tls)?:([0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12})-([0-9]+)")
+                            .matchEntire(uri.userInfo)?.groupValues
+                            ?: error("parse user info fail.")
+            val tls = tlsStr.isNotBlank()
+            val queryParam = uri.rawQuery.split("&")
+                    .map { it.split("=").let { (k, v) -> k to URLDecoder.decode(v, "utf-8")!! } }
+                    .toMap()
+            val vmess = AngConfig.VmessBean()
+            vmess.address = uri.host
+            vmess.port = uri.port
+            vmess.id = uuid
+            vmess.alterId = alterId.toInt()
+            vmess.streamSecurity = if (tls) "tls" else ""
+            vmess.remarks = uri.fragment
+            vmess.security = "auto"
+
+            // TODO: allowInsecure not supported
+
+            when (protocol) {
+                "tcp" -> {
+                    vmess.network = "tcp"
+                    vmess.headerType = queryParam["type"] ?: "none"
+                    vmess.requestHost = queryParam["host"] ?: ""
+                }
+                "http" -> {
+                    vmess.network = "h2"
+                    vmess.path = queryParam["path"]?.takeIf { it.trim() != "/" } ?: ""
+                    vmess.requestHost = queryParam["host"]?.split("|")?.get(0) ?: ""
+                }
+                "ws" -> {
+                    vmess.network = "ws"
+                    vmess.path = queryParam["path"]?.takeIf { it.trim() != "/" } ?: ""
+                    vmess.requestHost = queryParam["host"]?.split("|")?.get(0) ?: ""
+                }
+                "kcp" -> {
+                    vmess.network = "kcp"
+                    vmess.headerType = queryParam["type"] ?: "none"
+                    vmess.path = queryParam["seed"] ?: ""
+                }
+                "quic" -> {
+                    vmess.network = "quic"
+                    vmess.requestHost = queryParam["security"] ?: "none"
+                    vmess.headerType = queryParam["type"] ?: "none"
+                    vmess.path = queryParam["key"] ?: ""
+                }
+            }
+            vmess
+        }.getOrNull()
+    }
+
     private fun ResolveVmess4Kitsunebi(server: String): AngConfig.VmessBean {
 
         val vmess = AngConfig.VmessBean()
@@ -728,6 +793,11 @@ object AngConfigManager {
             if (servers == null) {
                 return 0
             }
+            val removedSelectedServer =
+                    if (!TextUtils.isEmpty(subid) && configs.vmess.count() > 0 && configs.vmess[configs.index].subid.equals(subid))
+                        configs.vmess[configs.index]
+                    else
+                        null
             removeServerViaSubid(subid)
 
 //            var servers = server
@@ -738,7 +808,7 @@ object AngConfigManager {
             var count = 0
             servers.lines()
                     .forEach {
-                        val resId = importConfig(it, subid)
+                        val resId = importConfig(it, subid, removedSelectedServer)
                         if (resId == 0) {
                             count++
                         }
@@ -778,6 +848,7 @@ object AngConfigManager {
         for (k in configs.vmess.count() - 1 downTo 0) {
             if (configs.vmess[k].subid.equals(subid)) {
                 angConfig.vmess.removeAt(k)
+                adjustIndexForRemovalAt(k)
             }
         }
 
@@ -823,4 +894,4 @@ object AngConfigManager {
         return 0
     }
 
-}
+}

V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt

@@ -31,6 +31,7 @@ import com.v2ray.ang.extension.v2RayApplication
 import com.v2ray.ang.service.V2RayVpnService
 import com.v2ray.ang.ui.SettingsActivity
 import kotlinx.android.synthetic.main.activity_logcat.*
+import kotlinx.coroutines.isActive
 import me.dozen.dpreference.DPreference
 import org.jetbrains.anko.toast
 import org.jetbrains.anko.uiThread
@@ -44,10 +45,13 @@ import java.util.regex.Pattern
 import java.math.BigInteger
 import java.util.concurrent.TimeUnit
 import libv2ray.Libv2ray
+import kotlin.coroutines.coroutineContext
 
 
 object Utils {
 
+    val tcpTestingSockets = ArrayList<Socket?>()
+
     /**
      * convert string to editalbe for kotlin
      *
@@ -483,10 +487,13 @@ object Utils {
     /**
      * tcping
      */
-    fun tcping(url: String, port: Int): String {
+    suspend fun tcping(url: String, port: Int): String {
         var time = -1L
         for (k in 0 until 2) {
             val one = socketConnectTime(url, port)
+            if (!coroutineContext.isActive) {
+                break
+            }
             if (one != -1L  )
                 if(time == -1L || one < time) {
                 time = one
@@ -497,19 +504,35 @@ object Utils {
 
     fun socketConnectTime(url: String, port: Int): Long {
         try {
+            val socket = Socket()
+            synchronized(this) {
+                tcpTestingSockets.add(socket)
+            }
             val start = System.currentTimeMillis()
-            val socket = Socket(url, port)
+            socket.connect(InetSocketAddress(url, port))
             val time = System.currentTimeMillis() - start
+            synchronized(this) {
+                tcpTestingSockets.remove(socket)
+            }
             socket.close()
             return time
         } catch (e: UnknownHostException) {
             e.printStackTrace()
         } catch (e: IOException) {
-            e.printStackTrace()
+            Log.d(AppConfig.ANG_PACKAGE, "socketConnectTime IOException: $e")
         } catch (e: Exception) {
             e.printStackTrace()
         }
         return -1
     }
+
+    fun closeAllTcpSockets() {
+        synchronized(this) {
+            tcpTestingSockets.forEach {
+                it?.close()
+            }
+            tcpTestingSockets.clear()
+        }
+    }
 }
 

V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt

@@ -9,7 +9,6 @@ import com.v2ray.ang.AngApplication
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.AngConfig.VmessBean
 import com.v2ray.ang.dto.V2rayConfig
-import com.v2ray.ang.extension.defaultDPreference
 import com.v2ray.ang.ui.SettingsActivity
 import org.json.JSONException
 import org.json.JSONObject
@@ -246,7 +245,7 @@ object V2rayConfigUtil {
             //streamSettings
             when (streamSettings.network) {
                 "kcp" -> {
-                    val kcpsettings = V2rayConfig.OutboundBean.StreamSettingsBean.KcpsettingsBean()
+                    val kcpsettings = V2rayConfig.OutboundBean.StreamSettingsBean.KcpSettingsBean()
                     kcpsettings.mtu = 1350
                     kcpsettings.tti = 50
                     kcpsettings.uplinkCapacity = 12
@@ -254,34 +253,33 @@ object V2rayConfigUtil {
                     kcpsettings.congestion = false
                     kcpsettings.readBufferSize = 1
                     kcpsettings.writeBufferSize = 1
-                    kcpsettings.header = V2rayConfig.OutboundBean.StreamSettingsBean.KcpsettingsBean.HeaderBean()
+                    kcpsettings.header = V2rayConfig.OutboundBean.StreamSettingsBean.KcpSettingsBean.HeaderBean()
                     kcpsettings.header.type = vmess.headerType
-                    streamSettings.kcpsettings = kcpsettings
+                    streamSettings.kcpSettings = kcpsettings
                 }
                 "ws" -> {
-                    val wssettings = V2rayConfig.OutboundBean.StreamSettingsBean.WssettingsBean()
+                    val wssettings = V2rayConfig.OutboundBean.StreamSettingsBean.WsSettingsBean()
-                    wssettings.connectionReuse = true
                     val host = vmess.requestHost.trim()
                     val path = vmess.path.trim()
 
                     if (!TextUtils.isEmpty(host)) {
-                        wssettings.headers = V2rayConfig.OutboundBean.StreamSettingsBean.WssettingsBean.HeadersBean()
+                        wssettings.headers = V2rayConfig.OutboundBean.StreamSettingsBean.WsSettingsBean.HeadersBean()
                         wssettings.headers.Host = host
                     }
                     if (!TextUtils.isEmpty(path)) {
                         wssettings.path = path
                     }
-                    streamSettings.wssettings = wssettings
+                    streamSettings.wsSettings = wssettings
 
-                    val tlssettings = V2rayConfig.OutboundBean.StreamSettingsBean.TlssettingsBean()
+                    val tlssettings = V2rayConfig.OutboundBean.StreamSettingsBean.TlsSettingsBean()
                     tlssettings.allowInsecure = true
 					if (!TextUtils.isEmpty(host)) {
                         tlssettings.serverName = host
                     }
-                    streamSettings.tlssettings = tlssettings
+                    streamSettings.tlsSettings = tlssettings
                 }
                 "h2" -> {
-                    val httpsettings = V2rayConfig.OutboundBean.StreamSettingsBean.HttpsettingsBean()
+                    val httpsettings = V2rayConfig.OutboundBean.StreamSettingsBean.HttpSettingsBean()
                     val host = vmess.requestHost.trim()
                     val path = vmess.path.trim()
 
@@ -289,31 +287,30 @@ object V2rayConfigUtil {
                         httpsettings.host = host.split(",").map { it.trim() }
                     }
                     httpsettings.path = path
-                    streamSettings.httpsettings = httpsettings
+                    streamSettings.httpSettings = httpsettings
 
-                    val tlssettings = V2rayConfig.OutboundBean.StreamSettingsBean.TlssettingsBean()
+                    val tlssettings = V2rayConfig.OutboundBean.StreamSettingsBean.TlsSettingsBean()
                     tlssettings.allowInsecure = true
-                    streamSettings.tlssettings = tlssettings
+                    streamSettings.tlsSettings = tlssettings
                 }
                 "quic" -> {
-                    val quicsettings = V2rayConfig.OutboundBean.StreamSettingsBean.QuicsettingBean()
+                    val quicsettings = V2rayConfig.OutboundBean.StreamSettingsBean.QuicSettingBean()
                     val host = vmess.requestHost.trim()
                     val path = vmess.path.trim()
 
                     quicsettings.security = host
                     quicsettings.key = path
 
-                    quicsettings.header = V2rayConfig.OutboundBean.StreamSettingsBean.QuicsettingBean.HeaderBean()
+                    quicsettings.header = V2rayConfig.OutboundBean.StreamSettingsBean.QuicSettingBean.HeaderBean()
                     quicsettings.header.type = vmess.headerType
 
-                    streamSettings.quicsettings = quicsettings
+                    streamSettings.quicSettings = quicsettings
                 }
                 else -> {
                     //tcp带http伪装
                     if (vmess.headerType == "http") {
-                        val tcpSettings = V2rayConfig.OutboundBean.StreamSettingsBean.TcpsettingsBean()
+                        val tcpSettings = V2rayConfig.OutboundBean.StreamSettingsBean.TcpSettingsBean()
-                        tcpSettings.connectionReuse = true
+                        tcpSettings.header = V2rayConfig.OutboundBean.StreamSettingsBean.TcpSettingsBean.HeaderBean()
-                        tcpSettings.header = V2rayConfig.OutboundBean.StreamSettingsBean.TcpsettingsBean.HeaderBean()
                         tcpSettings.header.type = vmess.headerType
 
 //                        if (requestObj.has("headers")

V2rayNG/app/src/main/res/drawable/background_test_button.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+            android:drawable="@color/secondary_text" />
+    <item android:state_focused="true"
+            android:drawable="@color/secondary_text" />
+    <item android:state_hovered="true"
+            android:drawable="@color/secondary_text" />
+    <item android:drawable="@color/colorPrimary_text" />
+</selector>

V2rayNG/app/src/main/res/drawable/ic_rounded_corner_grey.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/accent"/>
+    <corners android:radius="20dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>

V2rayNG/app/src/main/res/drawable/ic_rounded_corner_theme.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#009963"/>
+    <corners android:radius="20dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>

V2rayNG/app/src/main/res/layout/activity_main.xml

@@ -54,8 +54,10 @@
                         android:id="@+id/layout_test"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/connection_test_height"
-                        android:background="@color/colorPrimary_text"
+                        android:background="@drawable/background_test_button"
-                        android:gravity="center|left">
+                        android:gravity="center|left"
+                        android:clickable="true"
+                        android:focusable="true">
 
                         <TextView
                             android:id="@+id/tv_test_state"
@@ -92,6 +94,8 @@
                         android:layout_marginLeft="16dp"
                         android:layout_marginTop="16dp"
                         android:src="@drawable/ic_v_idle"
+                        android:clickable="true"
+                        android:focusable="true"
                         app:layout_anchorGravity="bottom|right|end" />
 
                 </com.github.jorgecastilloprz.FABProgressCircle>

V2rayNG/app/src/main/res/layout/activity_server2.xml

@@ -68,20 +68,15 @@
                 android:text="@string/server_lab_content"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
-            <TextView
+            <EditText
                 android:id="@+id/tv_content"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_marginTop="@dimen/layout_margin_top_height"
                 android:text="" />
         </LinearLayout>
 
-        <LinearLayout
+
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
-            android:layout_marginBottom="@dimen/layout_margin_top_height"
-            android:orientation="vertical" />
 
     </LinearLayout>
 </ScrollView>

V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml

@@ -2,7 +2,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical">
+    android:gravity="center_vertical"
+    android:background="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true">
 
     <android.support.v7.widget.AppCompatImageView
         android:id="@+id/icon"
@@ -40,6 +43,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:clickable="false"
+        android:focusable="false"
         android:paddingStart="2dp"
         android:paddingLeft="2dp"
         android:paddingEnd="6dp"

V2rayNG/app/src/main/res/layout/item_recycler_main.xml

@@ -9,10 +9,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="3dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:foreground="?android:attr/selectableItemBackground"
-        android:orientation="horizontal"
         card_view:cardCornerRadius="5dp">
 
         <LinearLayout
@@ -21,7 +17,11 @@
             android:layout_height="@dimen/server_height"
             android:layout_gravity="center"
             android:gravity="center"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:background="?android:attr/selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:nextFocusRight="@+id/layout_share">
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -111,10 +111,14 @@
                     <LinearLayout
                         android:id="@+id/layout_share"
                         android:layout_width="wrap_content"
-                        android:layout_height="@dimen/server_height"
+                        android:layout_height="match_parent"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:paddingEnd="@dimen/layout_margin_right_height">
+                        android:padding="@dimen/layout_margin_spacing"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:nextFocusLeft="@+id/info_container">
 
                         <ImageView
                             android:layout_width="wrap_content"
@@ -126,10 +130,13 @@
                     <LinearLayout
                         android:id="@+id/layout_edit"
                         android:layout_width="wrap_content"
-                        android:layout_height="@dimen/server_height"
+                        android:layout_height="match_parent"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:paddingEnd="@dimen/layout_margin_right_height">
+                        android:padding="@dimen/layout_margin_spacing"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true">
 
                         <ImageView
                             android:layout_width="@dimen/png_height"
@@ -141,10 +148,13 @@
                     <LinearLayout
                         android:id="@+id/layout_remove"
                         android:layout_width="wrap_content"
-                        android:layout_height="@dimen/server_height"
+                        android:layout_height="match_parent"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:paddingEnd="@dimen/layout_margin_right_height">
+                        android:padding="@dimen/layout_margin_spacing"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true">
 
                         <ImageView
                             android:layout_width="@dimen/png_height"

V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml

@@ -6,6 +6,7 @@
     android:gravity="center_vertical">
 
     <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/item_cardview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="3dp"
@@ -13,7 +14,8 @@
         android:focusable="true"
         android:foreground="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
-        card_view:cardCornerRadius="5dp">
+        card_view:cardCornerRadius="5dp"
+        android:nextFocusRight="@+id/layout_edit">
 
         <LinearLayout
             android:id="@+id/info_container"
@@ -62,11 +64,14 @@
                 <LinearLayout
                     android:id="@+id/layout_share"
                     android:layout_width="wrap_content"
-                    android:layout_height="@dimen/server_height"
+                    android:layout_height="wrap_content"
                     android:gravity="center"
                     android:orientation="vertical"
-                    android:paddingEnd="@dimen/layout_margin_right_height"
+                    android:padding="@dimen/layout_margin_spacing"
-                    android:visibility="invisible">
+                    android:visibility="invisible"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true">
 
                     <ImageView
                         android:layout_width="@dimen/png_height"
@@ -78,10 +83,14 @@
                 <LinearLayout
                     android:id="@+id/layout_edit"
                     android:layout_width="wrap_content"
-                    android:layout_height="@dimen/server_height"
+                    android:layout_height="wrap_content"
                     android:gravity="center"
                     android:orientation="vertical"
-                    android:paddingEnd="@dimen/layout_margin_right_height">
+                    android:padding="@dimen/layout_margin_spacing"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:nextFocusLeft="@+id/item_cardview">
 
                     <ImageView
                         android:layout_width="@dimen/png_height"

V2rayNG/app/src/main/res/layout/widget_switch.xml

@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:gravity="center"
-    android:orientation="vertical">
-
-    <LinearLayout
         android:id="@+id/layout_switch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -14,16 +7,9 @@
         android:gravity="center"
         android:orientation="vertical">
 
-        <ImageView
+    <ImageView
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:src="@mipmap/ic_launcher" />
+            android:padding="10dp"
-
+            android:src="@drawable/ic_v" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/app_widget_name"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small" />
-    </LinearLayout>
 </LinearLayout>

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

@@ -4,12 +4,7 @@
     tools:showIn="navigation_view">
 
     <group
-        android:id="@+id/group_main"
+        android:id="@+id/group_main">
-        android:checkableBehavior="single">
-        <item
-            android:id="@+id/server_profile"
-            android:icon="@drawable/ic_description_white_24dp"
-            android:title="@string/title_server" />
         <item
             android:id="@+id/sub_setting"
             android:icon="@drawable/ic_subscriptions_white_24dp"

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

@@ -83,7 +83,7 @@
     <string name="summary_pref_mux_enabled">开启可能会加速,关闭可能会减少断流</string>
 
     <string name="title_pref_speed_enabled">启用速度显示</string>
-    <string name="summary_pref_speed_enabled">在通知中显示当前速度</string>
+    <string name="summary_pref_speed_enabled">在通知中显示当前速度\n小图标显示流量的路由情况</string>
 
     <string name="title_pref_sniffing_enabled">启用流量探测</string>
     <string name="summary_pref_sniffing_enabled">流量探测</string>
@@ -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>
@@ -184,5 +185,6 @@
     <string name="summary_pref_proxy_sharing_enabled">绑定代理入口ip到0.0.0.0</string>
     <string name="toast_warning_pref_proxysharing">其他设备可以使用socks/http协议通过您的IP地址连接到代理\nHttp  代理: http://您的ip:10809\nSocks 代理: socks(4/5)://您的ip:10808\n仅在受信任的网络中启用以避免未经授权的连接</string>
     <string name="toast_warning_pref_proxysharing_short">代理共享已启用，请确保处于受信网络</string>
+    <string name="toast_malformed_josn">配置格式错误</string>
 
 </resources>

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

@@ -17,7 +17,7 @@
     <string name="toast_services_failure">啟動服務失敗</string>
 
     <!--ServerActivity-->
-    <string name="title_server">組態</string>
+    <string name="title_server">設定檔</string>
     <string name="menu_item_add_config">新增組態</string>
     <string name="menu_item_save_config">儲存組態</string>
     <string name="menu_item_del_config">刪除組態</string>
@@ -57,7 +57,7 @@
     <string name="title_file_chooser">選取一個設定檔</string>
     <string name="toast_require_file_manager">請安裝檔案總管。</string>
     <string name="server_customize_config">自訂組態</string>
-    <string name="toast_config_file_invalid">無效組態</string>
+    <string name="toast_config_file_invalid">無效設定檔</string>
     <string name="server_lab_content">內容</string>
     <string name="toast_none_data_clipboard">剪貼簿內無資料</string>
     <string name="toast_invalid_url">網址無效</string>
@@ -84,7 +84,7 @@
     <string name="summary_pref_mux_enabled">啟用或許會加快網路速度，切換或許會閃爍</string>
 
     <string name="title_pref_speed_enabled">啟用速度顯示</string>
-    <string name="summary_pref_speed_enabled">在通知中顯示當前速度</string>
+    <string name="summary_pref_speed_enabled">在通知中顯示當前速度\n小圖標顯示流量的路由情況</string>
 
     <string name="title_pref_sniffing_enabled">啟用流量探測</string>
     <string name="summary_pref_sniffing_enabled">流量探測</string>
@@ -104,17 +104,17 @@
     <string name="summary_pref_donate">向開發人員捐款</string>
     <string name="donate_detail">新增一些實驗性進階功能</string>
 
-    <string name="title_pref_remote_dns">遠端DNS (可选)</string>
+    <string name="title_pref_remote_dns">遠端DNS (可選)</string>
     <string name="summary_pref_remote_dns">DNS</string>
 
-    <string name="title_pref_domestic_dns">境内DNS (可选，僅本地DNS模式下生效)</string>
+    <string name="title_pref_domestic_dns">境内DNS (可選，僅本地DNS模式下生效)</string>
     <string name="summary_pref_domestic_dns">DNS</string>
 
-    <string name="title_pref_socks_port">SOCKS5代理端口</string>
+    <string name="title_pref_socks_port">SOCKS5代理連接埠</string>
-    <string name="summary_pref_socks_port">SOCKS5代理端口</string>
+    <string name="summary_pref_socks_port">SOCKS5代理連接埠</string>
 
-    <string name="title_pref_http_port">HTTP代理端口</string>
+    <string name="title_pref_http_port">HTTP代理連接埠</string>
-    <string name="summary_pref_http_port">HTTP代理端口</string>
+    <string name="summary_pref_http_port">HTTP代理連接埠</string>
 
 
     <string name="title_pref_feedback">回饋</string>
@@ -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>
@@ -153,7 +154,7 @@
     <string name="routing_settings_delete">清除</string>
     <string name="routing_settings_scan_replace">掃描並取代</string>
     <string name="routing_settings_scan_append">掃描並附加</string>
-    <string name="routing_settings_default_rules">設置默認路由規則</string>
+    <string name="routing_settings_default_rules">設置預設路由規則</string>
 
     <string name="connection_test_pending">"檢查連線能力"</string>
     <string name="connection_test_testing">"測試中……"</string>
@@ -178,12 +179,13 @@
 
     <string-array name="routing_mode">
         <item>全球</item>
-        <item>略過局域網</item>
+        <item>略過區域網路</item>
         <item>略過中國大陸</item>
-        <item>略過局域網及中國大陸</item>
+        <item>略過區域網路及中國大陸</item>
     </string-array>
     <string name="title_pref_proxy_sharing_enabled">代理共享</string>
     <string name="summary_pref_proxy_sharing_enabled">綁定代理入口ip到0.0.0.0</string>
-    <string name="toast_warning_pref_proxysharing">其他設備可以使用socks/http協議通過您的IP地址連接到代理\nHttp 代理: http://您的ip:10809\nSocks 代理: socks(4/5)://您的ip:10808\n僅在受信任的網絡中啟用以避免未經授權的連接</string>
+    <string name="toast_warning_pref_proxysharing">其他設備可以使用socks/http協定通過您的IP地址連接到代理\nHttp 代理: http://您的ip:10809\nSocks 代理: socks(4/5)://您的ip:10808\n僅在受信任的網路中啟用以避免未經授權的連接</string>
-    <string name="toast_warning_pref_proxysharing_short">代理共享已啟用，請確保處於受信網絡</string>
+    <string name="toast_warning_pref_proxysharing_short">代理共享已啟用，請確保處於受信網路</string>
+    <string name="toast_malformed_josn">配置格式錯誤</string>
 </resources>

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

@@ -66,4 +66,39 @@
         <item>IPIfNonMatch</item>
         <item>IPOnDemand</item>
     </string-array>
+
+    <!-- minimum list https://serverfault.com/a/304791 -->
+    <string-array name="bypass_private_ip_address" translatable="false">
+        <item>0.0.0.0/5</item>
+        <item>8.0.0.0/7</item>
+        <item>11.0.0.0/8</item>
+        <item>12.0.0.0/6</item>
+        <item>16.0.0.0/4</item>
+        <item>32.0.0.0/3</item>
+        <item>64.0.0.0/2</item>
+        <item>128.0.0.0/3</item>
+        <item>160.0.0.0/5</item>
+        <item>168.0.0.0/6</item>
+        <item>172.0.0.0/12</item>
+        <item>172.32.0.0/11</item>
+        <item>172.64.0.0/10</item>
+        <item>172.128.0.0/9</item>
+        <item>173.0.0.0/8</item>
+        <item>174.0.0.0/7</item>
+        <item>176.0.0.0/4</item>
+        <item>192.0.0.0/9</item>
+        <item>192.128.0.0/11</item>
+        <item>192.160.0.0/13</item>
+        <item>192.169.0.0/16</item>
+        <item>192.170.0.0/15</item>
+        <item>192.172.0.0/14</item>
+        <item>192.176.0.0/12</item>
+        <item>192.192.0.0/10</item>
+        <item>193.0.0.0/8</item>
+        <item>194.0.0.0/7</item>
+        <item>196.0.0.0/6</item>
+        <item>200.0.0.0/5</item>
+        <item>208.0.0.0/4</item>
+        <item>224.0.0.0/3</item>
+    </string-array>
 </resources>

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

@@ -3,6 +3,7 @@
     <dimen name="bypass_list_header_height">50dp</dimen>
     <dimen name="layout_margin_top_height">16dp</dimen>
     <dimen name="layout_margin_right_height">16dp</dimen>
+    <dimen name="layout_margin_spacing">8dp</dimen>
     <dimen name="edit_height">50dp</dimen>
     <dimen name="png_height">24dp</dimen>
     <dimen name="server_height">72dp</dimen>

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

@@ -84,7 +84,8 @@
     <string name="summary_pref_mux_enabled">Enable maybe speed up network and switch network maybe flash</string>
 
     <string name="title_pref_speed_enabled">Enable speed display</string>
-    <string name="summary_pref_speed_enabled">Display current speed in the notification</string>
+    <string name="summary_pref_speed_enabled">Display current speed in the notification.\nNotification icon would change based on
+        usage.</string>
 
     <string name="title_pref_sniffing_enabled">Enable Sniffing</string>
     <string name="summary_pref_sniffing_enabled">Sniffing</string>
@@ -136,6 +137,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>
@@ -185,5 +187,6 @@
     <string name="summary_pref_proxy_sharing_enabled">Bind inbound to 0.0.0.0</string>
     <string name="toast_warning_pref_proxysharing">Other devices can connect to proxy by your ip address through socks/http protocol\nHttp  Proxy: http://yourIP:10809\nSocks Proxy: socks(4/5)://yourIP:10808\nOnly enable in trusted network to avoid unauthorized connection</string>
     <string name="toast_warning_pref_proxysharing_short">Proxy sharing enabled\nMake sure you are in a trusted network</string>
+    <string name="toast_malformed_josn">Config malformed</string>
 
 </resources>