minor fixes

Android-Boot-Manager · Jul 27, 2024 · c16e90b · c16e90b
1 parent dc1eaa2
commit c16e90b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/java/org/andbootmgr/app/MainActivity.kt b/app/src/main/java/org/andbootmgr/app/MainActivity.kt
@@ -806,7 +806,9 @@ private fun PartTool(vm: MainActivityState) {
 						Button(onClick = {
 							processing = true
 							delete = false
+							vm.logic!!.unmount(vm.deviceInfo!!)
 							Shell.cmd(SDUtils.umsd(parts!!) + " && " + p.delete()).submit {
+								vm.logic!!.mount(vm.deviceInfo!!)
 								processing = false
 								editPartID = null
 								parts =
@@ -1038,6 +1040,7 @@ private fun PartTool(vm: MainActivityState) {
 										.map { it.delete() }.collect(
 											Collectors.toList()
 										)
+									vm.logic!!.unmount(vm.deviceInfo!!)
 									for (s in allp) { // Do not chain, but regenerate meta and unmount every time. Thanks void
 										val r = Shell.cmd(
 											SDUtils.umsd(parts!!) + " && " + s
@@ -1046,6 +1049,7 @@ private fun PartTool(vm: MainActivityState) {
 											SDUtils.generateMeta(vm.deviceInfo!!.bdev, vm.deviceInfo!!.pbdev)
 										tresult += r.out.join("\n") + r.err.join("\n") + "\n"
 									}
+									vm.logic!!.mount(vm.deviceInfo!!)
 								}
 								val f = entries[e]!!
 								val f2 = SuFile(vm.logic!!.abmBootset, f.nameWithoutExtension)
@@ -1187,7 +1191,6 @@ private fun Settings(vm: MainActivityState) {
 	}
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Preview(showBackground = true)
 @Composable
 private fun Preview() {

diff --git a/app/src/main/java/org/andbootmgr/app/util/SDUtils.kt b/app/src/main/java/org/andbootmgr/app/util/SDUtils.kt
@@ -266,7 +266,7 @@ object SDUtils {
 				val c = rend > endSector
 				val d = end < start
 				if (a || b || c || d) {
-					return "echo 'Invalid values ($start:$end - $a $b $c $d). Aborting...'"
+					return "echo 'Invalid values ($start:$end - $rstart>$startSector:$endSector>$rend - $a $b $c $d). Aborting...'; exit 1"
 				}
 				return "sgdisk ${meta.path} --new ${meta.nid}:$rstart:$rend --typecode ${meta.nid}:$typecode --change-name ${meta.nid}:'${name.replace("'", "")}' && sleep 1 && ls ${meta.ppath}${meta.nid}" + when(typecode) {
 					 "0700" -> " && sm format public:${meta.major},${meta.minor+meta.nid}"