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
2e1564b7
Commit
2e1564b7
authored
Jul 14, 2017
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove usage of BuildCompat
parent
250373b9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
12 deletions
+8
-12
mobile/src/main/scala/com/github/shadowsocks/BaseService.scala
...e/src/main/scala/com/github/shadowsocks/BaseService.scala
+3
-5
mobile/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
...scala/com/github/shadowsocks/ShadowsocksApplication.scala
+2
-3
mobile/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerService.scala
...ala/com/github/shadowsocks/ShadowsocksRunnerService.scala
+2
-2
mobile/src/main/scala/com/github/shadowsocks/utils/Utils.scala
...e/src/main/scala/com/github/shadowsocks/utils/Utils.scala
+1
-2
No files found.
mobile/src/main/scala/com/github/shadowsocks/BaseService.scala
View file @
2e1564b7
...
...
@@ -21,16 +21,14 @@
package
com.github.shadowsocks
import
java.io.
{
File
,
IOException
}
import
java.net.
{
Inet6Address
,
InetAddress
}
import
java.util
import
java.util.concurrent.TimeUnit
import
java.util.
{
Timer
,
TimerTask
}
import
java.net.InetAddress
import
java.net.Inet6Address
import
android.app.Service
import
android.content.
{
BroadcastReceiver
,
Context
,
Intent
,
IntentFilter
}
import
android.os.
{
Handler
,
IBinder
,
RemoteCallbackList
}
import
android.support.v4.os.BuildCompat
import
android.os.
{
Build
,
Handler
,
IBinder
,
RemoteCallbackList
}
import
android.text.TextUtils
import
android.util.Log
import
android.widget.Toast
...
...
@@ -166,7 +164,7 @@ trait BaseService extends Service {
def
startRunner
(
profile
:
Profile
)
{
this
.
profile
=
profile
if
(
Build
Compat
.
isAtLeastO
)
startForegroundService
(
new
Intent
(
this
,
getClass
))
if
(
Build
.
VERSION
.
SDK_INT
>=
26
)
startForegroundService
(
new
Intent
(
this
,
getClass
))
else
startService
(
new
Intent
(
this
,
getClass
))
TrafficMonitor
.
reset
()
trafficMonitorThread
=
new
TrafficMonitorThread
(
getApplicationContext
)
...
...
mobile/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
View file @
2e1564b7
...
...
@@ -29,7 +29,6 @@ import android.content._
import
android.content.res.Configuration
import
android.os.
{
Build
,
LocaleList
}
import
android.preference.PreferenceManager
import
android.support.v4.os.BuildCompat
import
android.support.v7.app.AppCompatDelegate
import
android.util.Log
import
com.evernote.android.job.JobManager
...
...
@@ -43,8 +42,8 @@ import com.google.firebase.remoteconfig.FirebaseRemoteConfig
import
com.j256.ormlite.logger.LocalLog
import
eu.chainfire.libsuperuser.Shell
import
scala.collection.mutable.ArrayBuffer
import
scala.collection.JavaConversions._
import
scala.collection.mutable.ArrayBuffer
object
ShadowsocksApplication
{
var
app
:
ShadowsocksApplication
=
_
...
...
@@ -157,7 +156,7 @@ class ShadowsocksApplication extends Application {
TcpFastOpen
.
enabled
(
settings
.
getBoolean
(
Key
.
tfo
,
TcpFastOpen
.
sendEnabled
))
if
(
Build
Compat
.
isAtLeastO
)
getSystemService
(
classOf
[
NotificationManager
]).
createNotificationChannels
(
List
(
if
(
Build
.
VERSION
.
SDK_INT
>=
26
)
getSystemService
(
classOf
[
NotificationManager
]).
createNotificationChannels
(
List
(
new
NotificationChannel
(
"service-vpn"
,
getText
(
R
.
string
.
service_vpn
),
NotificationManager
.
IMPORTANCE_MIN
),
new
NotificationChannel
(
"service-nat"
,
getText
(
R
.
string
.
service_nat
),
NotificationManager
.
IMPORTANCE_LOW
)
))
...
...
mobile/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerService.scala
View file @
2e1564b7
...
...
@@ -23,7 +23,7 @@ package com.github.shadowsocks
import
android.app.Service
import
android.content.Intent
import
android.net.VpnService
import
android.os.
{
Handler
,
IBinder
}
import
android.os.
{
Build
,
Handler
,
IBinder
}
import
android.support.v4.app.NotificationCompat
import
android.support.v4.os.BuildCompat
import
com.github.shadowsocks.ShadowsocksApplication.app
...
...
@@ -49,7 +49,7 @@ class ShadowsocksRunnerService extends Service with ServiceBoundContext {
override
def
onCreate
()
{
super
.
onCreate
()
if
(
Build
Compat
.
isAtLeastO
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
26
)
{
val
builder
=
new
NotificationCompat
.
Builder
(
this
)
builder
.
setPriority
(
NotificationCompat
.
PRIORITY_MIN
)
startForeground
(
1
,
builder
.
build
)
...
...
mobile/src/main/scala/com/github/shadowsocks/utils/Utils.scala
View file @
2e1564b7
...
...
@@ -28,7 +28,6 @@ import android.content.pm.PackageManager
import
android.content.
{
Context
,
Intent
}
import
android.graphics._
import
android.os.Build
import
android.support.v4.os.BuildCompat
import
android.util.
{
Base64
,
DisplayMetrics
,
Log
}
import
android.view.View.MeasureSpec
import
android.view.
{
Gravity
,
View
,
Window
}
...
...
@@ -139,7 +138,7 @@ object Utils {
def
startSsService
(
context
:
Context
)
{
val
intent
=
new
Intent
(
context
,
classOf
[
ShadowsocksRunnerService
])
if
(
Build
Compat
.
isAtLeastO
)
context
.
startForegroundService
(
intent
)
if
(
Build
.
VERSION
.
SDK_INT
>=
26
)
context
.
startForegroundService
(
intent
)
else
context
.
startService
(
intent
)
}
...
...
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