MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show stub version

Browse Source
This commit is contained in:
topjohnwu 2019-10-24 00:54:40 -04:00
parent 2be0cef446
commit d459859361
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
View File

@ -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(
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(
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(
} }
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)"
} }
} }