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
654b6277
Commit
654b6277
authored
Dec 27, 2016
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use VectorDrawable for ic_navigation_close on API 21+
parent
a4f32615
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
src/main/res/drawable-anydpi-v21/ic_navigation_close.xml
src/main/res/drawable-anydpi-v21/ic_navigation_close.xml
+0
-0
src/main/scala/com/github/shadowsocks/BaseService.scala
src/main/scala/com/github/shadowsocks/BaseService.scala
+7
-2
No files found.
src/main/res/drawable/ic_navigation_close.xml
→
src/main/res/drawable
-anydpi-v21
/ic_navigation_close.xml
View file @
654b6277
File moved
src/main/scala/com/github/shadowsocks/BaseService.scala
View file @
654b6277
...
@@ -21,6 +21,8 @@
...
@@ -21,6 +21,8 @@
package
com.github.shadowsocks
package
com.github.shadowsocks
import
java.io.IOException
import
java.io.IOException
import
java.net.InetAddress
import
java.util
import
java.util.concurrent.TimeUnit
import
java.util.concurrent.TimeUnit
import
java.util.
{
Timer
,
TimerTask
}
import
java.util.
{
Timer
,
TimerTask
}
...
@@ -35,7 +37,7 @@ import com.github.shadowsocks.ShadowsocksApplication.app
...
@@ -35,7 +37,7 @@ import com.github.shadowsocks.ShadowsocksApplication.app
import
com.github.shadowsocks.aidl.
{
IShadowsocksService
,
IShadowsocksServiceCallback
}
import
com.github.shadowsocks.aidl.
{
IShadowsocksService
,
IShadowsocksServiceCallback
}
import
com.github.shadowsocks.database.Profile
import
com.github.shadowsocks.database.Profile
import
com.github.shadowsocks.utils._
import
com.github.shadowsocks.utils._
import
okhttp3.
{
FormBody
,
OkHttpClient
,
Request
}
import
okhttp3.
{
Dns
,
FormBody
,
OkHttpClient
,
Request
}
import
scala.util.Random
import
scala.util.Random
...
@@ -137,7 +139,10 @@ trait BaseService extends Service {
...
@@ -137,7 +139,10 @@ trait BaseService extends Service {
val
sig
=
Utils
.
getSignature
(
this
)
val
sig
=
Utils
.
getSignature
(
this
)
val
client
=
new
OkHttpClient
.
Builder
()
val
client
=
new
OkHttpClient
.
Builder
()
.
dns
(
new
CustomDns
())
.
dns
(
hostname
=>
Utils
.
resolve
(
hostname
,
enableIPv6
=
false
)
match
{
case
Some
(
ip
)
=>
util
.
Arrays
.
asList
(
InetAddress
.
getByName
(
ip
))
case
_
=>
Dns
.
SYSTEM
.
lookup
(
hostname
)
})
.
connectTimeout
(
10
,
TimeUnit
.
SECONDS
)
.
connectTimeout
(
10
,
TimeUnit
.
SECONDS
)
.
writeTimeout
(
10
,
TimeUnit
.
SECONDS
)
.
writeTimeout
(
10
,
TimeUnit
.
SECONDS
)
.
readTimeout
(
30
,
TimeUnit
.
SECONDS
)
.
readTimeout
(
30
,
TimeUnit
.
SECONDS
)
...
...
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