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
f161cf8b
Commit
f161cf8b
authored
Oct 04, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed no-root state
parent
dc62ae95
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
HomeViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+2
-4
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
View file @
f161cf8b
...
...
@@ -22,7 +22,7 @@ enum class SafetyNetState {
}
enum
class
MagiskState
{
NO
_ROOT
,
NO
T_INSTALLED
,
UP_TO_DATE
,
OBSOLETE
,
LOADING
NOT_INSTALLED
,
UP_TO_DATE
,
OBSOLETE
,
LOADING
}
enum
class
MagiskItem
{
...
...
@@ -49,7 +49,6 @@ class HomeViewModel(
}
val
magiskStateText
=
Observer
(
magiskState
)
{
when
(
magiskState
.
value
)
{
MagiskState
.
NO_ROOT
->
TODO
()
MagiskState
.
NOT_INSTALLED
->
R
.
string
.
magisk_version_error
.
res
()
MagiskState
.
UP_TO_DATE
->
R
.
string
.
magisk_up_to_date
.
res
()
MagiskState
.
LOADING
->
R
.
string
.
checking_for_updates
.
res
()
...
...
@@ -71,7 +70,6 @@ class HomeViewModel(
}
val
managerStateText
=
Observer
(
managerState
)
{
when
(
managerState
.
value
)
{
MagiskState
.
NO_ROOT
->
"wtf"
MagiskState
.
NOT_INSTALLED
->
R
.
string
.
invalid_update_channel
.
res
()
MagiskState
.
UP_TO_DATE
->
R
.
string
.
manager_up_to_date
.
res
()
MagiskState
.
LOADING
->
R
.
string
.
checking_for_updates
.
res
()
...
...
@@ -234,7 +232,7 @@ class HomeViewModel(
private
fun
ensureEnv
()
{
val
invalidStates
=
listOf
(
MagiskState
.
NOT_INSTALLED
,
MagiskState
.
NO_ROOT
,
MagiskState
.
LOADING
)
listOf
(
MagiskState
.
NOT_INSTALLED
,
MagiskState
.
LOADING
)
// Don't bother checking env when magisk is not installed, loading or already has been shown
if
(
invalidStates
.
any
{
it
==
magiskState
.
value
}
||
shownDialog
)
return
...
...
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