Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
019f9d30
Commit
019f9d30
authored
Mar 09, 2017
by
Mygod
Committed by
Max Lv
Mar 10, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove redundant group in legacyPattern
parent
26b68876
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
mobile/src/main/scala/com/github/shadowsocks/utils/Parser.scala
.../src/main/scala/com/github/shadowsocks/utils/Parser.scala
+3
-3
No files found.
mobile/src/main/scala/com/github/shadowsocks/utils/Parser.scala
View file @
019f9d30
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment