Merge pull request #973 from yuhan6665/new-storage-fix

New storage fix

V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt

@@ -99,6 +99,8 @@ data class V2rayConfig(
                                    var password: String = "",
                                    var port: Int = DEFAULT_PORT,
                                    var level: Int = DEFAULT_LEVEL,
+                                   val email: String? = null,
+                                   val flow: String? = null,
                                    var users: List<SocksUsersBean>? = null) {
 
 
@@ -172,8 +174,9 @@ data class V2rayConfig(
                 var sni = ""
                 network = transport
                 when (network) {
-                    "tcp" -> if (headerType == HTTP) {
+                    "tcp" -> {
                         val tcpSetting = TcpSettingsBean()
+                        if (headerType == HTTP) {
                             tcpSetting.header.type = HTTP
                             if (!TextUtils.isEmpty(host) || !TextUtils.isEmpty(path)) {
                                 val requestObj = TcpSettingsBean.HeaderBean.RequestBean()
@@ -182,6 +185,10 @@ data class V2rayConfig(
                                 tcpSetting.header.request = requestObj
                                 sni = requestObj.headers.Host.getOrNull(0) ?: sni
                             }
+                        } else {
+                            tcpSetting.header.type = "none"
+                            sni = host ?: ""
+                        }
                         tcpSettings = tcpSetting
                     }
                     "kcp" -> {
@@ -387,6 +394,7 @@ data class V2rayConfig(
     fun toPrettyPrinting(): String {
         return GsonBuilder()
                 .setPrettyPrinting()
+                .disableHtmlEscaping()
                 .registerTypeAdapter( // custom serialiser is needed here since JSON by default parse number as Double, core will fail to start
                         object : TypeToken<Double>() {}.type,
                         JsonSerializer { src: Double?, _: Type?, _: JsonSerializationContext? -> JsonPrimitive(src?.toInt()) }

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

@@ -48,7 +48,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
         if (holder is MainViewHolder) {
             val guid = mActivity.mainViewModel.serverList.getOrNull(position) ?: return
             val config = MmkvManager.decodeServerConfig(guid) ?: return
-            val outbound = config.getProxyOutbound() ?: return
+            val outbound = config.getProxyOutbound()
             val aff = MmkvManager.decodeServerAffiliationInfo(guid)
 
             holder.name.text = config.remarks
@@ -76,7 +76,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
             } else {
                 holder.type.text = config.configType.name.toLowerCase()
             }
-            holder.statistics.text = "${outbound.getServerAddress()} : ${outbound.getServerPort()}"
+            holder.statistics.text = "${outbound?.getServerAddress()} : ${outbound?.getServerPort()}"
 
             holder.layout_share.setOnClickListener {
                 AlertDialog.Builder(mActivity).setItems(shareOptions.toTypedArray()) { _, i ->

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

@@ -65,7 +65,7 @@ object AngConfigManager {
                 AppConfig.PREF_V2RAY_ROUTING_AGENT,
                 AppConfig.PREF_V2RAY_ROUTING_BLOCKED,
                 AppConfig.PREF_V2RAY_ROUTING_DIRECT,).forEach { key ->
-            settingsStorage?.encode(key, sharedPreferences.getString(key, ""))
+            settingsStorage?.encode(key, sharedPreferences.getString(key, null))
         }
         listOf(AppConfig.PREF_SPEED_ENABLED,
                 AppConfig.PREF_SNIFFING_ENABLED,

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

@@ -5,6 +5,7 @@
         <item>aes-128-gcm</item>
         <item>auto</item>
         <item>none</item>
+        <item>zero</item>
     </string-array>
     <string-array name="ss_securitys" translatable="false">
         <item>aes-256-cfb</item>
@@ -98,6 +99,7 @@
         <item>xtls-rprx-direct</item>
         <item>xtls-rprx-direct-udp443</item>
         <item>xtls-rprx-splice</item>
+        <item>xtls-rprx-splice-udp443</item>
     </string-array>