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
b4d3103b
Commit
b4d3103b
authored
Jun 17, 2016
by
Mygod
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'n' and update to API level 24
Fix #671.
parents
d3500881
5966c9d8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
73 additions
and
5 deletions
+73
-5
build.sbt
build.sbt
+4
-4
src/main/AndroidManifest.xml
src/main/AndroidManifest.xml
+11
-0
src/main/scala/com/github/shadowsocks/AppManager.scala
src/main/scala/com/github/shadowsocks/AppManager.scala
+1
-1
src/main/scala/com/github/shadowsocks/ShadowsocksTileService.scala
...scala/com/github/shadowsocks/ShadowsocksTileService.scala
+57
-0
No files found.
build.sbt
View file @
b4d3103b
...
@@ -2,7 +2,7 @@ import android.Keys._
...
@@ -2,7 +2,7 @@ import android.Keys._
android
.
Plugin
.
androidBuild
android
.
Plugin
.
androidBuild
platformTarget
in
Android
:=
"android-2
3
"
platformTarget
in
Android
:=
"android-2
4
"
name
:=
"shadowsocks"
name
:=
"shadowsocks"
...
@@ -35,9 +35,9 @@ libraryDependencies ++= Seq(
...
@@ -35,9 +35,9 @@ libraryDependencies ++= Seq(
"com.google.android.gms"
%
"play-services-base"
%
"9.0.2"
,
"com.google.android.gms"
%
"play-services-base"
%
"9.0.2"
,
"com.google.android.gms"
%
"play-services-ads"
%
"9.0.2"
,
"com.google.android.gms"
%
"play-services-ads"
%
"9.0.2"
,
"com.google.android.gms"
%
"play-services-analytics"
%
"9.0.2"
,
"com.google.android.gms"
%
"play-services-analytics"
%
"9.0.2"
,
"com.android.support"
%
"design"
%
"2
3.4
.0"
,
"com.android.support"
%
"design"
%
"2
4.0
.0"
,
"com.android.support"
%
"gridlayout-v7"
%
"2
3.4
.0"
,
"com.android.support"
%
"gridlayout-v7"
%
"2
4.0
.0"
,
"com.android.support"
%
"cardview-v7"
%
"2
3.4
.0"
,
"com.android.support"
%
"cardview-v7"
%
"2
4.0
.0"
,
"com.github.jorgecastilloprz"
%
"fabprogresscircle"
%
"1.01"
,
"com.github.jorgecastilloprz"
%
"fabprogresscircle"
%
"1.01"
,
"com.j256.ormlite"
%
"ormlite-core"
%
"4.48"
,
"com.j256.ormlite"
%
"ormlite-core"
%
"4.48"
,
"com.j256.ormlite"
%
"ormlite-android"
%
"4.48"
,
"com.j256.ormlite"
%
"ormlite-android"
%
"4.48"
,
...
...
src/main/AndroidManifest.xml
View file @
b4d3103b
...
@@ -48,6 +48,9 @@
...
@@ -48,6 +48,9 @@
<category
android:name=
"android.intent.category.LAUNCHER"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
<category
android:name=
"android.intent.category.LEANBACK_LAUNCHER"
/>
<category
android:name=
"android.intent.category.LEANBACK_LAUNCHER"
/>
</intent-filter>
</intent-filter>
<intent-filter>
<action
android:name=
"android.service.quicksettings.action.QS_TILE"
/>
</intent-filter>
</activity>
</activity>
<activity
<activity
...
@@ -125,6 +128,14 @@
...
@@ -125,6 +128,14 @@
</intent-filter>
</intent-filter>
</service>
</service>
<service
android:name=
".ShadowsocksTileService"
android:label=
"@string/app_name"
android:icon=
"@drawable/ic_start_connected"
android:permission=
"android.permission.BIND_QUICK_SETTINGS_TILE"
>
<intent-filter>
<action
android:name=
"android.service.quicksettings.action.QS_TILE"
/>
</intent-filter>
</service>
<receiver
android:name=
".BootReceiver"
android:enabled=
"false"
>
<receiver
android:name=
".BootReceiver"
android:enabled=
"false"
>
<intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.BOOT_COMPLETED"
/>
<action
android:name=
"android.intent.action.BOOT_COMPLETED"
/>
...
...
src/main/scala/com/github/shadowsocks/AppManager.scala
View file @
b4d3103b
...
@@ -203,7 +203,7 @@ class AppManager extends AppCompatActivity with OnMenuItemClickListener {
...
@@ -203,7 +203,7 @@ class AppManager extends AppCompatActivity with OnMenuItemClickListener {
this
.
setContentView
(
R
.
layout
.
layout_apps
)
this
.
setContentView
(
R
.
layout
.
layout_apps
)
toolbar
=
findViewById
(
R
.
id
.
toolbar
).
asInstanceOf
[
Toolbar
]
toolbar
=
findViewById
(
R
.
id
.
toolbar
).
asInstanceOf
[
Toolbar
]
toolbar
.
setTitle
(
R
.
string
.
proxied_apps
)
toolbar
.
setTitle
(
R
.
string
.
proxied_apps
)
toolbar
.
setNavigationIcon
(
R
.
drawable
.
abc_ic_ab_back_m
trl_am_alpha
)
toolbar
.
setNavigationIcon
(
R
.
drawable
.
abc_ic_ab_back_m
aterial
)
toolbar
.
setNavigationOnClickListener
((
v
:
View
)
=>
{
toolbar
.
setNavigationOnClickListener
((
v
:
View
)
=>
{
val
intent
=
getParentActivityIntent
val
intent
=
getParentActivityIntent
if
(
intent
==
null
)
finish
else
navigateUpTo
(
intent
)
if
(
intent
==
null
)
finish
else
navigateUpTo
(
intent
)
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksTileService.scala
0 → 100644
View file @
b4d3103b
package
com.github.shadowsocks
import
android.content.Intent
import
android.graphics.drawable.Icon
import
android.service.quicksettings.
{
Tile
,
TileService
}
import
com.github.shadowsocks.aidl.IShadowsocksServiceCallback
import
com.github.shadowsocks.utils.State
import
com.github.shadowsocks.ShadowsocksApplication.app
/**
* @author Mygod
*/
final
class
ShadowsocksTileService
extends
TileService
with
ServiceBoundContext
{
private
lazy
val
iconIdle
=
Icon
.
createWithResource
(
this
,
R
.
drawable
.
ic_start_idle
).
setTint
(
0x80ffffff
)
private
lazy
val
iconBusy
=
Icon
.
createWithResource
(
this
,
R
.
drawable
.
ic_start_busy
)
private
lazy
val
iconConnected
=
Icon
.
createWithResource
(
this
,
R
.
drawable
.
ic_start_connected
)
private
lazy
val
callback
=
new
IShadowsocksServiceCallback
.
Stub
{
def
trafficUpdated
(
txRate
:
Long
,
rxRate
:
Long
,
txTotal
:
Long
,
rxTotal
:
Long
)
=
()
def
stateChanged
(
state
:
Int
,
msg
:
String
)
{
val
tile
=
getQsTile
state
match
{
case
State
.
STOPPED
=>
tile
.
setIcon
(
iconIdle
)
tile
.
setLabel
(
getString
(
R
.
string
.
app_name
))
tile
.
setState
(
Tile
.
STATE_INACTIVE
)
case
State
.
CONNECTED
=>
tile
.
setIcon
(
iconConnected
)
tile
.
setLabel
(
app
.
currentProfile
match
{
case
Some
(
profile
)
=>
profile
.
name
case
None
=>
getString
(
R
.
string
.
app_name
)
})
tile
.
setState
(
Tile
.
STATE_ACTIVE
)
case
_
=>
tile
.
setIcon
(
iconBusy
)
tile
.
setLabel
(
getString
(
R
.
string
.
app_name
))
tile
.
setState
(
Tile
.
STATE_UNAVAILABLE
)
}
tile
.
updateTile
}
}
override
def
onServiceConnected
=
callback
.
stateChanged
(
bgService
.
getState
,
null
)
override
def
onStartListening
{
super
.
onStartListening
attachService
(
callback
)
}
override
def
onStopListening
{
super
.
onStopListening
detachService
// just in case the user switches to NAT mode
}
override
def
onClick
=
if
(
isLocked
)
unlockAndRun
(
configure
)
else
configure
()
private
def
configure
()
=
startActivityAndCollapse
(
new
Intent
(
this
,
classOf
[
Shadowsocks
]))
}
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