From 18226139859d4ed086dc40b579994dbd17dd5873 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 19 Jun 2022 09:36:51 +0800
Subject: [PATCH 1/2] add xchacha20

---
 V2rayNG/app/src/main/res/values/arrays.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/V2rayNG/app/src/main/res/values/arrays.xml b/V2rayNG/app/src/main/res/values/arrays.xml
index ba9a23ce..03e0f1ff 100644
--- a/V2rayNG/app/src/main/res/values/arrays.xml
+++ b/V2rayNG/app/src/main/res/values/arrays.xml
@@ -12,6 +12,8 @@
         <item>aes-128-gcm</item>
         <item>chacha20-poly1305</item>
         <item>chacha20-ietf-poly1305</item>
+        <item>xchacha20-poly1305</item>
+        <item>xchacha20-ietf-poly1305</item>
         <item>none</item>
         <item>plain</item>
         <item>2022-blake3-aes-128-gcm</item>

From e23e9c48a409b04bf85a8cdc483cbc6fd0ce2d7e Mon Sep 17 00:00:00 2001
From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com>
Date: Fri, 24 Jun 2022 23:41:21 -0400
Subject: [PATCH 2/2] Fix ss2022 import for old base64 format

Old format has userinfo = null, will throw NPE
---
 .../com/v2ray/ang/util/AngConfigManager.kt    | 58 ++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
index 6f12e7f6..c6cc1cfb 100644
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
@@ -3,8 +3,9 @@ package com.v2ray.ang.util
 import android.content.Context
 import android.content.SharedPreferences
 import android.graphics.Bitmap
-import androidx.preference.PreferenceManager
 import android.text.TextUtils
+import android.util.Log
+import androidx.preference.PreferenceManager
 import com.google.gson.Gson
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
@@ -396,35 +397,40 @@ object AngConfigManager {
     }
 
     private fun tryResolveResolveSip002(str: String, config: ServerConfig): Boolean {
-        val uri = URI(str.replace(" ", "%20"))
-        config.remarks = Utils.urlDecode(uri.fragment ?: "")
+        try {
+            val uri = URI(str.replace(" ", "%20"))
+            config.remarks = Utils.urlDecode(uri.fragment ?: "")
 
-        val method: String
-        val password: String
-        if (uri.userInfo.contains(":")) {
-            val arrUserInfo = uri.userInfo.split(":").map { it.trim() }
-            if (arrUserInfo.count() != 2) {
-                return false
+            val method: String
+            val password: String
+            if (uri.userInfo.contains(":")) {
+                val arrUserInfo = uri.userInfo.split(":").map { it.trim() }
+                if (arrUserInfo.count() != 2) {
+                    return false
+                }
+                method = arrUserInfo[0]
+                password = Utils.urlDecode(arrUserInfo[1])
+            } else {
+                val base64Decode = Utils.decode(uri.userInfo)
+                val arrUserInfo = base64Decode.split(":").map { it.trim() }
+                if (arrUserInfo.count() < 2) {
+                    return false
+                }
+                method = arrUserInfo[0]
+                password = base64Decode.substringAfter(":")
             }
-            method = arrUserInfo[0]
-            password = Utils.urlDecode(arrUserInfo[1])
-        } else {
-            val base64Decode = Utils.decode(uri.userInfo)
-            val arrUserInfo = base64Decode.split(":").map { it.trim() }
-            if (arrUserInfo.count() != 2 && arrUserInfo.count() != 3) {
-                return false
-            }
-            method = arrUserInfo[0]
-            password = base64Decode.substringAfter(":")
-        }
 
-        config.outboundBean?.settings?.servers?.get(0)?.let { server ->
-            server.address = uri.idnHost
-            server.port = uri.port
-            server.password = password
-            server.method = method
+            config.outboundBean?.settings?.servers?.get(0)?.let { server ->
+                server.address = uri.idnHost
+                server.port = uri.port
+                server.password = password
+                server.method = method
+            }
+            return true
+        } catch (e: Exception) {
+            Log.d(AppConfig.ANG_PACKAGE, e.toString())
+            return false
         }
-        return true
     }
 
     /**