Merge pull request #725 from mzz2017/patch-1

fix: the problem that importing SS URL not support standard format
Merge pull request #698 from yuhan6665/master
2020-11-05 14:30:56 +08:00 · 2020-11-05 14:30:41 +08:00 · 2020-11-02 12:37:26 +08:00 · 2020-10-21 21:31:23 -04:00
4 changed files with 2 additions and 3 deletions
--- a/AndroidLibV2rayLite/CoreI/Status.go
+++ b/AndroidLibV2rayLite/CoreI/Status.go
@@ -13,7 +13,7 @@ type Status struct {
 }

 func CheckVersion() int {
-	return 21
+	return 22
 }

 func (v *Status) GetDataDir() string {
--- a/AndroidLibV2rayLite/Process/Escort/escort.go
+++ b/AndroidLibV2rayLite/Process/Escort/escort.go
@@ -3,7 +3,6 @@ package Escort
 import (
 	"os"
 	"os/exec"
-	"time"

 	"log"

--- a/V2rayNG/app/libs/libv2ray.aar
+++ b/V2rayNG/app/libs/libv2ray.aar
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
@@ -318,7 +318,7 @@ object AngConfigManager {
                    result = Utils.decode(result)
                }

-                val legacyPattern = "^(.+?):(.*)@(.+?):(\\d+?)$".toRegex()
+                val legacyPattern = "^(.+?):(.*)@(.+?):(\\d+?)/?$".toRegex()
                val match = legacyPattern.matchEntire(result)
                if (match == null) {
                    return R.string.toast_incorrect_protocol
Author	SHA1	Message	Date
2dust	5628cbee3a	Merge pull request #725 from mzz2017/patch-1 fix: the problem that importing SS URL not support standard format	2020-11-05 14:30:56 +08:00
2dust	3dd663d927	Merge pull request #698 from yuhan6665/master Release AndroidLibV2rayLite 22	2020-11-05 14:30:41 +08:00
mzz	9e49a2dbd9	fix: the problem that importing SS URL not support standard format	2020-11-02 12:37:26 +08:00
yuhan6665	39af5fdb86	Release AndroidLibV2rayLite 22	2020-10-21 21:31:23 -04:00