refactor & performance improvement

.gitignore

@@ -2,6 +2,7 @@ build
 app/build
 app/.cxx
 .gradle/*
+.kotlin/*
 local.properties
 # User-specific stuff
 .idea

app/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.plugin.compose")
+    id("org.jetbrains.kotlinx.atomicfu")
     id("com.mikepenz.aboutlibraries.plugin")
 }
 
@@ -110,13 +111,19 @@ android {
     }
 }
 
+atomicfu {
+    dependenciesVersion = "0.25.0"
+    jvmVariant = "FU"
+}
+
 tasks.register("setAssetTs", Task::class) {
     doLast {
         File("$rootDir/app/src/main/assets/cp/_ts").writeText((System.currentTimeMillis() / 1000L).toString())
     }
 }
 
 dependencies {
+    compileOnly("org.jetbrains.kotlinx:atomicfu:0.25.0")
     implementation("androidx.core:core-splashscreen:1.0.1")
     implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")

app/src/main/java/org/andbootmgr/app/BackupRestoreFlow.kt

@@ -123,6 +123,7 @@ private fun SelectDroidBoot(c: CreateBackupDataHolder) {
 @Composable
 private fun Flash(c: CreateBackupDataHolder) {
     Terminal(logFile = "flash_${System.currentTimeMillis()}.txt") { terminal ->
+        c.vm.logic.extractToolkit(terminal)
         terminal.add(c.vm.activity.getString(R.string.term_starting))
         try {
             val p = c.meta!!.dumpKernelPartition(c.pi)
@@ -143,8 +144,8 @@ private fun Flash(c: CreateBackupDataHolder) {
                 c.vm.copyUnpriv(c.vm.activity.contentResolver.openInputStream(c.path!!)!!, f)
                 val result2 = Shell.cmd(
                     File(
-                        c.vm.logic.assetDir,
-                        "Toolkit/simg2img"
+                        c.vm.logic.toolkitDir,
+                        "simg2img"
                     ).absolutePath + " ${f.absolutePath} ${p.path}"
                 ).to(terminal).exec()
                 if (!result2.isSuccess) {

app/src/main/java/org/andbootmgr/app/CreatePartFlow.kt

@@ -914,6 +914,7 @@ private fun Download(c: CreatePartDataHolder) {
 private fun Flash(c: CreatePartDataHolder) {
 	val vm = c.vm
 	Terminal(logFile = "install_${System.currentTimeMillis()}.txt") { terminal ->
+		c.vm.logic.extractToolkit(terminal)
 		if (c.t == null) { // OS install
 			val parts = ArrayMap<Int, Int>()
 			val fn = c.t2.value
@@ -962,8 +963,8 @@ private fun Flash(c: CreatePartDataHolder) {
 						val f2 = f.toFile(c.vm)
 						val result2 = Shell.cmd(
 							File(
-								c.vm.logic.assetDir,
-								"Toolkit/simg2img"
+								c.vm.logic.toolkitDir,
+								"simg2img"
 							).absolutePath + " ${f2.absolutePath} ${tp.absolutePath}"
 						).to(terminal).exec()
 						f.delete()

app/src/main/java/org/andbootmgr/app/DeviceLogic.kt

@@ -5,14 +5,15 @@ import android.util.Log
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.io.SuFile
 import org.andbootmgr.app.util.SDUtils
+import org.andbootmgr.app.util.Toolkit
 import java.io.File
 
-class DeviceLogic(ctx: Context) {
+class DeviceLogic(private val ctx: Context) {
 	private val rootDir = ctx.filesDir.parentFile!!
-	val assetDir = File(rootDir, "assets")
-	private val toolkitDir = File(assetDir, "Toolkit")
+	private val toolkit = Toolkit(ctx)
 	val fileDir = File(rootDir, "files")
 	val cacheDir = File(rootDir, "cache")
+	val toolkitDir = File(toolkit.targetPath, "Toolkit") // will occasionally be pruned by OS, but it's fine
 	val rootTmpDir = File("/data/local/tmp")
 	val abmBootset = File(rootTmpDir, ".abm_bootset")
 	val abmDb = File(abmBootset, "db")
@@ -86,4 +87,14 @@ class DeviceLogic(ctx: Context) {
 				"TMPDIR=\"${cacheDir.absolutePath}\" BOOTSET=\"${abmBootset.absolutePath}\" " +
 				"TK=\"${toolkitDir.absolutePath}\" && cd \"\$TK\" && $cmd")
 	}
+	suspend fun extractToolkit(terminal: MutableList<String>) {
+		try {
+			toolkit.copyAssets {
+				terminal.add(ctx.getString(R.string.toolkit_extracting))
+			}
+		} catch (e: Exception) {
+			terminal.add(ctx.getString(R.string.toolkit_error))
+			throw e
+		}
+	}
 }

app/src/main/java/org/andbootmgr/app/DroidBootFlow.kt

@@ -229,6 +229,7 @@ fun SelectInstallSh(vm: WizardActivityState, update: Boolean = false) {
 private fun Flash(vm: WizardActivityState) {
 	val flashType = "DroidBootFlashType"
 	Terminal(logFile = "blflash_${System.currentTimeMillis()}.txt") { terminal ->
+		vm.logic.extractToolkit(terminal)
 		terminal.add(vm.activity.getString(R.string.term_preparing_fs))
 		if (vm.logic.checkMounted()) {
 			terminal.add(vm.activity.getString(R.string.term_mount_state_bad))

app/src/main/java/org/andbootmgr/app/FixDroidBootFlow.kt

@@ -59,6 +59,7 @@ private fun Start() {
 @Composable
 private fun Flash(vm: WizardActivityState) {
 	Terminal(logFile = "blfix_${System.currentTimeMillis()}.txt") { terminal ->
+		vm.logic.extractToolkit(terminal)
 		val tmpFile = if (vm.deviceInfo.postInstallScript) {
 			val tmpFile = createTempFileSu("abm", ".sh", vm.logic.rootTmpDir)
 			vm.copyPriv(vm.flashStream("InstallShFlashType"), tmpFile)