br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Remove unused files

Browse Source
This commit is contained in:
topjohnwu
2019-08-08 00:29:27 -07:00
parent 5ba5f5f94e
commit 48395ba860
22 changed files with 29 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+11
View File
@@ -15,6 +15,17 @@ import com.topjohnwu.magisk.ui.base.MagiskViewModel
import com.topjohnwu.magisk.utils.ISafetyNetHelper
import com.topjohnwu.superuser.Shell
enum class SafetyNetState {
LOADING, PASS, FAILED, IDLE
}
enum class MagiskState {
NO_ROOT, NOT_INSTALLED, UP_TO_DATE, OBSOLETE, LOADING
}
enum class MagiskItem {
MANAGER, MAGISK
}
class HomeViewModel(
private val magiskRepo: MagiskRepository
app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskItem.kt
-6
View File
@@ -1,6 +0,0 @@
package com.topjohnwu.magisk.ui.home
enum class MagiskItem {
MANAGER, MAGISK
}
app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskState.kt
-6
View File
@@ -1,6 +0,0 @@
package com.topjohnwu.magisk.ui.home
enum class MagiskState {
NO_ROOT, NOT_INSTALLED, UP_TO_DATE, OBSOLETE, LOADING
}
app/src/main/java/com/topjohnwu/magisk/ui/home/SafetyNetState.kt
-5
View File
@@ -1,5 +0,0 @@
package com.topjohnwu.magisk.ui.home
enum class SafetyNetState {
LOADING, PASS, FAILED, IDLE
}
app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
+1 -2
View File
@@ -13,7 +13,6 @@ import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.data.database.PolicyDao
import com.topjohnwu.magisk.extensions.toggle
import com.topjohnwu.magisk.model.entity.MagiskPolicy
import com.topjohnwu.magisk.model.entity.Policy
import com.topjohnwu.magisk.model.entity.recycler.PolicyRvItem
import com.topjohnwu.magisk.model.events.PolicyEnableEvent
import com.topjohnwu.magisk.model.events.PolicyUpdateEvent
@@ -118,7 +117,7 @@ class SuperuserViewModel(
val app = item.item.copy(policy = if (enable) MagiskPolicy.ALLOW else MagiskPolicy.DENY)
updatePolicy(app)
.map { it.policy == Policy.ALLOW }
.map { it.policy == MagiskPolicy.ALLOW }
.subscribeK {
val textId = if (it) R.string.su_snack_grant else R.string.su_snack_deny
val text = resources.getString(textId).format(item.item.appName)
app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
+2 -2
View File
@@ -8,7 +8,7 @@ import android.view.Window
import com.skoumal.teanity.viewevents.ViewEvent
import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.databinding.ActivityRequestBinding
import com.topjohnwu.magisk.model.entity.Policy
import com.topjohnwu.magisk.model.entity.MagiskPolicy
import com.topjohnwu.magisk.model.events.DieEvent
import com.topjohnwu.magisk.model.receiver.GeneralReceiver
import com.topjohnwu.magisk.ui.base.MagiskActivity
@@ -21,7 +21,7 @@ open class SuRequestActivity : MagiskActivity<SuRequestViewModel, ActivityReques
override val viewModel: SuRequestViewModel by viewModel()
override fun onBackPressed() {
viewModel.handler?.handleAction(Policy.DENY, -1)
viewModel.handler?.handleAction(MagiskPolicy.DENY, -1)
}
override fun onCreate(savedInstanceState: Bundle?) {
app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt
+7 -8
View File
@@ -19,7 +19,6 @@ import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.data.database.PolicyDao
import com.topjohnwu.magisk.extensions.now
import com.topjohnwu.magisk.model.entity.MagiskPolicy
import com.topjohnwu.magisk.model.entity.Policy
import com.topjohnwu.magisk.model.entity.recycler.SpinnerRvItem
import com.topjohnwu.magisk.model.entity.toPolicy
import com.topjohnwu.magisk.model.events.DieEvent
@@ -94,12 +93,12 @@ class SuRequestViewModel(
}
fun grantPressed() {
handler?.handleAction(Policy.ALLOW)
handler?.handleAction(MagiskPolicy.ALLOW)
timer?.cancel()
}
fun denyPressed() {
handler?.handleAction(Policy.DENY)
handler?.handleAction(MagiskPolicy.DENY)
timer?.cancel()
}
@@ -168,18 +167,18 @@ class SuRequestViewModel(
return false
// If not interactive, response directly
if (policy?.policy != Policy.INTERACTIVE) {
if (policy?.policy != MagiskPolicy.INTERACTIVE) {
handler?.handleAction()
return true
}
when (Config.suAutoReponse) {
Config.Value.SU_AUTO_DENY -> {
handler?.handleAction(Policy.DENY, 0)
handler?.handleAction(MagiskPolicy.DENY, 0)
return true
}
Config.Value.SU_AUTO_ALLOW -> {
handler?.handleAction(Policy.ALLOW, 0)
handler?.handleAction(MagiskPolicy.ALLOW, 0)
return true
}
}
@@ -199,7 +198,7 @@ class SuRequestViewModel(
override fun onFinish() {
denyText.value = resources.getString(R.string.deny)
handler?.handleAction(Policy.DENY)
handler?.handleAction(MagiskPolicy.DENY)
}
}
timer?.start()
@@ -229,7 +228,7 @@ class SuRequestViewModel(
}
override fun onAuthenticationSucceeded(result: FingerprintManager.AuthenticationResult) {
handler?.handleAction(Policy.ALLOW)
handler?.handleAction(MagiskPolicy.ALLOW)
}
override fun onAuthenticationFailed() {