From 00982fd40b0f4ee2c3e481e6c614ecd8f2e393a9 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 13 Oct 2020 20:32:20 +0800
Subject: [PATCH] Update V2rayConfigHandler.cs

---
 v2rayN/v2rayN/Handler/V2rayConfigHandler.cs | 43 ++++++---------------
 1 file changed, 11 insertions(+), 32 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
index 078a3fbc..9ca18e61 100644
--- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
@@ -1435,42 +1435,21 @@ namespace v2rayN.Handler
                     msg = UIRes.I18N("ConfigurationFormatIncorrect");
 
                     vmessItem.configType = (int)EConfigType.Trojan;
-                    result = result.Substring(Global.trojanProtocol.Length);
-                    //remark
-                    int indexRemark = result.IndexOf("#");
-                    if (indexRemark > 0)
-                    {
-                        try
-                        {
-                            vmessItem.remarks = WebUtility.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
-                        }
-                        catch { }
-                        result = result.Substring(0, indexRemark);
-                    }
-                    //part decode
-                    int indexS = result.IndexOf("@");
-                    if (indexS > 0)
+
+                    Uri uri = new Uri(result);
+                    vmessItem.address = uri.IdnHost;
+                    vmessItem.port = uri.Port;
+                    vmessItem.id = uri.UserInfo;
+
+                    var remarks = uri.Fragment.Replace("#", "");
+                    if (Utils.IsNullOrEmpty(remarks))
                     {
+                        vmessItem.remarks = "NONE";
                     }
                     else
                     {
-                        result = Utils.Base64Decode(result);
-                    }
-
-                    string[] arr1 = result.Split('@');
-                    if (arr1.Length != 2)
-                    {
-                        return null;
-                    }
-                    int indexPort = arr1[1].LastIndexOf(":");
-                    if (indexPort < 0)
-                    {
-                        return null;
-                    }
-                    vmessItem.address = arr1[1].Substring(0, indexPort);
-                    vmessItem.port = Utils.ToInt(arr1[1].Substring(indexPort + 1, arr1[1].Length - (indexPort + 1)));
-
-                    vmessItem.id = arr1[0];
+                        vmessItem.remarks = WebUtility.UrlDecode(remarks);
+                    }                     
                 }
                 else
                 {