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
400e1568
Commit
400e1568
authored
Jun 11, 2020
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not use WorkManager in device storage
parent
70457b42
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
36 additions
and
29 deletions
+36
-29
core/build.gradle.kts
core/build.gradle.kts
+1
-1
core/src/main/java/com/github/shadowsocks/BootReceiver.kt
core/src/main/java/com/github/shadowsocks/BootReceiver.kt
+1
-4
core/src/main/java/com/github/shadowsocks/Core.kt
core/src/main/java/com/github/shadowsocks/Core.kt
+11
-8
core/src/main/java/com/github/shadowsocks/acl/AclSyncer.kt
core/src/main/java/com/github/shadowsocks/acl/AclSyncer.kt
+15
-10
core/src/main/java/com/github/shadowsocks/bg/BaseService.kt
core/src/main/java/com/github/shadowsocks/bg/BaseService.kt
+6
-4
mobile/src/main/java/com/github/shadowsocks/App.kt
mobile/src/main/java/com/github/shadowsocks/App.kt
+1
-1
tv/src/main/java/com/github/shadowsocks/tv/App.kt
tv/src/main/java/com/github/shadowsocks/tv/App.kt
+1
-1
No files found.
core/build.gradle.kts
View file @
400e1568
...
...
@@ -68,7 +68,7 @@ tasks.clean.dependsOn("cargoClean")
dependencies
{
val
coroutinesVersion
=
"1.3.6"
val
roomVersion
=
"2.2.5"
val
workVersion
=
"2.
3.4
"
val
workVersion
=
"2.
4.0-beta01
"
api
(
project
(
":plugin"
))
api
(
"androidx.fragment:fragment-ktx:1.2.4"
)
...
...
core/src/main/java/com/github/shadowsocks/BootReceiver.kt
View file @
400e1568
...
...
@@ -26,8 +26,6 @@ import android.content.Context
import
android.content.Intent
import
android.content.pm.PackageManager
import
android.os.Build
import
android.os.UserManager
import
androidx.core.content.getSystemService
import
com.github.shadowsocks.Core.app
import
com.github.shadowsocks.preference.DataStore
...
...
@@ -50,8 +48,7 @@ class BootReceiver : BroadcastReceiver() {
val
doStart
=
when
(
intent
.
action
)
{
Intent
.
ACTION_BOOT_COMPLETED
->
!
DataStore
.
directBootAware
Intent
.
ACTION_LOCKED_BOOT_COMPLETED
->
DataStore
.
directBootAware
else
->
DataStore
.
directBootAware
||
Build
.
VERSION
.
SDK_INT
>=
24
&&
app
.
getSystemService
<
UserManager
>()
?.
isUserUnlocked
!=
false
else
->
DataStore
.
directBootAware
||
Build
.
VERSION
.
SDK_INT
>=
24
&&
Core
.
user
.
isUserUnlocked
}
if
(
doStart
)
Core
.
startService
()
}
...
...
core/src/main/java/com/github/shadowsocks/Core.kt
View file @
400e1568
...
...
@@ -37,7 +37,6 @@ import androidx.annotation.VisibleForTesting
import
androidx.core.content.ContextCompat
import
androidx.core.content.getSystemService
import
androidx.work.Configuration
import
androidx.work.WorkManager
import
com.github.shadowsocks.acl.Acl
import
com.github.shadowsocks.aidl.ShadowsocksConnection
import
com.github.shadowsocks.core.BuildConfig
...
...
@@ -62,7 +61,7 @@ import java.io.File
import
java.io.IOException
import
kotlin.reflect.KClass
object
Core
{
object
Core
:
Configuration
.
Provider
{
lateinit
var
app
:
Application
@VisibleForTesting
set
lateinit
var
configureIntent
:
(
Context
)
->
PendingIntent
...
...
@@ -70,6 +69,7 @@ object Core {
val
clipboard
by
lazy
{
app
.
getSystemService
<
ClipboardManager
>()
!!
}
val
connectivity
by
lazy
{
app
.
getSystemService
<
ConnectivityManager
>()
!!
}
val
notification
by
lazy
{
app
.
getSystemService
<
NotificationManager
>()
!!
}
val
user
by
lazy
{
app
.
getSystemService
<
UserManager
>()
!!
}
val
packageInfo
:
PackageInfo
by
lazy
{
getPackageInfo
(
app
.
packageName
)
}
val
deviceStorage
by
lazy
{
if
(
Build
.
VERSION
.
SDK_INT
<
24
)
app
else
DeviceStorageApp
(
app
)
}
val
directBootSupported
by
lazy
{
...
...
@@ -121,14 +121,11 @@ object Core {
}
}
})
WorkManager
.
initialize
(
deviceStorage
,
Configuration
.
Builder
().
apply
{
setExecutor
{
GlobalScope
.
launch
{
it
.
run
()
}
}
setTaskExecutor
{
GlobalScope
.
launch
{
it
.
run
()
}
}
}.
build
())
// handle data restored/crash
if
(
Build
.
VERSION
.
SDK_INT
>=
24
&&
DataStore
.
directBootAware
&&
app
.
getSystemService
<
UserManager
>()
?.
isUserUnlocked
==
true
)
DirectBoot
.
flushTrafficStats
()
if
(
Build
.
VERSION
.
SDK_INT
>=
24
&&
DataStore
.
directBootAware
&&
user
.
isUserUnlocked
)
{
DirectBoot
.
flushTrafficStats
()
}
if
(
DataStore
.
publicStore
.
getLong
(
Key
.
assetUpdateTime
,
-
1
)
!=
packageInfo
.
lastUpdateTime
)
{
val
assetManager
=
app
.
assets
try
{
...
...
@@ -143,6 +140,12 @@ object Core {
updateNotificationChannels
()
}
override
fun
getWorkManagerConfiguration
()
=
Configuration
.
Builder
().
apply
{
setMinimumLoggingLevel
(
if
(
BuildConfig
.
DEBUG
)
Log
.
VERBOSE
else
Log
.
INFO
)
setExecutor
{
GlobalScope
.
launch
{
it
.
run
()
}
}
setTaskExecutor
{
GlobalScope
.
launch
{
it
.
run
()
}
}
}.
build
()
fun
updateNotificationChannels
()
{
if
(
Build
.
VERSION
.
SDK_INT
>=
26
)
@RequiresApi
(
26
)
{
notification
.
createNotificationChannels
(
listOf
(
...
...
core/src/main/java/com/github/shadowsocks/acl/AclSyncer.kt
View file @
400e1568
...
...
@@ -21,8 +21,10 @@
package
com.github.shadowsocks.acl
import
android.content.Context
import
android.os.Build
import
androidx.work.*
import
com.github.shadowsocks.Core
import
com.github.shadowsocks.Core.app
import
com.github.shadowsocks.utils.useCancellable
import
timber.log.Timber
import
java.io.IOException
...
...
@@ -34,7 +36,9 @@ class AclSyncer(context: Context, workerParams: WorkerParameters) : CoroutineWor
companion
object
{
private
const
val
KEY_ROUTE
=
"route"
fun
schedule
(
route
:
String
)
=
WorkManager
.
getInstance
(
Core
.
deviceStorage
).
enqueueUniqueWork
(
fun
schedule
(
route
:
String
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
24
&&
!
Core
.
user
.
isUserUnlocked
)
return
// work does not support this
WorkManager
.
getInstance
(
app
).
enqueueUniqueWork
(
route
,
ExistingWorkPolicy
.
REPLACE
,
OneTimeWorkRequestBuilder
<
AclSyncer
>().
run
{
setInputData
(
Data
.
Builder
().
putString
(
KEY_ROUTE
,
route
).
build
())
setConstraints
(
Constraints
.
Builder
()
...
...
@@ -45,6 +49,7 @@ class AclSyncer(context: Context, workerParams: WorkerParameters) : CoroutineWor
build
()
})
}
}
override
suspend
fun
doWork
():
Result
=
try
{
val
route
=
inputData
.
getString
(
KEY_ROUTE
)
!!
...
...
core/src/main/java/com/github/shadowsocks/bg/BaseService.kt
View file @
400e1568
...
...
@@ -24,8 +24,10 @@ import android.app.Service
import
android.content.Context
import
android.content.Intent
import
android.content.IntentFilter
import
android.os.*
import
androidx.core.content.getSystemService
import
android.os.Build
import
android.os.IBinder
import
android.os.RemoteCallbackList
import
android.os.RemoteException
import
com.github.shadowsocks.BootReceiver
import
com.github.shadowsocks.Core
import
com.github.shadowsocks.Core.app
...
...
@@ -238,8 +240,8 @@ object BaseService {
val
isVpnService
get
()
=
false
suspend
fun
startProcesses
()
{
val
con
figRoot
=
(
if
(
Build
.
VERSION
.
SDK_INT
<
24
||
app
.
getSystemService
<
UserManager
>()
?.
isUserUnlocked
!=
false
)
app
else
Core
.
deviceStorage
)
.
noBackupFilesDir
val
con
text
=
if
(
Build
.
VERSION
.
SDK_INT
<
24
||
Core
.
user
.
isUserUnlocked
)
app
else
Core
.
deviceStorage
val
configRoot
=
context
.
noBackupFilesDir
val
udpFallback
=
data
.
udpFallback
data
.
proxy
!!
.
start
(
this
,
File
(
Core
.
deviceStorage
.
noBackupFilesDir
,
"stat_main"
),
...
...
mobile/src/main/java/com/github/shadowsocks/App.kt
View file @
400e1568
...
...
@@ -24,7 +24,7 @@ import android.app.Application
import
android.content.res.Configuration
import
androidx.appcompat.app.AppCompatDelegate
class
App
:
Application
()
{
class
App
:
Application
()
,
androidx
.
work
.
Configuration
.
Provider
by
Core
{
override
fun
onCreate
()
{
super
.
onCreate
()
Core
.
init
(
this
,
MainActivity
::
class
)
...
...
tv/src/main/java/com/github/shadowsocks/tv/App.kt
View file @
400e1568
...
...
@@ -24,7 +24,7 @@ import android.app.Application
import
android.content.res.Configuration
import
com.github.shadowsocks.Core
class
App
:
Application
()
{
class
App
:
Application
()
,
androidx
.
work
.
Configuration
.
Provider
by
Core
{
override
fun
onCreate
()
{
super
.
onCreate
()
Core
.
init
(
this
,
MainActivity
::
class
)
...
...
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