gitea-mirror/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2026-01-13 21:36:58 -08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup stuffs

Browse Source
This commit is contained in:
topjohnwu
2020-02-22 01:28:33 -08:00
parent 581419b6a3
commit c6b3f06b95
8 changed files with 33 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/topjohnwu/magisk/core/Hacks.kt
View File

@@ -147,7 +147,6 @@ object ClassMap {
MainActivity::class.java to a.b::class.java,
SplashActivity::class.java to a.c::class.java,
FlashActivity::class.java to a.f::class.java,
UpdateCheckService::class.java to a.g::class.java,
GeneralReceiver::class.java to a.h::class.java,
DownloadService::class.java to a.j::class.java,
SuRequestActivity::class.java to a.m::class.java,

14
app/src/main/java/com/topjohnwu/magisk/core/UpdateCheckService.kt
View File

@@ -1,18 +1,20 @@
package com.topjohnwu.magisk.core
import androidx.work.ListenableWorker
import android.content.Context
import androidx.work.Worker
import androidx.work.WorkerParameters
import com.topjohnwu.magisk.BuildConfig
import com.topjohnwu.magisk.core.base.BaseWorkerWrapper
import com.topjohnwu.magisk.core.view.Notifications
import com.topjohnwu.magisk.data.repository.MagiskRepository
import com.topjohnwu.magisk.extensions.inject
import com.topjohnwu.superuser.Shell
class UpdateCheckService : BaseWorkerWrapper() {
class UpdateCheckService(context: Context, workerParams: WorkerParameters)
: Worker(context, workerParams) {
private val magiskRepo: MagiskRepository by inject()
override fun doWork(): ListenableWorker.Result {
override fun doWork(): Result {
// Make sure shell initializer was ran
Shell.getShell()
return runCatching {
@@ -21,9 +23,9 @@ class UpdateCheckService : BaseWorkerWrapper() {
Notifications.managerUpdate(applicationContext)
else if (Info.env.magiskVersionCode < Info.remote.magisk.versionCode)
Notifications.magiskUpdate(applicationContext)
ListenableWorker.Result.success()
Result.success()
}.getOrElse {
ListenableWorker.Result.failure()
Result.failure()
}
}
}

27
app/src/main/java/com/topjohnwu/magisk/core/utils/Utils.kt
View File

@@ -7,9 +7,11 @@ import android.net.Uri
import android.os.Environment
import android.widget.Toast
import androidx.work.*
import com.topjohnwu.magisk.BuildConfig
import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.core.*
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.extensions.get
import com.topjohnwu.superuser.internal.UiThreadHandler
import java.io.File
@@ -38,19 +40,20 @@ object Utils {
fun scheduleUpdateCheck(context: Context) {
if (Config.checkUpdate) {
val constraints = Constraints.Builder()
.setRequiredNetworkType(NetworkType.CONNECTED)
.setRequiresDeviceIdle(true)
.build()
.setRequiredNetworkType(NetworkType.CONNECTED)
.setRequiresDeviceIdle(true)
.build()
val request = PeriodicWorkRequest
.Builder(ClassMap[UpdateCheckService::class.java] as Class<Worker>, 12, TimeUnit.HOURS)
.setConstraints(constraints)
.build()
.Builder(UpdateCheckService::class.java, 12, TimeUnit.HOURS)
.setConstraints(constraints)
.build()
WorkManager.getInstance(context).enqueueUniquePeriodicWork(
Const.ID.CHECK_MAGISK_UPDATE_WORKER_ID,
ExistingPeriodicWorkPolicy.REPLACE, request)
Const.ID.CHECK_MAGISK_UPDATE_WORKER_ID,
ExistingPeriodicWorkPolicy.REPLACE, request
)
} else {
WorkManager.getInstance(context)
.cancelUniqueWork(Const.ID.CHECK_MAGISK_UPDATE_WORKER_ID)
.cancelUniqueWork(Const.ID.CHECK_MAGISK_UPDATE_WORKER_ID)
}
}
@@ -67,7 +70,7 @@ object Utils {
}
}
fun ensureDownloadPath(path : String) =
fun ensureDownloadPath(path: String) =
File(Environment.getExternalStorageDirectory(), path).run {
if ((exists() && isDirectory) || mkdirs()) this else null
}