Merge pull request #468 from yuhan6665/cleanup-config

Remove legacy "connectionReuse" in config
Merge pull request #443 from yuhan6665/resume-speed
2020-07-18 14:01:38 +08:00 · 2020-07-18 14:00:48 +08:00 · 2020-07-18 13:59:47 +08:00 · 2020-07-18 13:58:37 +08:00 · 2020-07-18 13:58:11 +08:00 · 2020-07-18 09:48:16 +08:00
12 changed files with 135 additions and 79 deletions
--- a/AndroidLibV2rayLite/VPN/vpnservice_support.go
+++ b/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,
-		IPs:    IPs,
-		Port:   portnum,
+		domain:       host,
+		IPs:          IPs,
+		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
--- a/AndroidLibV2rayLite/interact.go
+++ b/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
--- a/V2rayNG/app/build.gradle
+++ b/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"
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt
+++ b/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 kcpsettings: KcpsettingsBean?,
-                                      var wssettings: WssettingsBean?,
-                                      var httpsettings: HttpsettingsBean?,
-                                      var tlssettings: TlssettingsBean?,
-                                      var quicsettings: QuicsettingBean?
+                                      var tcpSettings: TcpSettingsBean?,
+                                      var kcpSettings: KcpSettingsBean?,
+                                      var wsSettings: WsSettingsBean?,
+                                      var httpSettings: HttpSettingsBean?,
+                                      var tlsSettings: TlsSettingsBean?,
+                                      var quicSettings: QuicSettingBean?
        ) {

-            data class TcpsettingsBean(var connectionReuse: Boolean = true,
-                                       var header: HeaderBean = HeaderBean()) {
+            data class TcpSettingsBean(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,
-                                      var path: String = "",
+            data class WsSettingsBean(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",
-                                        var key: String = "",
-                                        var header: HeaderBean = HeaderBean()) {
+            data class QuicSettingBean(var security: String = "none",
+                                       var key: String = "",
+                                       var header: HeaderBean = HeaderBean()) {
                data class HeaderBean(var type: String = "none")
            }
        }
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/extension/_Ext.kt
+++ b/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(".")
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt
@@ -52,6 +52,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
@@ -182,6 +183,7 @@ class V2RayVpnService : VpnService() {
        // Create a new interface using the builder and save the parameters.
        mInterface = builder.establish()
        sendFd()
+        lastQueryTime = System.currentTimeMillis()
        startSpeedNotification()
    }

@@ -383,10 +385,13 @@ class V2RayVpnService : VpnService() {
                        val uplink = v2rayPoint.queryStats("socks", "uplink")
                        val downlink = v2rayPoint.queryStats("socks", "downlink")
                        val zero_speed = (uplink == 0L && downlink == 0L)
+                        val queryTime = System.currentTimeMillis()
                        if (!zero_speed || !last_zero_speed) {
-                            updateNotification("${cf_name}  •  ${(uplink / 3).toSpeedString()}↑  ${(downlink / 3).toSpeedString()}↓")
+                            updateNotification("${cf_name}  •  ${(uplink * 1000 / (queryTime - lastQueryTime)).toSpeedString()}↑" +
+                                    "  ${(downlink * 1000 / (queryTime - lastQueryTime)).toSpeedString()}↓")
                        }
                        last_zero_speed = zero_speed
+                        lastQueryTime = queryTime
                    }
        }
    }
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseDrawerActivity.kt
+++ b/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)) {
-            navigationView.setCheckedItem(R.id.server_profile)
-        } else if (SubSettingActivity::class.java.isAssignableFrom(javaClass)) {
+        if (SubSettingActivity::class.java.isAssignableFrom(javaClass)) {
            navigationView.setCheckedItem(R.id.sub_setting)
        } else if (SettingsActivity::class.java.isAssignableFrom(javaClass)) {
            navigationView.setCheckedItem(R.id.settings)
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt
+++ b/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
    }
-}
+}
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
@@ -104,16 +104,7 @@ object AngConfigManager {
            angConfig.vmess.removeAt(index)

            //移除的是活动的
-            if (angConfig.index == index) {
-                if (angConfig.vmess.count() > 0) {
-                    angConfig.index = 0
-                } else {
-                    angConfig.index = -1
-                }
-            } else if (index < angConfig.index)//移除活动之前的
-            {
-                angConfig.index--
-            }
+            adjustIndexForRemovalAt(index)

            storeConfigFile()
        } catch (e: Exception) {
@@ -123,6 +114,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)
@@ -241,7 +245,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
@@ -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
@@ -728,6 +738,11 @@ object AngConfigManager {
            if (servers == null) {
                return 0
            }
+            val removedSelectedServer =
+                    if (!TextUtils.isEmpty(subid) && configs.vmess[configs.index].subid.equals(subid))
+                        configs.vmess[configs.index]
+                    else
+                        null
            removeServerViaSubid(subid)

 //            var servers = server
@@ -738,7 +753,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 +793,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)
            }
        }

--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
+++ b/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()
+        }
+    }
 }

--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt
+++ b/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()
-                    wssettings.connectionReuse = true
+                    val wssettings = V2rayConfig.OutboundBean.StreamSettingsBean.WsSettingsBean()
                    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()
-                        tcpSettings.connectionReuse = true
-                        tcpSettings.header = V2rayConfig.OutboundBean.StreamSettingsBean.TcpsettingsBean.HeaderBean()
+                        val tcpSettings = V2rayConfig.OutboundBean.StreamSettingsBean.TcpSettingsBean()
+                        tcpSettings.header = V2rayConfig.OutboundBean.StreamSettingsBean.TcpSettingsBean.HeaderBean()
                        tcpSettings.header.type = vmess.headerType

 //                        if (requestObj.has("headers")
--- a/V2rayNG/app/src/main/res/menu/menu_drawer.xml
+++ b/V2rayNG/app/src/main/res/menu/menu_drawer.xml
@@ -4,12 +4,7 @@
    tools:showIn="navigation_view">

    <group
-        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" />
+        android:id="@+id/group_main">
        <item
            android:id="@+id/sub_setting"
            android:icon="@drawable/ic_subscriptions_white_24dp"
Author	SHA1	Message	Date
2dust	28639cc388	Merge pull request #468 from yuhan6665/cleanup-config Remove legacy "connectionReuse" in config	2020-07-18 14:01:38 +08:00
2dust	ca254b2aa1	Merge pull request #443 from yuhan6665/resume-speed Fix speed display after screen turns on	2020-07-18 14:00:48 +08:00
2dust	9721879713	Merge pull request #432 from yuhan6665/drawer-ui fix highlight issue in drawer ui	2020-07-18 13:59:47 +08:00
2dust	623c1807c5	Merge pull request #409 from yuhan6665/test-cleanup Tcp test cleanup	2020-07-18 13:58:37 +08:00
2dust	739fa88ba7	Merge pull request #335 from yuhan6665/sub-index Fix selected index when update subscription	2020-07-18 13:58:11 +08:00
2dust	85d6f00f8c	Merge pull request #474 from yuhan6665/dns-cache-timeout Refresh prepared domain every 30 minutes	2020-07-18 09:48:16 +08:00
yuhan6665	8986710453	Cancel async block when user test tcping again Change async code to use Kotlin coroutine instead of Anko, since Anko is deprecated and coroutine is the recommanded approach now.	2020-07-16 19:42:43 -04:00
yuhan6665	f54faacbf6	Close connecting sockets when user test tcping again	2020-07-16 19:42:43 -04:00
yuhan6665	903352ec9c	Refresh prepared domain every 30 minutes	2020-06-19 23:42:02 -04:00
yuhan6665	ad56106c08	Remove legacy "connectionReuse" in config Also auto-refactor the data class naming to be proper camelcase	2020-06-13 23:38:33 -04:00
yuhan6665	aea8369b8a	Fix speed display after screen turns on Also, use the tab to make the text less jumpy	2020-05-29 22:54:55 -04:00
yuhan6665	92d2cb35c4	Make drawer item unchecked Current checked item is not consistent with the active activity. In fact, we don't need checked state. This is a standard behavior. You can find in apps like Google Playstore.	2020-05-24 11:13:12 -04:00
yuhan6665	6ce3d540e8	Remove config item in drawer The drawer is attached to MainActivity. When user see the drawer, the MainActivity must be active. Showing an menu item to launch itself is confusing.	2020-05-24 11:09:11 -04:00
yuhan6665	8b149fb52f	Fix selected index when update subscription	2020-04-03 18:58:41 -04:00