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
d4598593
Commit
d4598593
authored
Oct 24, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show stub version
parent
2be0cef4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
8 deletions
+11
-8
HomeViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+11
-8
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
View file @
d4598593
...
@@ -202,13 +202,15 @@ class HomeViewModel(
...
@@ -202,13 +202,15 @@ class HomeViewModel(
private
fun
refreshVersions
()
{
private
fun
refreshVersions
()
{
magiskCurrentVersion
.
value
=
if
(
magiskState
.
value
!=
MagiskState
.
NOT_INSTALLED
)
{
magiskCurrentVersion
.
value
=
if
(
magiskState
.
value
!=
MagiskState
.
NOT_INSTALLED
)
{
version
.
format
(
Info
.
env
.
magiskVersionString
,
Info
.
env
.
magiskVersionCode
)
VERSION_FMT
.
format
(
Info
.
env
.
magiskVersionString
,
Info
.
env
.
magiskVersionCode
)
}
else
{
}
else
{
""
""
}
}
managerCurrentVersion
.
value
=
version
managerCurrentVersion
.
value
=
if
(
isRunningAsStub
)
MGR_VER_FMT
.
format
(
BuildConfig
.
VERSION_NAME
,
BuildConfig
.
VERSION_CODE
)
.
format
(
BuildConfig
.
VERSION_NAME
,
BuildConfig
.
VERSION_CODE
,
ClassMap
.
data
!!
.
version
)
else
VERSION_FMT
.
format
(
BuildConfig
.
VERSION_NAME
,
BuildConfig
.
VERSION_CODE
)
}
}
private
fun
updateSelf
()
{
private
fun
updateSelf
()
{
...
@@ -218,8 +220,8 @@ class HomeViewModel(
...
@@ -218,8 +220,8 @@ class HomeViewModel(
else
->
MagiskState
.
UP_TO_DATE
else
->
MagiskState
.
UP_TO_DATE
}
}
magiskLatestVersion
.
value
=
version
magiskLatestVersion
.
value
=
.
format
(
Info
.
remote
.
magisk
.
version
,
Info
.
remote
.
magisk
.
versionCode
)
VERSION_FMT
.
format
(
Info
.
remote
.
magisk
.
version
,
Info
.
remote
.
magisk
.
versionCode
)
_managerState
.
value
=
when
(
Info
.
remote
.
app
.
versionCode
)
{
_managerState
.
value
=
when
(
Info
.
remote
.
app
.
versionCode
)
{
in
Int
.
MIN_VALUE
until
0
->
MagiskState
.
NOT_INSTALLED
//wrong update channel
in
Int
.
MIN_VALUE
until
0
->
MagiskState
.
NOT_INSTALLED
//wrong update channel
...
@@ -227,8 +229,8 @@ class HomeViewModel(
...
@@ -227,8 +229,8 @@ class HomeViewModel(
else
->
MagiskState
.
UP_TO_DATE
else
->
MagiskState
.
UP_TO_DATE
}
}
managerLatestVersion
.
value
=
version
managerLatestVersion
.
value
=
MGR_VER_FMT
.
format
(
Info
.
remote
.
app
.
version
,
Info
.
remote
.
app
.
versionCode
)
.
format
(
Info
.
remote
.
app
.
version
,
Info
.
remote
.
app
.
versionCode
,
Info
.
remote
.
stub
.
versionCode
)
}
}
private
fun
ensureEnv
()
{
private
fun
ensureEnv
()
{
...
@@ -245,7 +247,8 @@ class HomeViewModel(
...
@@ -245,7 +247,8 @@ class HomeViewModel(
}
}
companion
object
{
companion
object
{
private
const
val
version
=
"%s (%d)"
private
const
val
VERSION_FMT
=
"%s (%d)"
private
const
val
MGR_VER_FMT
=
"%s (%d) (%d)"
}
}
}
}
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