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
30fea4a7
Commit
30fea4a7
authored
Sep 04, 2016
by
Max Lv
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:shadowsocks/shadowsocks-android
parents
6df227d2
7c0763c7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
6 deletions
+8
-6
kcptun/kcptun
kcptun/kcptun
+1
-1
project/plugins.sbt
project/plugins.sbt
+1
-1
src/main/AndroidManifest.xml
src/main/AndroidManifest.xml
+2
-2
src/main/scala/com/github/shadowsocks/GuardedProcess.scala
src/main/scala/com/github/shadowsocks/GuardedProcess.scala
+3
-1
src/main/scala/com/github/shadowsocks/ShadowsocksQuickSwitchActivity.scala
...m/github/shadowsocks/ShadowsocksQuickSwitchActivity.scala
+1
-1
No files found.
kcptun
@
91b2c650
Subproject commit
c91882990d1e39acbf4cc98c63e5a7a5fc8da1c6
Subproject commit
91b2c650d128285f8a5f8305696d4c5ccdbe8e5f
project/plugins.sbt
View file @
30fea4a7
addSbtPlugin
(
"org.scala-android"
%
"sbt-android"
%
"1.6.1
4
"
)
addSbtPlugin
(
"org.scala-android"
%
"sbt-android"
%
"1.6.1
5
"
)
addSbtPlugin
(
"com.timushev.sbt"
%
"sbt-updates"
%
"0.1.10"
)
...
...
src/main/AndroidManifest.xml
View file @
30fea4a7
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
package=
"com.github.shadowsocks"
android:versionCode=
"1
49
"
android:versionName=
"3.0.
7
"
>
android:versionCode=
"1
50
"
android:versionName=
"3.0.
8
"
>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
...
...
src/main/scala/com/github/shadowsocks/GuardedProcess.scala
View file @
30fea4a7
...
...
@@ -57,7 +57,9 @@ class StreamLogger(is: InputStream, tag: String) extends Thread {
override
def
run
()
{
withCloseable
(
new
BufferedReader
(
new
InputStreamReader
(
is
)))
{
br
=>
Stream
.
continually
(
br
.
readLine
()).
takeWhile
(
_
!=
null
).
foreach
(
Log
.
i
(
tag
,
_
))
br
=>
try
Stream
.
continually
(
br
.
readLine
()).
takeWhile
(
_
!=
null
).
foreach
(
Log
.
i
(
tag
,
_
))
catch
{
case
ignore
:
IOException
=>
}
}
}
}
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksQuickSwitchActivity.scala
View file @
30fea4a7
...
...
@@ -68,7 +68,7 @@ class ShadowsocksQuickSwitchActivity extends AppCompatActivity {
profilesList
.
setItemAnimator
(
new
DefaultItemAnimator
)
profilesList
.
setAdapter
(
profilesAdapter
)
if
(
app
.
profileId
>=
0
)
lm
.
scrollToPosition
(
profilesAdapter
.
profiles
.
zipWithIndex
.
collectFirst
{
case
(
profile
,
i
)
if
profile
.
id
==
app
.
profileId
=>
i
+
1
case
(
profile
,
i
)
if
profile
.
id
==
app
.
profileId
=>
i
}.
getOrElse
(
0
))
}
}
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