allow errors

Author: capntrips

app/src/main/java/com/github/capntrips/kernelflasher/ui/components/SlotCard.kt

@@ -26,7 +26,7 @@ fun SlotCard(
     DataCard (
         title = title,
         button = {
-            if (!isSlotScreen && !viewModel.hasError) {
+            if (!isSlotScreen) {
                 AnimatedVisibility(!viewModel.isRefreshing) {
                     ViewButton {
                         navController.navigate("slot${viewModel.slotSuffix}")
@@ -36,36 +36,37 @@ fun SlotCard(
         }
     ) {
         val cardWidth = remember { mutableIntStateOf(0) }
-        if (!viewModel.hasError) {
+        if (viewModel.sha1 != null) {
             DataRow(
                 label = stringResource(R.string.boot_sha1),
-                value = viewModel.sha1.substring(0, 8),
+                value = viewModel.sha1!!.substring(0, 8),
                 valueStyle = MaterialTheme.typography.titleSmall.copy(
                     fontFamily = FontFamily.Monospace,
                     fontWeight = FontWeight.Medium
                 ),
                 mutableMaxWidth = cardWidth
             )
-            AnimatedVisibility(!viewModel.isRefreshing && viewModel.kernelVersion != null) {
-                DataRow(
-                    label = stringResource(R.string.kernel_version),
-                    value = if (viewModel.kernelVersion != null) viewModel.kernelVersion!! else "",
-                    mutableMaxWidth = cardWidth,
-                    clickable = true
-                )
-            }
-            if (showDlkm && viewModel.hasVendorDlkm) {
-                var vendorDlkmValue = stringResource(R.string.not_found)
-                if (viewModel.isVendorDlkmMapped) {
-                    vendorDlkmValue = if (viewModel.isVendorDlkmMounted) {
-                        String.format("%s, %s", stringResource(R.string.exists), stringResource(R.string.mounted))
-                    } else {
-                        String.format("%s, %s", stringResource(R.string.exists), stringResource(R.string.unmounted))
-                    }
+        }
+        AnimatedVisibility(!viewModel.isRefreshing && viewModel.kernelVersion != null) {
+            DataRow(
+                label = stringResource(R.string.kernel_version),
+                value = if (viewModel.kernelVersion != null) viewModel.kernelVersion!! else "",
+                mutableMaxWidth = cardWidth,
+                clickable = true
+            )
+        }
+        if (showDlkm && viewModel.hasVendorDlkm) {
+            var vendorDlkmValue = stringResource(R.string.not_found)
+            if (viewModel.isVendorDlkmMapped) {
+                vendorDlkmValue = if (viewModel.isVendorDlkmMounted) {
+                    String.format("%s, %s", stringResource(R.string.exists), stringResource(R.string.mounted))
+                } else {
+                    String.format("%s, %s", stringResource(R.string.exists), stringResource(R.string.unmounted))
                 }
-                DataRow(stringResource(R.string.vendor_dlkm), vendorDlkmValue, mutableMaxWidth = cardWidth)
             }
-        } else {
+            DataRow(stringResource(R.string.vendor_dlkm), vendorDlkmValue, mutableMaxWidth = cardWidth)
+        }
+        if (viewModel.hasError) {
             Row {
                 DataValue(
                     value = viewModel.error,

app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/main/MainViewModel.kt

@@ -71,13 +71,7 @@ class MainViewModel(
             val initBootA = PartitionUtil.findPartitionBlockDevice(context, "init_boot", "_a")
             val initBootB = PartitionUtil.findPartitionBlockDevice(context, "init_boot", "_b")
             slotA = SlotViewModel(context, fileSystemManager, navController, _isRefreshing, slotSuffix == "_a", "_a", bootA, initBootA, _backups)
-            if (slotA.hasError && slotSuffix == "_a") {
-                _error = slotA.error
-            }
             slotB = SlotViewModel(context, fileSystemManager, navController, _isRefreshing, slotSuffix == "_b", "_b", bootB, initBootB, _backups)
-            if (slotB.hasError && slotSuffix == "_b") {
-                _error = slotB.error
-            }
         } else {
             val boot = PartitionUtil.findPartitionBlockDevice(context, "boot", "")!!
             val initBoot = PartitionUtil.findPartitionBlockDevice(context, "init_boot", "")

app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/slot/SlotFlashContent.kt

@@ -33,11 +33,13 @@ import com.github.capntrips.kernelflasher.ui.components.DataCard
 import com.github.capntrips.kernelflasher.ui.components.FlashButton
 import com.github.capntrips.kernelflasher.ui.components.FlashList
 import com.github.capntrips.kernelflasher.ui.components.SlotCard
+import kotlinx.serialization.ExperimentalSerializationApi
 
 @ExperimentalAnimationApi
 @ExperimentalMaterialApi
 @ExperimentalMaterial3Api
 @ExperimentalUnitApi
+@ExperimentalSerializationApi
 @Composable
 fun ColumnScope.SlotFlashContent(
     viewModel: SlotViewModel,

app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/slot/SlotViewModel.kt

@@ -66,8 +66,8 @@ class SlotViewModel(
     private var inInit = true
     private var _error: String? = null
 
-    val sha1: String
-        get() = _sha1!!
+    val sha1: String?
+        get() = _sha1
     val flashOutput: List<String>
         get() = _flashOutput
     val uiPrintedOutput: List<String>
@@ -120,12 +120,12 @@ class SlotViewModel(
             when (Shell.cmd("$magiskboot cpio ramdisk.cpio test").exec().code) {
                 0 -> _sha1 = Shell.cmd("$magiskboot sha1 $boot").exec().out.firstOrNull()
                 1 -> _sha1 = Shell.cmd("$magiskboot cpio ramdisk.cpio sha1").exec().out.firstOrNull()
-                else -> log(context, "Invalid ramdisk in boot.img", shouldThrow = true)
+                else -> _error = "Invalid ramdisk in boot.img"
             }
         } else if (kernel.exists()) {
             _sha1 = Shell.cmd("$magiskboot sha1 $boot").exec().out.firstOrNull()
         } else {
-            log(context, "Invalid boot.img, no ramdisk or kernel found", shouldThrow = true)
+            _error = "Invalid boot.img, no ramdisk or kernel found"
         }
         Shell.cmd("$magiskboot cleanup").exec()
 

app/src/main/res/values/strings.xml

@@ -8,7 +8,7 @@
     <string name="kernel_name" tools:keep="@string/kernel_name">Kernel Name</string>
     <string name="kernel_version">Kernel Version</string>
     <string name="slot_suffix">Slot Suffix</string>
-    <string name="slot">Slot</string>
+    <string name="slot" tools:ignore="MissingTranslation">Slot</string>
     <string name="slot_a">Slot A</string>
     <string name="slot_b">Slot B</string>
     <string name="boot_sha1" tools:ignore="Typos">Boot SHA1</string>