update kotlin version to 1.7.20

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

@@ -116,6 +116,7 @@ class ServerActivity : BaseActivity() {
             EConfigType.SOCKS -> setContentView(R.layout.activity_server_socks)
             EConfigType.VLESS -> setContentView(R.layout.activity_server_vless)
             EConfigType.TROJAN -> setContentView(R.layout.activity_server_trojan)
+            else -> setContentView(R.layout.activity_server_vmess)
         }
         sp_network?.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
@@ -382,8 +383,8 @@ class ServerActivity : BaseActivity() {
         val sniField = et_sni?.text?.toString()?.trim() ?: return
         val allowInsecureField = sp_allow_insecure?.selectedItemPosition ?: return
         val streamSecurity = sp_stream_security?.selectedItemPosition ?: return
-        var utlsIndex = sp_stream_fingerprint?.selectedItemPosition ?: return
-        var alpnIndex = sp_stream_alpn?.selectedItemPosition ?: return
+        val utlsIndex = sp_stream_fingerprint?.selectedItemPosition ?: return
+        val alpnIndex = sp_stream_alpn?.selectedItemPosition ?: return
         val publicKey = et_public_key?.text?.toString()?.trim() ?: return
         val shortId = et_short_id?.text?.toString()?.trim() ?: return
         val spiderX = et_spider_x?.text?.toString()?.trim() ?: return
@@ -421,23 +422,28 @@ class ServerActivity : BaseActivity() {
     }
 
     private fun transportTypes(network: String?): Array<out String> {
-        return if (network == "tcp") {
+        return when (network) {
+            "tcp" -> {
                 tcpTypes
-        } else if (network == "kcp" || network == "quic") {
+            }
+            "kcp", "quic" -> {
                 kcpAndQuicTypes
-        } else if (network == "grpc") {
+            }
+            "grpc" -> {
                 grpcModes
-        } else {
+            }
+            else -> {
                 arrayOf("---")
             }
         }
+    }
 
     /**
      * save server config
      */
     private fun deleteServer(): Boolean {
         if (editGuid.isNotEmpty()) {
-            if (editGuid != mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER)) {
+            if (editGuid != mainStorage?.decodeString(KEY_SELECTED_SERVER)) {
                 if (settingsStorage?.decodeBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
                     AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
                         .setPositiveButton(android.R.string.ok) { _, _ ->

V2rayNG/build.gradle

@@ -8,7 +8,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
         // NOTE: Do not place your application dependencies here; they belong

V2rayNG/gradle.properties

@@ -13,7 +13,7 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Fri Jun 02 14:08:42 CST 2017
-kotlinVersion=1.6.21
+kotlinVersion=1.7.20
 buildToolsVer=31.0.0
 compileSdkVer=31
 targetSdkVer=31

V2rayNG/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip