From 019f9d30e823decfa78246efa257f28718c5bcd5 Mon Sep 17 00:00:00 2001 From: Mygod Date: Thu, 9 Mar 2017 20:46:25 +0800 Subject: [PATCH] Remove redundant group in legacyPattern --- .../main/scala/com/github/shadowsocks/utils/Parser.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/src/main/scala/com/github/shadowsocks/utils/Parser.scala b/mobile/src/main/scala/com/github/shadowsocks/utils/Parser.scala index 5b12e0a3..64d1ed88 100644 --- a/mobile/src/main/scala/com/github/shadowsocks/utils/Parser.scala +++ b/mobile/src/main/scala/com/github/shadowsocks/utils/Parser.scala @@ -28,14 +28,14 @@ object Parser { val TAG = "ShadowParser" private val pattern = "(?i)ss://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]".r private val userInfoPattern = "^(.+?):(.*)$".r - private val legacyPattern = "^((.+?):(.*)@(.+?):(\\d+?))$".r + private val legacyPattern = "^(.+?):(.*)@(.+?):(\\d+?)$".r def findAll(data: CharSequence): Iterator[Profile] = pattern.findAllMatchIn(if (data == null) "" else data).map(m => { val uri = Uri.parse(m.matched) uri.getUserInfo match { - case null => new String(Base64.decode(uri.getHost, Base64.NO_PADDING), "UTF-8") match { - case legacyPattern(_, method, password, host, port) => // legacy uri + case null => val str = new String(Base64.decode(uri.getHost, Base64.NO_PADDING), "UTF-8"); str match { + case legacyPattern(method, password, host, port) => // legacy uri val profile = new Profile profile.method = method.toLowerCase profile.password = password