TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-08-20 08:47:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed usage of old database object

Browse Source
This commit is contained in:
Viktor De Pasquale
2019-05-12 18:00:58 +02:00
parent d546733287
commit 0245e13591
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt
View File

@@ -15,9 +15,11 @@ import com.skoumal.teanity.util.KObservableField
import com.topjohnwu.magisk.BuildConfig import com.topjohnwu.magisk.BuildConfig
import com.topjohnwu.magisk.Config import com.topjohnwu.magisk.Config
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.data.database.MagiskDB import com.topjohnwu.magisk.data.repository.AppRepository
import com.topjohnwu.magisk.model.entity.MagiskPolicy
import com.topjohnwu.magisk.model.entity.Policy import com.topjohnwu.magisk.model.entity.Policy
import com.topjohnwu.magisk.model.entity.recycler.SpinnerRvItem import com.topjohnwu.magisk.model.entity.recycler.SpinnerRvItem
import com.topjohnwu.magisk.model.entity.toPolicy
import com.topjohnwu.magisk.model.events.DieEvent import com.topjohnwu.magisk.model.events.DieEvent
import com.topjohnwu.magisk.ui.base.MagiskViewModel import com.topjohnwu.magisk.ui.base.MagiskViewModel
import com.topjohnwu.magisk.utils.FingerprintHelper import com.topjohnwu.magisk.utils.FingerprintHelper
@@ -29,7 +31,7 @@ import java.util.concurrent.TimeUnit.*
class SuRequestViewModel( class SuRequestViewModel(
private val packageManager: PackageManager, private val packageManager: PackageManager,
private val database: MagiskDB, private val appRepo: AppRepository,
private val timeoutPrefs: SharedPreferences, private val timeoutPrefs: SharedPreferences,
private val resources: Resources private val resources: Resources
) : MagiskViewModel() { ) : MagiskViewModel() {
@@ -52,7 +54,7 @@ class SuRequestViewModel(
var handler: ActionHandler? = null var handler: ActionHandler? = null
private var timer: CountDownTimer? = null private var timer: CountDownTimer? = null
private var policy: Policy? = null private var policy: MagiskPolicy? = null
set(value) { set(value) {
field = value field = value
updatePolicy(value) updatePolicy(value)
@@ -64,10 +66,10 @@ class SuRequestViewModel(
.let { items.update(it) } .let { items.update(it) }
} }
private fun updatePolicy(policy: Policy?) { private fun updatePolicy(policy: MagiskPolicy?) {
policy ?: return policy ?: return
icon.value = policy.info.loadIcon(packageManager) icon.value = policy.applicationInfo.loadIcon(packageManager)
title.value = policy.appName title.value = policy.appName
packageName.value = policy.packageName packageName.value = policy.packageName
@@ -107,8 +109,8 @@ class SuRequestViewModel(
} }
val bundle = connector.readSocketInput() val bundle = connector.readSocketInput()
val uid = bundle.getString("uid")?.toIntOrNull() ?: return false val uid = bundle.getString("uid")?.toIntOrNull() ?: return false
database.clearOutdated() appRepo.deleteOutdated().blockingGet() // wrong!
policy = database.getPolicy(uid) ?: Policy(uid, packageManager) policy = appRepo.fetch(uid).blockingGet() ?: uid.toPolicy(packageManager)
} catch (e: IOException) { } catch (e: IOException) {
e.printStackTrace() e.printStackTrace()
return false return false
@@ -130,18 +132,18 @@ class SuRequestViewModel(
} }
override fun handleAction(action: Int, time: Int) { override fun handleAction(action: Int, time: Int) {
policy?.apply { val until = if (time >= 0) {
policy = action if (time == 0) {
if (time >= 0) { 0
until = if (time == 0) { } else {
0 MILLISECONDS.toSeconds(now) + MINUTES.toSeconds(time.toLong())
} else {
MILLISECONDS.toSeconds(now) + MINUTES.toSeconds(time.toLong())
}
database.updatePolicy(this)
} }
} else {
policy?.until ?: 0
}
policy = policy?.copy(policy = action, until = until)?.apply {
appRepo.update(this).blockingGet()
} }
policy?.policy = action
handleAction() handleAction()
} }