fixed init_boot devices

capntrips · capntrips · commit 13ccf53e956a · 2022-10-14T23:42:22.000-05:00
added tap to expand for long strings
bumped dependencies
minor bugfixes
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.github.capntrips.kernelflasher"
         minSdk 30
         targetSdk 33
-        versionCode 11
-        versionName "1.0.0-alpha11"
+        versionCode 12
+        versionName "1.0.0-alpha12"
 
         vectorDrawables {
             useSupportLibrary true
diff --git a/app/src/main/assets/lptools_static b/app/src/main/assets/lptools_static
diff --git a/app/src/main/java/com/github/capntrips/kernelflasher/ui/components/DataRow.kt b/app/src/main/java/com/github/capntrips/kernelflasher/ui/components/DataRow.kt
@@ -1,5 +1,6 @@
 package com.github.capntrips.kernelflasher.ui.components
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.width
@@ -9,6 +10,8 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -25,7 +28,8 @@ fun DataRow(
     labelStyle: TextStyle = MaterialTheme.typography.labelMedium,
     valueColor: Color = Color.Unspecified,
     valueStyle: TextStyle = MaterialTheme.typography.titleSmall,
-    mutableMaxWidth: MutableState<Int>? = null
+    mutableMaxWidth: MutableState<Int>? = null,
+    clickable: Boolean = false,
 ) {
     Row {
         val modifier = if (mutableMaxWidth != null) {
@@ -51,13 +55,22 @@ fun DataRow(
         )
         Spacer(Modifier.width(8.dp))
         SelectionContainer(Modifier.alignByBaseline()) {
+            var clicked by remember { mutableStateOf(false)}
+            val modifier = if (clickable) {
+                Modifier
+                    .clickable { clicked = !clicked }
+                    .alignByBaseline()
+            } else {
+                Modifier
+                    .alignByBaseline()
+            }
             Text(
-                modifier = Modifier.alignByBaseline(),
+                modifier = modifier,
                 text = value,
                 color = valueColor,
                 style = valueStyle,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis
+                maxLines = if (clicked) Int.MAX_VALUE else 1,
+                overflow = if (clicked) TextOverflow.Visible else TextOverflow.Ellipsis
             )
         }
     }
diff --git a/app/src/main/java/com/github/capntrips/kernelflasher/ui/components/SlotCard.kt b/app/src/main/java/com/github/capntrips/kernelflasher/ui/components/SlotCard.kt
@@ -48,7 +48,8 @@ fun SlotCard(
             DataRow(
                 label = stringResource(R.string.kernel_version),
                 value = if (viewModel.kernelVersion != null) viewModel.kernelVersion!! else "",
-                mutableMaxWidth = cardWidth
+                mutableMaxWidth = cardWidth,
+                clickable = true
             )
         }
         if (showDlkm && viewModel.hasVendorDlkm) {
diff --git a/app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/backups/BackupsContent.kt b/app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/backups/BackupsContent.kt
@@ -42,7 +42,7 @@ fun ColumnScope.BackupsContent(
             val cardWidth = remember { mutableStateOf(0) }
             val currentBackup = viewModel.backups.getValue(viewModel.currentBackup!!)
             DataRow(stringResource(R.string.backup_type), currentBackup.type, mutableMaxWidth = cardWidth)
-            DataRow(stringResource(R.string.kernel_version), currentBackup.kernelVersion, mutableMaxWidth = cardWidth)
+            DataRow(stringResource(R.string.kernel_version), currentBackup.kernelVersion, mutableMaxWidth = cardWidth, clickable = true)
             if (currentBackup.type == "raw") {
                 DataRow(
                     label = stringResource(R.string.boot_sha1),
@@ -130,7 +130,7 @@ fun ColumnScope.BackupsContent(
                             mutableMaxWidth = cardWidth
                         )
                     }
-                    DataRow(stringResource(R.string.kernel_version), currentBackup.kernelVersion, mutableMaxWidth = cardWidth)
+                    DataRow(stringResource(R.string.kernel_version), currentBackup.kernelVersion, mutableMaxWidth = cardWidth, clickable = true)
                 }
             }
         } else {
diff --git a/app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/backups/SlotBackupsContent.kt b/app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/backups/SlotBackupsContent.kt
@@ -57,14 +57,15 @@ fun ColumnScope.SlotBackupsContent(
             viewModel = slotViewModel,
             navController = navController,
             isSlotScreen = true,
+            showDlkm = false,
         )
         Spacer(Modifier.height(16.dp))
         if (backupsViewModel.currentBackup != null && backupsViewModel.backups.containsKey(backupsViewModel.currentBackup)) {
             val currentBackup = backupsViewModel.backups.getValue(backupsViewModel.currentBackup!!)
-            DataCard (backupsViewModel.currentBackup!!) {
+            DataCard(backupsViewModel.currentBackup!!) {
                 val cardWidth = remember { mutableStateOf(0) }
                 DataRow(stringResource(R.string.backup_type), currentBackup.type, mutableMaxWidth = cardWidth)
-                DataRow(stringResource(R.string.kernel_version), currentBackup.kernelVersion, mutableMaxWidth = cardWidth)
+                DataRow(stringResource(R.string.kernel_version), currentBackup.kernelVersion, mutableMaxWidth = cardWidth, clickable = true)
                 if (currentBackup.type == "raw") {
                     DataRow(
                         label = stringResource(R.string.boot_sha1),
@@ -153,7 +154,7 @@ fun ColumnScope.SlotBackupsContent(
                             }
                         }
                     ) {
-                        DataRow(stringResource(R.string.kernel_version), backups[id]!!.kernelVersion)
+                        DataRow(stringResource(R.string.kernel_version), backups[id]!!.kernelVersion, clickable = true)
                     }
                 }
             } else {
@@ -208,8 +209,6 @@ fun ColumnScope.SlotBackupsContent(
             )
             Spacer(Modifier.height(5.dp))
         }
-        // TODO: disable button if no partitions are selected
-        // TODO: disable button if any partitions are unavailable
         OutlinedButton(
             modifier = Modifier
                 .fillMaxWidth(),
@@ -219,7 +218,8 @@ fun ColumnScope.SlotBackupsContent(
                 navController.navigate("slot$slotSuffix/backups/${backupsViewModel.currentBackup!!}/restore/restore") {
                     popUpTo("slot{slotSuffix}")
                 }
-            }
+            },
+            enabled = currentBackup.hashes == null || (PartitionUtil.PartitionNames.none { currentBackup.hashes.get(it) != null && backupsViewModel.backupPartitions[it] == null } && backupsViewModel.backupPartitions.filter { it.value }.isNotEmpty())
         ) {
             Text(stringResource(R.string.restore))
         }
diff --git a/app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/main/MainContent.kt b/app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/main/MainContent.kt
@@ -34,7 +34,7 @@ fun ColumnScope.MainContent(
         val cardWidth = remember { mutableStateOf(0) }
         DataRow(stringResource(R.string.model), "${Build.MODEL} (${Build.DEVICE})", mutableMaxWidth = cardWidth)
         DataRow(stringResource(R.string.build_number), Build.ID, mutableMaxWidth = cardWidth)
-        DataRow(stringResource(R.string.kernel_version), System.getProperty("os.version")!!, mutableMaxWidth = cardWidth)
+        DataRow(stringResource(R.string.kernel_version), viewModel.kernelVersion, mutableMaxWidth = cardWidth, clickable = true)
         DataRow(stringResource(R.string.slot_suffix), viewModel.slotSuffix, mutableMaxWidth = cardWidth)
     }
     Spacer(Modifier.height(16.dp))
diff --git a/app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/main/MainViewModel.kt b/app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/main/MainViewModel.kt
@@ -34,6 +34,7 @@ class MainViewModel(
     }
     val slotSuffix: String
 
+    val kernelVersion: String
     val slotA: SlotViewModel
     val slotB: SlotViewModel
     val backups: BackupsViewModel
@@ -54,9 +55,10 @@ class MainViewModel(
 
     init {
         PartitionUtil.init(context, fileSystemManager)
-        val bootA = PartitionUtil.findPartitionBlockDevice(context, "boot", "_a")!!
-        val bootB = PartitionUtil.findPartitionBlockDevice(context, "boot", "_b")!!
-
+        val partitionName = if (fileSystemManager.getFile("/dev/block/by-name/init_boot_a").exists()) "init_boot" else "boot"
+        val bootA = PartitionUtil.findPartitionBlockDevice(context, partitionName, "_a")!!
+        val bootB = PartitionUtil.findPartitionBlockDevice(context, partitionName, "_b")!!
+        kernelVersion = Shell.cmd("echo $(uname -r) $(uname -v)").exec().out[0]
         slotSuffix = Shell.cmd("getprop ro.boot.slot_suffix").exec().out[0]
         backups = BackupsViewModel(context, fileSystemManager, navController, _isRefreshing, _backups)
         updates = UpdatesViewModel(context, fileSystemManager, navController, _isRefreshing)
diff --git a/app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/slot/SlotFlashContent.kt b/app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/slot/SlotFlashContent.kt
@@ -109,7 +109,6 @@ fun ColumnScope.SlotFlashContent(
                     }
                 }
             }
-            // TODO: disable button if no partitions are selected
             OutlinedButton(
                 modifier = Modifier
                     .fillMaxWidth(),
@@ -119,7 +118,8 @@ fun ColumnScope.SlotFlashContent(
                     navController.navigate("slot$slotSuffix/backup/backup") {
                         popUpTo("slot{slotSuffix}")
                     }
-                }
+                },
+                enabled = viewModel.backupPartitions.filter { it.value }.isNotEmpty()
             ) {
                 Text(stringResource(R.string.backup))
             }
diff --git a/app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/slot/SlotViewModel.kt b/app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/slot/SlotViewModel.kt
@@ -241,9 +241,9 @@ class SlotViewModel(
         Shell.cmd("/data/adb/magisk/magiskboot unpack $boot").exec()
         val kernel = File(context.filesDir, "kernel")
         if (kernel.exists()) {
-            val result = Shell.cmd("strings kernel | grep -E -m1 'Linux version.*#' | cut -d\\  -f3").exec().out
+            val result = Shell.cmd("strings kernel | grep -E -m1 'Linux version.*#' | cut -d\\  -f3-").exec().out
             if (result.isNotEmpty()) {
-                kernelVersion = result[0]
+                kernelVersion = result[0].replace("""\(.+\)""".toRegex(), "").replace("""\s+""".toRegex(), " ")
             }
         }
         Shell.cmd("/data/adb/magisk/magiskboot cleanup").exec()
@@ -259,7 +259,7 @@ class SlotViewModel(
         @Suppress("LiftReturnOrAssignment")
         if (partition.exists()) {
             val dmPath = Shell.cmd("readlink -f $partition").exec().out[0]
-            val mounts = Shell.cmd("mount | grep $dmPath").exec().out
+            val mounts = Shell.cmd("mount | grep -w $dmPath").exec().out
             return mounts.isNotEmpty()
         } else {
             return false
diff --git a/build.gradle b/build.gradle
@@ -1,17 +1,16 @@
 buildscript {
     ext {
         accompanist_version = '0.25.0'
-        activity_version = '1.5.1'
-        appcompat_version = '1.6.0-beta01'
-        compose_version = '1.3.0-beta01'
+        activity_version = '1.6.0'
+        appcompat_version = '1.7.0-alpha01'
+        compose_version = '1.3.0-rc01'
         compiler_version = '1.3.0'
-        constraintlayout_version = '2.1.4'
         core_version = '1.9.0-rc01'
         libsu_version = '5.0.2'
         lifecycle_version = '2.5.1'
-        material_version = '1.7.0-rc01'
-        material3_version = '1.0.0-beta01'
-        nav_version = '2.5.1'
+        material_version = '1.8.0-alpha01'
+        material3_version = '1.0.0-rc01'
+        nav_version = '2.5.2'
         okhttp_version = '4.10.0'
         room_version = '2.4.3'
         serialization_version = '1.4.0-RC'
@@ -20,8 +19,8 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '7.3.0-rc01' apply false
-    id 'com.android.library' version '7.3.0-rc01' apply false
+    id 'com.android.application' version '7.3.1' apply false
+    id 'com.android.library' version '7.3.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
     id 'org.jetbrains.kotlin.kapt' version '1.7.10' apply false
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.7.10' apply false

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ fun SlotCard(`
`48`	`48`	`DataRow(`
`49`	`49`	`label = stringResource(R.string.kernel_version),`
`50`	`50`	`value = if (viewModel.kernelVersion != null) viewModel.kernelVersion!! else "",`
`51`		`- mutableMaxWidth = cardWidth`
	`51`	`+ mutableMaxWidth = cardWidth,`
	`52`	`+ clickable = true`
`52`	`53`	`)`
`53`	`54`	`}`
`54`	`55`	`if (showDlkm && viewModel.hasVendorDlkm) {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ fun ColumnScope.BackupsContent(`
`42`	`42`	`val cardWidth = remember { mutableStateOf(0) }`
`43`	`43`	`val currentBackup = viewModel.backups.getValue(viewModel.currentBackup!!)`
`44`	`44`	`DataRow(stringResource(R.string.backup_type), currentBackup.type, mutableMaxWidth = cardWidth)`
`45`		`- DataRow(stringResource(R.string.kernel_version), currentBackup.kernelVersion, mutableMaxWidth = cardWidth)`
	`45`	`+ DataRow(stringResource(R.string.kernel_version), currentBackup.kernelVersion, mutableMaxWidth = cardWidth, clickable = true)`
`46`	`46`	`if (currentBackup.type == "raw") {`
`47`	`47`	`DataRow(`
`48`	`48`	`label = stringResource(R.string.boot_sha1),`
`@@ -130,7 +130,7 @@ fun ColumnScope.BackupsContent(`
`130`	`130`	`mutableMaxWidth = cardWidth`
`131`	`131`	`)`
`132`	`132`	`}`
`133`		`- DataRow(stringResource(R.string.kernel_version), currentBackup.kernelVersion, mutableMaxWidth = cardWidth)`
	`133`	`+ DataRow(stringResource(R.string.kernel_version), currentBackup.kernelVersion, mutableMaxWidth = cardWidth, clickable = true)`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -57,14 +57,15 @@ fun ColumnScope.SlotBackupsContent(`
`57`	`57`	`viewModel = slotViewModel,`
`58`	`58`	`navController = navController,`
`59`	`59`	`isSlotScreen = true,`
	`60`	`+ showDlkm = false,`
`60`	`61`	`)`
`61`	`62`	`Spacer(Modifier.height(16.dp))`
`62`	`63`	`if (backupsViewModel.currentBackup != null && backupsViewModel.backups.containsKey(backupsViewModel.currentBackup)) {`
`63`	`64`	`val currentBackup = backupsViewModel.backups.getValue(backupsViewModel.currentBackup!!)`
`64`		`- DataCard (backupsViewModel.currentBackup!!) {`
	`65`	`+ DataCard(backupsViewModel.currentBackup!!) {`
`65`	`66`	`val cardWidth = remember { mutableStateOf(0) }`
`66`	`67`	`DataRow(stringResource(R.string.backup_type), currentBackup.type, mutableMaxWidth = cardWidth)`
`67`		`- DataRow(stringResource(R.string.kernel_version), currentBackup.kernelVersion, mutableMaxWidth = cardWidth)`
	`68`	`+ DataRow(stringResource(R.string.kernel_version), currentBackup.kernelVersion, mutableMaxWidth = cardWidth, clickable = true)`
`68`	`69`	`if (currentBackup.type == "raw") {`
`69`	`70`	`DataRow(`
`70`	`71`	`label = stringResource(R.string.boot_sha1),`
`@@ -153,7 +154,7 @@ fun ColumnScope.SlotBackupsContent(`
`153`	`154`	`}`
`154`	`155`	`}`
`155`	`156`	`) {`
`156`		`- DataRow(stringResource(R.string.kernel_version), backups[id]!!.kernelVersion)`
	`157`	`+ DataRow(stringResource(R.string.kernel_version), backups[id]!!.kernelVersion, clickable = true)`
`157`	`158`	`}`
`158`	`159`	`}`
`159`	`160`	`} else {`
`@@ -208,8 +209,6 @@ fun ColumnScope.SlotBackupsContent(`
`208`	`209`	`)`
`209`	`210`	`Spacer(Modifier.height(5.dp))`
`210`	`211`	`}`
`211`		`- // TODO: disable button if no partitions are selected`
`212`		`- // TODO: disable button if any partitions are unavailable`
`213`	`212`	`OutlinedButton(`
`214`	`213`	`modifier = Modifier`
`215`	`214`	`.fillMaxWidth(),`
`@@ -219,7 +218,8 @@ fun ColumnScope.SlotBackupsContent(`
`219`	`218`	`navController.navigate("slot$slotSuffix/backups/${backupsViewModel.currentBackup!!}/restore/restore") {`
`220`	`219`	`popUpTo("slot{slotSuffix}")`
`221`	`220`	`}`
`222`		`- }`
	`221`	`+ },`
	`222`	`+ enabled = currentBackup.hashes == null \|\| (PartitionUtil.PartitionNames.none { currentBackup.hashes.get(it) != null && backupsViewModel.backupPartitions[it] == null } && backupsViewModel.backupPartitions.filter { it.value }.isNotEmpty())`
`223`	`223`	`) {`
`224`	`224`	`Text(stringResource(R.string.restore))`
`225`	`225`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ fun ColumnScope.MainContent(`
`34`	`34`	`val cardWidth = remember { mutableStateOf(0) }`
`35`	`35`	`DataRow(stringResource(R.string.model), "${Build.MODEL} (${Build.DEVICE})", mutableMaxWidth = cardWidth)`
`36`	`36`	`DataRow(stringResource(R.string.build_number), Build.ID, mutableMaxWidth = cardWidth)`
`37`		`- DataRow(stringResource(R.string.kernel_version), System.getProperty("os.version")!!, mutableMaxWidth = cardWidth)`
	`37`	`+ DataRow(stringResource(R.string.kernel_version), viewModel.kernelVersion, mutableMaxWidth = cardWidth, clickable = true)`
`38`	`38`	`DataRow(stringResource(R.string.slot_suffix), viewModel.slotSuffix, mutableMaxWidth = cardWidth)`
`39`	`39`	`}`
`40`	`40`	`Spacer(Modifier.height(16.dp))`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,6 @@ fun ColumnScope.SlotFlashContent(`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`}`
`112`		`- // TODO: disable button if no partitions are selected`
`113`	`112`	`OutlinedButton(`
`114`	`113`	`modifier = Modifier`
`115`	`114`	`.fillMaxWidth(),`
`@@ -119,7 +118,8 @@ fun ColumnScope.SlotFlashContent(`
`119`	`118`	`navController.navigate("slot$slotSuffix/backup/backup") {`
`120`	`119`	`popUpTo("slot{slotSuffix}")`
`121`	`120`	`}`
`122`		`- }`
	`121`	`+ },`
	`122`	`+ enabled = viewModel.backupPartitions.filter { it.value }.isNotEmpty()`
`123`	`123`	`) {`
`124`	`124`	`Text(stringResource(R.string.backup))`
`125`	`125`	`}`