fix negative mb

Android-Boot-Manager · Jul 31, 2024 · c9e0df0 · c9e0df0
1 parent d5765f7
commit c9e0df0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/src/main/java/org/andbootmgr/app/DeviceLogic.kt b/app/src/main/java/org/andbootmgr/app/DeviceLogic.kt
@@ -3,6 +3,7 @@ package org.andbootmgr.app
 import android.content.Context
 import android.util.Log
 import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.io.SuFile
 import org.andbootmgr.app.util.SDUtils
 import java.io.File
 
@@ -12,14 +13,15 @@ class DeviceLogic(ctx: Context) {
 	private val toolkitDir = File(assetDir, "Toolkit")
 	val fileDir = File(rootDir, "files")
 	val cacheDir = File(rootDir, "cache")
-	val abmBootset = File(fileDir, "bootset")
+	val abmBootset = File("/data/local/tmp/.abm_bootset")
 	val abmDb = File(abmBootset, "db")
 	val abmEntries = File(abmDb, "entries")
 	var mounted = false
 	fun mountBootset(d: DeviceInfo): Boolean {
 		if (checkMounted()) return true
 		val ast = d.getAbmSettings(this) ?: return false
-		if (!abmBootset.exists()) abmBootset.mkdir()
+		val bootsetSu = SuFile.open(abmBootset.toURI())
+		if (!bootsetSu.exists()) bootsetSu.mkdir()
 		val result = Shell
 			.cmd("mount $ast ${abmBootset.absolutePath}")
 			.exec()

diff --git a/app/src/main/java/org/andbootmgr/app/MainActivity.kt b/app/src/main/java/org/andbootmgr/app/MainActivity.kt
@@ -1142,6 +1142,12 @@ private fun Settings(vm: MainActivityState) {
 		}) {
 			Text(stringResource(R.string.update_droidboot))
 		}
+		Button(onClick = {
+			vm.logic!!.unmountBootset()
+			vm.activity!!.finish()
+		}) {
+			Text(stringResource(R.string.umount))
+		}
 		Row(horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
 			Text(stringResource(R.string.noob_mode))
 			Switch(checked = vm.noobMode, onCheckedChange = {