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
3630514a
Commit
3630514a
authored
Jun 23, 2019
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Late init WorkManager"
This reverts commit
33e5d4dd
. This fixes crashes caused by receivers.
parent
290aa646
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
core/src/main/java/com/github/shadowsocks/Core.kt
core/src/main/java/com/github/shadowsocks/Core.kt
+4
-1
core/src/main/java/com/github/shadowsocks/utils/DeviceStorageApp.kt
...ain/java/com/github/shadowsocks/utils/DeviceStorageApp.kt
+4
-6
No files found.
core/src/main/java/com/github/shadowsocks/Core.kt
View file @
3630514a
...
...
@@ -37,6 +37,8 @@ import android.os.UserManager
import
androidx.annotation.RequiresApi
import
androidx.core.content.ContextCompat
import
androidx.core.content.getSystemService
import
androidx.work.Configuration
import
androidx.work.WorkManager
import
com.crashlytics.android.Crashlytics
import
com.github.shadowsocks.acl.Acl
import
com.github.shadowsocks.aidl.ShadowsocksConnection
...
...
@@ -62,7 +64,7 @@ object Core {
lateinit
var
configureIntent
:
(
Context
)
->
PendingIntent
val
connectivity
by
lazy
{
app
.
getSystemService
<
ConnectivityManager
>()
!!
}
val
packageInfo
:
PackageInfo
by
lazy
{
getPackageInfo
(
app
.
packageName
)
}
val
deviceStorage
by
lazy
{
DeviceStorageApp
(
app
)
}
val
deviceStorage
by
lazy
{
if
(
Build
.
VERSION
.
SDK_INT
<
24
)
app
else
DeviceStorageApp
(
app
)
}
val
analytics
:
FirebaseAnalytics
by
lazy
{
FirebaseAnalytics
.
getInstance
(
deviceStorage
)
}
val
directBootSupported
by
lazy
{
Build
.
VERSION
.
SDK_INT
>=
24
&&
app
.
getSystemService
<
DevicePolicyManager
>()
?.
storageEncryptionStatus
==
...
...
@@ -103,6 +105,7 @@ object Core {
System
.
setProperty
(
DEBUG_PROPERTY_NAME
,
DEBUG_PROPERTY_VALUE_ON
)
Fabric
.
with
(
deviceStorage
,
Crashlytics
())
// multiple processes needs manual set-up
FirebaseApp
.
initializeApp
(
deviceStorage
)
WorkManager
.
initialize
(
deviceStorage
,
Configuration
.
Builder
().
build
())
// handle data restored/crash
if
(
Build
.
VERSION
.
SDK_INT
>=
24
&&
DataStore
.
directBootAware
&&
...
...
core/src/main/java/com/github/shadowsocks/utils/DeviceStorageApp.kt
View file @
3630514a
...
...
@@ -21,15 +21,15 @@
package
com.github.shadowsocks.utils
import
android.annotation.SuppressLint
import
android.annotation.TargetApi
import
android.app.Application
import
android.content.Context
import
android.os.Build
import
androidx.work.Configuration
@SuppressLint
(
"Registered"
)
class
DeviceStorageApp
(
context
:
Context
)
:
Application
(),
Configuration
.
Provider
{
@TargetApi
(
24
)
class
DeviceStorageApp
(
context
:
Context
)
:
Application
()
{
init
{
attachBaseContext
(
if
(
Build
.
VERSION
.
SDK_INT
>=
24
)
context
.
createDeviceProtectedStorageContext
()
else
context
)
attachBaseContext
(
context
.
createDeviceProtectedStorageContext
()
)
}
/**
...
...
@@ -37,6 +37,4 @@ class DeviceStorageApp(context: Context) : Application(), Configuration.Provider
* protected storage.
*/
override
fun
getApplicationContext
()
=
this
override
fun
getWorkManagerConfiguration
()
=
Configuration
.
Builder
().
build
()
}
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