Merge pull request #1116 from yuhan6665/fix-base64

Fix base64-url-safe format decode
2021-06-27 11:52:20 +08:00
parent 962519854d 78fe4e4bc4
commit 50bf9c8da0
1 changed files with 7 additions and 2 deletions
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
@@ -102,9 +102,14 @@ object Utils {
        try {
            return Base64.decode(text, Base64.NO_WRAP).toString(charset("UTF-8"))
        } catch (e: Exception) {
-            e.printStackTrace()
-            return ""
+            Log.i(AppConfig.ANG_PACKAGE, "Parse base64 standard failed $e")
        }
+        try {
+            return Base64.decode(text, Base64.NO_WRAP.or(Base64.URL_SAFE)).toString(charset("UTF-8"))
+        } catch (e: Exception) {
+            Log.i(AppConfig.ANG_PACKAGE, "Parse base64 url safe failed $e")
+        }
+        return ""
    }

    /**