Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
5b28a713
Commit
5b28a713
authored
Jul 24, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move functions around
parent
f1fb7404
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
33 deletions
+30
-33
build.gradle.kts
app/build.gradle.kts
+3
-3
build.gradle.kts
app/signing/build.gradle.kts
+2
-2
SplashActivity.kt
...src/main/java/com/topjohnwu/magisk/core/SplashActivity.kt
+1
-2
UpdateCheckService.kt
...main/java/com/topjohnwu/magisk/core/UpdateCheckService.kt
+22
-2
Utils.kt
app/src/main/java/com/topjohnwu/magisk/core/utils/Utils.kt
+0
-23
SettingsItems.kt
...in/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
+2
-1
No files found.
app/build.gradle.kts
View file @
5b28a713
...
...
@@ -140,10 +140,10 @@ dependencies {
implementation
(
"androidx.preference:preference:1.1.1"
)
implementation
(
"androidx.recyclerview:recyclerview:1.1.0"
)
implementation
(
"androidx.fragment:fragment-ktx:1.2.5"
)
implementation
(
"androidx.work:work-runtime-ktx:2.
3.4
"
)
implementation
(
"androidx.work:work-runtime-ktx:2.
4.0
"
)
implementation
(
"androidx.transition:transition:1.3.1"
)
implementation
(
"androidx.multidex:multidex:2.0.1"
)
implementation
(
"androidx.core:core-ktx:1.3.
0
"
)
implementation
(
"androidx.core:core-ktx:1.3.
1
"
)
implementation
(
"androidx.localbroadcastmanager:localbroadcastmanager:1.0.0"
)
implementation
(
"com.google.android.material:material:1.2.0-
beta
01"
)
implementation
(
"com.google.android.material:material:1.2.0-
rc
01"
)
}
app/signing/build.gradle.kts
View file @
5b28a713
...
...
@@ -30,6 +30,6 @@ repositories {
dependencies
{
implementation
(
fileTree
(
mapOf
(
"dir"
to
"libs"
,
"include"
to
listOf
(
"*.jar"
))))
api
(
"org.bouncycastle:bcprov-jdk15on:1.6
5.01
"
)
api
(
"org.bouncycastle:bcpkix-jdk15on:1.6
5
"
)
api
(
"org.bouncycastle:bcprov-jdk15on:1.6
6
"
)
api
(
"org.bouncycastle:bcpkix-jdk15on:1.6
6
"
)
}
app/src/main/java/com/topjohnwu/magisk/core/SplashActivity.kt
View file @
5b28a713
...
...
@@ -5,7 +5,6 @@ import android.content.Context
import
android.os.Bundle
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.magisk.core.view.Notifications
import
com.topjohnwu.magisk.core.view.Shortcuts
import
com.topjohnwu.magisk.data.network.GithubRawServices
...
...
@@ -52,7 +51,7 @@ open class SplashActivity : Activity() {
Config
.
initialize
()
handleRepackage
()
Notifications
.
setup
(
this
)
U
tils
.
scheduleUpdateCheck
(
this
)
U
pdateCheckService
.
schedule
(
this
)
Shortcuts
.
setup
(
this
)
// Pre-fetch network stuffs
...
...
app/src/main/java/com/topjohnwu/magisk/core/UpdateCheckService.kt
View file @
5b28a713
package
com.topjohnwu.magisk.core
import
android.content.Context
import
androidx.work.CoroutineWorker
import
androidx.work.WorkerParameters
import
androidx.work.*
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.core.view.Notifications
import
com.topjohnwu.magisk.data.repository.MagiskRepository
...
...
@@ -11,6 +10,7 @@ import kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.withContext
import
org.koin.core.KoinComponent
import
org.koin.core.inject
import
java.util.concurrent.TimeUnit
class
UpdateCheckService
(
context
:
Context
,
workerParams
:
WorkerParameters
)
:
CoroutineWorker
(
context
,
workerParams
),
KoinComponent
{
...
...
@@ -30,4 +30,24 @@ class UpdateCheckService(context: Context, workerParams: WorkerParameters)
Result
.
success
()
}
?:
Result
.
failure
()
}
companion
object
{
fun
schedule
(
context
:
Context
)
{
if
(
Config
.
checkUpdate
)
{
val
constraints
=
Constraints
.
Builder
()
.
setRequiredNetworkType
(
NetworkType
.
CONNECTED
)
.
setRequiresDeviceIdle
(
true
)
.
build
()
val
request
=
PeriodicWorkRequestBuilder
<
UpdateCheckService
>(
12
,
TimeUnit
.
HOURS
)
.
setConstraints
(
constraints
)
.
build
()
WorkManager
.
getInstance
(
context
).
enqueueUniquePeriodicWork
(
Const
.
ID
.
CHECK_MAGISK_UPDATE_WORKER_ID
,
ExistingPeriodicWorkPolicy
.
REPLACE
,
request
)
}
else
{
WorkManager
.
getInstance
(
context
)
.
cancelUniqueWork
(
Const
.
ID
.
CHECK_MAGISK_UPDATE_WORKER_ID
)
}
}
}
}
app/src/main/java/com/topjohnwu/magisk/core/utils/Utils.kt
View file @
5b28a713
...
...
@@ -6,16 +6,13 @@ import android.content.res.Resources
import
android.net.Uri
import
android.os.Environment
import
android.widget.Toast
import
androidx.work.*
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.UpdateCheckService
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.superuser.internal.UiThreadHandler
import
java.io.File
import
java.util.concurrent.TimeUnit
object
Utils
{
...
...
@@ -37,26 +34,6 @@ object Utils {
||
Config
.
suMultiuserMode
!=
Config
.
Value
.
MULTIUSER_MODE_OWNER_MANAGED
)
}
fun
scheduleUpdateCheck
(
context
:
Context
)
{
if
(
Config
.
checkUpdate
)
{
val
constraints
=
Constraints
.
Builder
()
.
setRequiredNetworkType
(
NetworkType
.
CONNECTED
)
.
setRequiresDeviceIdle
(
true
)
.
build
()
val
request
=
PeriodicWorkRequest
.
Builder
(
UpdateCheckService
::
class
.
java
,
12
,
TimeUnit
.
HOURS
)
.
setConstraints
(
constraints
)
.
build
()
WorkManager
.
getInstance
(
context
).
enqueueUniquePeriodicWork
(
Const
.
ID
.
CHECK_MAGISK_UPDATE_WORKER_ID
,
ExistingPeriodicWorkPolicy
.
REPLACE
,
request
)
}
else
{
WorkManager
.
getInstance
(
context
)
.
cancelUniqueWork
(
Const
.
ID
.
CHECK_MAGISK_UPDATE_WORKER_ID
)
}
}
fun
openLink
(
context
:
Context
,
link
:
Uri
)
{
val
intent
=
Intent
(
Intent
.
ACTION_VIEW
,
link
)
intent
.
addFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
)
...
...
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
View file @
5b28a713
...
...
@@ -11,6 +11,7 @@ import com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.UpdateCheckService
import
com.topjohnwu.magisk.core.utils.BiometricHelper
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.magisk.core.utils.availableLocales
...
...
@@ -154,7 +155,7 @@ object UpdateChecker : SettingsItem.Toggle() {
override
var
value
=
Config
.
checkUpdate
set
(
value
)
=
setV
(
value
,
field
,
{
field
=
it
})
{
Config
.
checkUpdate
=
it
U
tils
.
scheduleUpdateCheck
(
get
())
U
pdateCheckService
.
schedule
(
get
())
}
}
...
...
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