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

Rename magiskVersion* -> version*

Browse Source
This commit is contained in:
topjohnwu
2021-12-14 02:59:06 -08:00
parent 41b701846f
commit ad47dba064
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+3 -3
View File
@@ -48,7 +48,7 @@ class HomeViewModel(
val stateMagisk
get() = when {
!Info.env.isActive -> MagiskState.NOT_INSTALLED
Info.env.magiskVersionCode < BuildConfig.VERSION_CODE -> MagiskState.OBSOLETE
Info.env.versionCode < BuildConfig.VERSION_CODE -> MagiskState.OBSOLETE
else -> MagiskState.UP_TO_DATE
}
@@ -59,7 +59,7 @@ class HomeViewModel(
val magiskInstalledVersion
get() = Info.env.run {
if (isActive)
"$magiskVersionString ($magiskVersionCode)".asText()
"$versionString ($versionCode)".asText()
else
R.string.not_available.asText()
}
@@ -137,7 +137,7 @@ class HomeViewModel(
private suspend fun ensureEnv() {
if (MagiskState.NOT_INSTALLED == stateMagisk || shownDialog) return
val cmd = "env_check ${Info.env.magiskVersionString} ${Info.env.magiskVersionCode}"
val cmd = "env_check ${Info.env.versionString} ${Info.env.versionCode}"
if (!Shell.su(cmd).await().isSuccess) {
shownDialog = true
EnvFixDialog().publish()
app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
+1 -1
View File
@@ -75,7 +75,7 @@ class LogViewModel(
FileInputStream("/proc/self/mountinfo").reader().use { it.copyTo(file) }
file.write("\n---Magisk Logs---\n")
file.write("${Info.env.magiskVersionString} (${Info.env.magiskVersionCode})\n\n")
file.write("${Info.env.versionString} (${Info.env.versionCode})\n\n")
file.write(consoleText)
file.write("\n---Manager Logs---\n")