Update dependencies

Jcenter will sunset
2025-12-13 13:51:49 +00:00 · 2021-04-17 17:32:07 +08:00
parent a328e2bf3c
commit 69b00d3782
21 changed files with 40 additions and 47 deletions
--- a/app/src/main/java/com/topjohnwu/magisk/arch/BaseViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/arch/BaseViewModel.kt
@@ -19,7 +19,7 @@ import com.topjohnwu.magisk.events.*
 import com.topjohnwu.magisk.utils.ObservableHost
 import com.topjohnwu.magisk.utils.set
 import kotlinx.coroutines.Job
-import org.koin.core.KoinComponent
+import org.koin.core.component.KoinComponent

 abstract class BaseViewModel(
    initialState: State = State.LOADING
--- a/app/src/main/java/com/topjohnwu/magisk/core/Receiver.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/Receiver.kt
@@ -5,11 +5,11 @@ import android.content.ContextWrapper
 import android.content.Intent
 import com.topjohnwu.magisk.core.base.BaseReceiver
 import com.topjohnwu.magisk.core.magiskdb.PolicyDao
+import com.topjohnwu.magisk.ktx.inject
 import com.topjohnwu.magisk.view.Shortcuts
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import org.koin.core.inject

 open class Receiver : BaseReceiver() {

--- a/app/src/main/java/com/topjohnwu/magisk/core/UpdateCheckService.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/UpdateCheckService.kt
@@ -5,9 +5,9 @@ import android.content.Context
 import androidx.work.*
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.data.repository.NetworkService
+import com.topjohnwu.magisk.ktx.inject
 import com.topjohnwu.magisk.view.Notifications
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
 import java.util.concurrent.TimeUnit

 class UpdateCheckService(context: Context, workerParams: WorkerParameters)
--- a/app/src/main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt
@@ -83,6 +83,7 @@ abstract class BaseActivity : AppCompatActivity() {

    override fun onRequestPermissionsResult(
        requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
        var success = true
        for (res in grantResults) {
            if (res != PackageManager.PERMISSION_GRANTED) {
--- a/app/src/main/java/com/topjohnwu/magisk/core/base/BaseReceiver.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/base/BaseReceiver.kt
@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
 import com.topjohnwu.magisk.core.wrap
-import org.koin.core.KoinComponent
+import org.koin.core.component.KoinComponent

 abstract class BaseReceiver : BroadcastReceiver(), KoinComponent {

--- a/app/src/main/java/com/topjohnwu/magisk/core/base/BaseService.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/base/BaseService.kt
@@ -3,7 +3,7 @@ package com.topjohnwu.magisk.core.base
 import android.app.Service
 import android.content.Context
 import com.topjohnwu.magisk.core.wrap
-import org.koin.core.KoinComponent
+import org.koin.core.component.KoinComponent

 abstract class BaseService : Service(), KoinComponent {
    override fun attachBaseContext(base: Context) {
--- a/app/src/main/java/com/topjohnwu/magisk/core/download/BaseDownloader.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/download/BaseDownloader.kt
@@ -10,14 +10,14 @@ import com.topjohnwu.magisk.core.ForegroundTracker
 import com.topjohnwu.magisk.core.base.BaseService
 import com.topjohnwu.magisk.core.utils.ProgressInputStream
 import com.topjohnwu.magisk.data.repository.NetworkService
+import com.topjohnwu.magisk.ktx.inject
 import com.topjohnwu.magisk.view.Notifications
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import okhttp3.ResponseBody
-import org.koin.android.ext.android.inject
-import org.koin.core.KoinComponent
+import org.koin.core.component.KoinComponent
 import timber.log.Timber
 import java.io.IOException
 import java.io.InputStream
--- a/app/src/main/java/com/topjohnwu/magisk/core/tasks/FlashZip.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/tasks/FlashZip.kt
@@ -7,12 +7,13 @@ import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.displayName
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
 import com.topjohnwu.magisk.core.utils.unzip
+import com.topjohnwu.magisk.ktx.inject
 import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+
 import timber.log.Timber
 import java.io.File
 import java.io.FileNotFoundException
--- a/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
@@ -14,10 +14,7 @@ import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
 import com.topjohnwu.magisk.data.repository.NetworkService
 import com.topjohnwu.magisk.di.Protected
-import com.topjohnwu.magisk.ktx.reboot
-import com.topjohnwu.magisk.ktx.symlink
-import com.topjohnwu.magisk.ktx.withStreams
-import com.topjohnwu.magisk.ktx.writeTo
+import com.topjohnwu.magisk.ktx.*
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.signing.SignBoot
 import com.topjohnwu.superuser.Shell
@@ -34,8 +31,7 @@ import org.kamranzafar.jtar.TarEntry
 import org.kamranzafar.jtar.TarHeader
 import org.kamranzafar.jtar.TarInputStream
 import org.kamranzafar.jtar.TarOutputStream
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
 import timber.log.Timber
 import java.io.*
 import java.nio.ByteBuffer
--- a/app/src/main/java/com/topjohnwu/magisk/core/utils/BiometricHelper.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/utils/BiometricHelper.kt
@@ -6,8 +6,8 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Config
-import org.koin.core.KoinComponent
-import org.koin.core.get
+import com.topjohnwu.magisk.ktx.get
+import org.koin.core.component.KoinComponent

 object BiometricHelper: KoinComponent {

--- a/app/src/main/java/com/topjohnwu/magisk/events/dialog/ManagerInstallDialog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/events/dialog/ManagerInstallDialog.kt
@@ -6,9 +6,9 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.core.download.Subject
 import com.topjohnwu.magisk.data.repository.NetworkService
+import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.ktx.inject
 import com.topjohnwu.magisk.view.MagiskDialog
-import org.koin.core.get
-import org.koin.core.inject
 import java.io.File

 class ManagerInstallDialog : MarkDownDialog() {
--- a/app/src/main/java/com/topjohnwu/magisk/events/dialog/MarkDownDialog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/events/dialog/MarkDownDialog.kt
@@ -6,13 +6,13 @@ import androidx.annotation.CallSuper
 import androidx.lifecycle.lifecycleScope
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.base.BaseActivity
+import com.topjohnwu.magisk.ktx.inject
 import com.topjohnwu.magisk.view.MagiskDialog
 import io.noties.markwon.Markwon
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
 import timber.log.Timber
 import kotlin.coroutines.cancellation.CancellationException

--- a/app/src/main/java/com/topjohnwu/magisk/ktx/XKoin.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/XKoin.kt
@@ -1,10 +1,10 @@
 package com.topjohnwu.magisk.ktx

-import org.koin.core.context.KoinContextHandler
+import org.koin.core.context.GlobalContext
 import org.koin.core.parameter.ParametersDefinition
 import org.koin.core.qualifier.Qualifier

-fun getKoin() = KoinContextHandler.get()
+fun getKoin() = GlobalContext.get()

 inline fun <reified T> inject(
    qualifier: Qualifier? = null,
--- a/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
@@ -14,11 +14,11 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.data.repository.NetworkService
 import com.topjohnwu.magisk.events.MagiskInstallFileEvent
 import com.topjohnwu.magisk.events.dialog.SecondSlotWarningDialog
+import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.ui.flash.FlashFragment
 import com.topjohnwu.magisk.utils.set
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.launch
-import org.koin.core.get
 import timber.log.Timber
 import java.io.File
 import java.io.IOException
--- a/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/CheckSafetyNetEvent.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/CheckSafetyNetEvent.kt
@@ -14,6 +14,7 @@ import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.data.repository.NetworkService
 import com.topjohnwu.magisk.ktx.createClassLoader
 import com.topjohnwu.magisk.ktx.reflectField
+import com.topjohnwu.magisk.ktx.inject
 import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.signing.CryptoUtils
@@ -26,8 +27,7 @@ import kotlinx.coroutines.withContext
 import org.bouncycastle.asn1.ASN1Encoding
 import org.bouncycastle.asn1.ASN1Primitive
 import org.bouncycastle.est.jcajce.JsseDefaultHostnameAuthorizer
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
 import timber.log.Timber
 import java.io.ByteArrayInputStream
 import java.io.File
--- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/BaseSettingsItem.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/BaseSettingsItem.kt
@@ -9,12 +9,12 @@ import androidx.databinding.Bindable
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.ObservableItem
+import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.utils.TextHolder
 import com.topjohnwu.magisk.utils.asText
 import com.topjohnwu.magisk.utils.set
 import com.topjohnwu.magisk.view.MagiskDialog
-import org.koin.core.KoinComponent
-import org.koin.core.get
+import org.koin.core.component.KoinComponent

 sealed class BaseSettingsItem : ObservableItem<BaseSettingsItem>() {

--- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
@@ -22,10 +22,10 @@ import com.topjohnwu.magisk.events.AddHomeIconEvent
 import com.topjohnwu.magisk.events.RecreateEvent
 import com.topjohnwu.magisk.events.dialog.BiometricEvent
 import com.topjohnwu.magisk.ktx.activity
+import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.launch
-import org.koin.core.get

 class SettingsViewModel(
    private val repositoryDao: RepoDao