chore: improve version display

CursedHardware · May 26, 2024 · 69e3b9e · 69e3b9e
1 parent 0f295ed
commit 69e3b9e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/app/src/main/java/app/septs/euiccprobe/MainActivity.kt b/app/src/main/java/app/septs/euiccprobe/MainActivity.kt
@@ -47,10 +47,23 @@ class MainActivity : AppCompatActivity() {
     private suspend fun init() = withContext(Dispatchers.Main) {
         val markdown = buildString {
             appendLine(runBlocking {
-                val model = Build.MODEL.removePrefix(Build.BRAND).trim()
-                return@runBlocking "${Build.BRAND} $model (${Build.MANUFACTURER})"
+                val parts = mutableListOf(
+                    Build.BRAND,
+                    Build.MODEL.removePrefix(Build.BRAND).trim(),
+                )
+                if (!Build.BRAND.contentEquals(Build.MANUFACTURER, ignoreCase = true)) {
+                    parts.add("(${Build.MANUFACTURER})")
+                }
+                parts.joinToString(" ")
             })
             appendLine()
+            appendLine(runBlocking {
+                val parts = mutableListOf(
+                    "Android ${Build.VERSION.RELEASE}",
+                )
+                Version.getVersion()?.let { parts.add(it) }
+                parts.joinToString("; ")
+            })
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                 val state = SystemService.getEuiccServiceState(applicationContext)
                 appendLine()

diff --git a/app/src/main/java/app/septs/euiccprobe/Version.kt b/app/src/main/java/app/septs/euiccprobe/Version.kt
@@ -0,0 +1,15 @@
+package app.septs.euiccprobe
+
+object Version {
+    fun getVersion(): String? {
+        val miVersion = SystemProperties.get("ro.mi.os.version.code")
+        val miuiVersion = SystemProperties.get("ro.miui.ui.version.name")
+        val oneuiVersion = SystemProperties.get("ro.build.version.oneui")
+        return when {
+            miVersion != null -> "HyperOS $miVersion"
+            miuiVersion != null -> "MIUI $miuiVersion"
+            oneuiVersion != null -> "OneUI $oneuiVersion"
+            else -> null
+        }
+    }
+}