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
41b70184
Commit
41b70184
authored
Dec 02, 2021
by
LoveSy
Committed by
John Wu
Dec 14, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ensureEnv even if getRemote fails
Co-authored-by:
vvb2060
<
vvb2060@gmail.com
>
parent
5c428303
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
26 deletions
+20
-26
HomeViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+20
-26
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
View file @
41b70184
...
...
@@ -45,30 +45,32 @@ class HomeViewModel(
var
isNoticeVisible
=
Config
.
safetyNotice
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
noticeVisible
)
val
stateMagisk
=
when
{
!
Info
.
env
.
isActive
->
MagiskState
.
NOT_INSTALLED
Info
.
env
.
magiskVersionCode
<
BuildConfig
.
VERSION_CODE
->
MagiskState
.
OBSOLETE
else
->
MagiskState
.
UP_TO_DATE
}
val
stateMagisk
get
()
=
when
{
!
Info
.
env
.
isActive
->
MagiskState
.
NOT_INSTALLED
Info
.
env
.
magiskVersionCode
<
BuildConfig
.
VERSION_CODE
->
MagiskState
.
OBSOLETE
else
->
MagiskState
.
UP_TO_DATE
}
@get
:
Bindable
var
stateManager
=
MagiskState
.
LOADING
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
stateManager
)
val
magiskInstalledVersion
get
()
=
Info
.
env
.
run
{
if
(
isActive
)
"$magiskVersionString ($magiskVersionCode)"
.
asText
()
else
R
.
string
.
not_available
.
asText
()
}
val
magiskInstalledVersion
get
()
=
Info
.
env
.
run
{
if
(
isActive
)
"$magiskVersionString ($magiskVersionCode)"
.
asText
()
else
R
.
string
.
not_available
.
asText
()
}
@get
:
Bindable
var
managerRemoteVersion
=
R
.
string
.
loading
.
asText
()
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
managerRemoteVersion
)
val
managerInstalledVersion
=
Info
.
stub
?.
let
{
"${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE}) (${it.version})"
}
?:
"${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
val
managerInstalledVersion
get
()
=
"${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
+
Info
.
stub
?.
let
{
" (${it.version})"
}.
orEmpty
()
@get
:
Bindable
var
stateManagerProgress
=
0
...
...
@@ -92,14 +94,11 @@ class HomeViewModel(
managerRemoteVersion
=
"${magisk.version} (${magisk.versionCode}) (${stub.versionCode})"
.
asText
()
launch
{
ensureEnv
()
}
}
?:
run
{
state
=
State
.
LOADING_FAILED
managerRemoteVersion
=
R
.
string
.
not_available
.
asText
()
}
ensureEnv
()
}
val
showTest
=
false
...
...
@@ -137,14 +136,9 @@ class HomeViewModel(
}
private
suspend
fun
ensureEnv
()
{
val
invalidStates
=
listOf
(
MagiskState
.
NOT_INSTALLED
,
MagiskState
.
LOADING
)
if
(
invalidStates
.
any
{
it
==
stateMagisk
}
||
shownDialog
)
return
val
result
=
Shell
.
su
(
"env_check ${Info.env.magiskVersionString} ${Info.env.magiskVersionCode}"
).
await
()
if
(!
result
.
isSuccess
)
{
if
(
MagiskState
.
NOT_INSTALLED
==
stateMagisk
||
shownDialog
)
return
val
cmd
=
"env_check ${Info.env.magiskVersionString} ${Info.env.magiskVersionCode}"
if
(!
Shell
.
su
(
cmd
).
await
().
isSuccess
)
{
shownDialog
=
true
EnvFixDialog
().
publish
()
}
...
...
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