From 838b346fccf9e0f5ee7124903d99a47225f02d25 Mon Sep 17 00:00:00 2001
From: GFW-knocker <123458121+GFW-knocker@users.noreply.github.com>
Date: Fri, 28 Jun 2024 05:11:55 +0330
Subject: [PATCH] fix wireguard issue (#3260)

fix crash when invalid wireguard config imported
---
 .../kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt    |  8 +++++++-
 .../kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt     | 11 ++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt
index 2ea7adf7..f9c294dc 100644
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt
@@ -97,7 +97,13 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
                     holder.itemMainBinding.tvType.text = config.configType.name.lowercase()
                 }
             }
-            val strState = "${outbound?.getServerAddress()?.dropLast(3)}*** : ${outbound?.getServerPort()}"
+
+            val strState = try{
+                "${outbound?.getServerAddress()?.dropLast(3)}*** : ${outbound?.getServerPort()}"
+            }catch(e: Exception){
+                ""
+            }
+
             holder.itemMainBinding.tvStatistics.text = strState
 
             holder.itemMainBinding.layoutShare.setOnClickListener {
diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt
index d00a4d75..27900f97 100644
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt
@@ -10,11 +10,11 @@ import java.net.URI
 
 object WireguardFmt {
     fun parseWireguard(str: String): ServerConfig? {
-        val config = ServerConfig.create(EConfigType.WIREGUARD)
         val uri = URI(Utils.fixIllegalUrl(str))
-        config.remarks = Utils.urlDecode(uri.fragment ?: "")
-
         if (uri.rawQuery != null) {
+            val config = ServerConfig.create(EConfigType.WIREGUARD)
+            config.remarks = Utils.urlDecode(uri.fragment ?: "")
+
             val queryParam = uri.rawQuery.split("&")
                 .associate { it.split("=").let { (k, v) -> k to Utils.urlDecode(v) } }
 
@@ -31,9 +31,10 @@ object WireguardFmt {
                     (queryParam["reserved"] ?: "0,0,0").removeWhiteSpace().split(",")
                         .map { it.toInt() }
             }
+            return config
+        }else {
+            return null
         }
-
-        return config
     }
 
     fun toUri(config: ServerConfig): String {