Skip to content

Commit

Permalink
migrate to new download system in legacy flows part2
Browse files Browse the repository at this point in the history
  • Loading branch information
@nift4
nift4 committed Aug 23, 2024
1 parent 5d60a12 commit aa590e6
Show file tree
Hide file tree
Showing 7 changed files with 112 additions and 221 deletions.
7 changes: 3 additions & 4 deletions app/src/main/java/org/andbootmgr/app/CreatePartFlow.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,16 +378,15 @@ private fun Shop(c: CreatePartDataHolder) {
vm.inetAvailable[l.getString("id")] =
WizardActivityState.Downloadable(
l.getString("url"),
if (l.has("hash"))
l.getString("hash") else null,
l.optString("hash"),
l.getString("desc")
)
i++
}
vm.idNeeded.add("_install.sh_")
vm.inetAvailable["_install.sh_"] = WizardActivityState.Downloadable(
o.getString("scriptname"), if (o.has("scriptSha256"))
o.getString("scriptSha256") else null,
o.getString("scriptname"),
o.optString("scriptSha256"),
vm.activity.getString(R.string.installer_sh)
)

Expand Down
198 changes: 48 additions & 150 deletions app/src/main/java/org/andbootmgr/app/DroidBootFlow.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ class DroidBootFlow : WizardFlow() {
Start(vm)
}, WizardPage("input",
NavButton(vm.activity.getString(R.string.prev)) { it.navigate("start") },
NavButton(vm.activity.getString(R.string.next)) { it.navigate(if (vm.deviceInfo.postInstallScript || !booted)
"dload" else "flash") }
NavButton("") {}
) {
Input(vm)
}, WizardPage("dload",
Expand Down Expand Up @@ -92,9 +91,11 @@ private fun Start(vm: WizardActivityState) {
}
}

// shared across DroidBootFlow, UpdateDroidBootFlow, FixDroidBootFlow
@Composable
private fun Input(vm: WizardActivityState) {
fun LoadDroidBootJson(vm: WizardActivityState, content: @Composable () -> Unit) {
var loading by remember { mutableStateOf(!vm.deviceInfo.isBooted(vm.logic) || vm.deviceInfo.postInstallScript) }
var error by remember { mutableStateOf(false) }
LaunchedEffect(Unit) {
if (!loading) return@LaunchedEffect
CoroutineScope(Dispatchers.IO).launch {
Expand All @@ -107,7 +108,7 @@ private fun Input(vm: WizardActivityState) {
if (!vm.deviceInfo.isBooted(vm.logic)) {
val bl = json.getJSONObject("bootloader")
val url = bl.getString("url")
val sha = if (bl.has("sha256")) bl.getString("sha256") else null
val sha = bl.optString("sha256")
vm.inetAvailable["droidboot"] = WizardActivityState.Downloadable(
url, sha, vm.activity.getString(R.string.droidboot_online)
)
Expand All @@ -116,7 +117,7 @@ private fun Input(vm: WizardActivityState) {
if (vm.deviceInfo.postInstallScript) {
val i = json.getJSONObject("installScript")
val url = i.getString("url")
val sha = if (i.has("sha256")) i.getString("sha256") else null
val sha = i.optString("sha256")
vm.inetAvailable["install"] = WizardActivityState.Downloadable(
url, sha, vm.activity.getString(R.string.installer_sh)
)
Expand All @@ -128,156 +129,59 @@ private fun Input(vm: WizardActivityState) {
Toast.makeText(vm.activity, R.string.dl_error, Toast.LENGTH_LONG).show()
}
Log.e("ABM droidboot json", Log.getStackTraceString(e))
error = true
}
}
}
if (loading) {
LoadingCircle(stringResource(R.string.loading), modifier = Modifier.fillMaxSize())
return
}
Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxSize()
) {
LaunchedEffect(Unit) { // TODO can't I do this better?
if (vm.texts.isBlank())
vm.texts = vm.activity.getString(R.string.android)
}
val e = vm.texts.isBlank() || !vm.texts.matches(Regex("[\\dA-Za-z]+"))

Text(stringResource(R.string.enter_name_for_current), textAlign = TextAlign.Center, modifier = Modifier.padding(vertical = 5.dp))
TextField(
value = vm.texts,
onValueChange = {
vm.texts = it
},
label = { Text(stringResource(R.string.os_name)) },
isError = e
)
if (e) {
Text(stringResource(R.string.invalid_in), color = MaterialTheme.colorScheme.error)
if (error) {
Text(stringResource(R.string.dl_error))
} else {
Text("") // Budget spacer
}
LaunchedEffect(e) {
if (e) {
vm.nextText = ""
vm.onNext = {}
} else {
vm.nextText = vm.activity.getString(R.string.next)
vm.onNext = { it.navigate("select") }
}
LoadingCircle(stringResource(R.string.loading), modifier = Modifier.fillMaxSize())
}
}
} else content()
}

// shared across DroidBootFlow, UpdateDroidBootFlow, FixDroidBootFlow
@Composable
fun SelectDroidBoot(vm: WizardActivityState) {
var nextButtonAvailable by remember { mutableStateOf(false) }

Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxSize()
) {
Icon(
painterResource(R.drawable.ic_droidbooticon),
stringResource(R.string.droidboot_icon_content_desc),
Modifier.defaultMinSize(32.dp, 32.dp)
)

if (nextButtonAvailable) {
Text(stringResource(id = R.string.successfully_selected))
} else {
//Text(stringResource(R.string.choose_droidboot_online))
Button(onClick = {
vm.activity.chooseFile("*/*") {
vm.flashes["DroidBootFlashType"] = Pair(it, null)
nextButtonAvailable = true
vm.nextText = vm.activity.getString(R.string.next)
vm.onNext = { n -> n.navigate("flash") }
}
}) {
Text(stringResource(id = R.string.choose_file))
}
val ctx = LocalContext.current
Button(onClick = {
CoroutineScope(Dispatchers.IO).launch {
try {
val jsonText =
URL("https://raw.githubusercontent.com/Android-Boot-Manager/ABM-json/master/devices/" + vm.codename + ".json").readText()
val json = JSONTokener(jsonText).nextValue() as JSONObject
if (BuildConfig.VERSION_CODE < json.getInt("minAppVersion"))
throw IllegalStateException("please upgrade app")
val bl = json.getJSONObject("bootloader")
val url = bl.getString("url")
val sha = if (bl.has("sha256")) bl.getString("sha256") else null
vm.flashes["DroidBootFlashType"] = Pair(Uri.parse(url), sha)
nextButtonAvailable = true
vm.nextText = vm.activity.getString(R.string.next)
vm.onNext = { n -> n.navigate("flash") }
} catch (e: Exception) {
Handler(Looper.getMainLooper()).post {
Toast.makeText(ctx, R.string.dl_error, Toast.LENGTH_LONG).show()
}
Log.e("ABM droidboot json", Log.getStackTraceString(e))
}
}
}) {
Text(stringResource(id = R.string.download))
private fun Input(vm: WizardActivityState) {
LoadDroidBootJson(vm) {
Column(
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxSize()
) {
LaunchedEffect(Unit) { // TODO can't I do this better?
if (vm.texts.isBlank())
vm.texts = vm.activity.getString(R.string.android)
}
}
}
}

// shared across DroidBootFlow, UpdateDroidBootFlow, FixDroidBootFlow
@Composable
fun SelectInstallSh(vm: WizardActivityState, update: Boolean = false) {
var nextButtonAvailable by remember { mutableStateOf(false) }
val flashType = "InstallShFlashType"
val e = vm.texts.isBlank() || !vm.texts.matches(Regex("[\\dA-Za-z]+"))

Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxSize()
) {
if (nextButtonAvailable) {
Text(stringResource(id = R.string.successfully_selected))
} else {
//Text(stringResource(R.string.choose_install_s_online))
Button(onClick = {
vm.activity.chooseFile("*/*") {
vm.flashes[flashType] = Pair(it, null)
nextButtonAvailable = true
vm.nextText = vm.activity.getString(R.string.next)
vm.onNext = { n -> n.navigate(
if (!vm.deviceInfo.isBooted(vm.logic) || update) "select" else "flash") }
}
}) {
Text(stringResource(id = R.string.choose_file))
Text(
stringResource(R.string.enter_name_for_current),
textAlign = TextAlign.Center,
modifier = Modifier.padding(vertical = 5.dp)
)
TextField(
value = vm.texts,
onValueChange = {
vm.texts = it
},
label = { Text(stringResource(R.string.os_name)) },
isError = e
)
if (e) {
Text(stringResource(R.string.invalid_in), color = MaterialTheme.colorScheme.error)
} else {
Text("") // Budget spacer
}
val ctx = LocalContext.current
Button(onClick = {
CoroutineScope(Dispatchers.IO).launch {
try {
val jsonText =
URL("https://raw.githubusercontent.com/Android-Boot-Manager/ABM-json/master/devices/" + vm.codename + ".json").readText()
val json = JSONTokener(jsonText).nextValue() as JSONObject
if (BuildConfig.VERSION_CODE < json.getInt("minAppVersion"))
throw IllegalStateException("please upgrade app")
val i = json.getJSONObject("installScript")
val url = i.getString("url")
val sha = if (i.has("sha256")) i.getString("sha256") else null
vm.flashes[flashType] = Pair(Uri.parse(url), sha)
nextButtonAvailable = true
vm.nextText = vm.activity.getString(R.string.next)
vm.onNext = { n -> n.navigate(
if (!vm.deviceInfo.isBooted(vm.logic) || update) "select" else "flash") }
} catch (e: Exception) {
Handler(Looper.getMainLooper()).post {
Toast.makeText(ctx, R.string.dl_error, Toast.LENGTH_LONG).show()
}
Log.e("ABM install json", Log.getStackTraceString(e))
}
LaunchedEffect(e) {
if (e) {
vm.nextText = ""
vm.onNext = {}
} else {
vm.nextText = vm.activity.getString(R.string.next)
vm.onNext = { it.navigate(if (vm.idNeeded.isNotEmpty()) "dload" else "flash") }
}
}) {
Text(stringResource(id = R.string.download))
}
}
}
Expand Down Expand Up @@ -372,7 +276,7 @@ private fun Flash(vm: WizardActivityState) {
}
val tmpFile = if (vm.deviceInfo.postInstallScript) {
val tmpFile = createTempFileSu("abm", ".sh", vm.logic.rootTmpDir)
vm.copyPriv(vm.flashStream("InstallShFlashType"), tmpFile)
vm.copyPriv(vm.chosen["install"]!!.openInputStream(vm), tmpFile)
tmpFile.setExecutable(true)
tmpFile
} else null
Expand Down Expand Up @@ -401,18 +305,12 @@ private fun Flash(vm: WizardActivityState) {
terminal.add(vm.activity.getString(R.string.term_cant_write_bl))
vm.copyPriv(SuFileInputStream.open(vm.deviceInfo.blBlock), backupLk)
try {
vm.copyPriv(vm.flashStream(flashType), File(vm.deviceInfo.blBlock))
vm.copyPriv(vm.chosen["droidboot"]!!.openInputStream(vm), File(vm.deviceInfo.blBlock))
} catch (e: IOException) {
terminal.add(vm.activity.getString(R.string.term_bl_failed))
terminal.add(e.message ?: "(null)")
terminal.add(vm.activity.getString(R.string.term_consult_doc))
return@Terminal
} catch (e: HashMismatchException) {
terminal.add(e.message ?: "(null)")
terminal.add(vm.activity.getString(R.string.restoring_backup))
vm.copyPriv(SuFileInputStream.open(backupLk), File(vm.deviceInfo.blBlock))
terminal.add(vm.activity.getString(R.string.term_consult_doc))
return@Terminal
}
}
if (vm.deviceInfo.postInstallScript) {
Expand Down
46 changes: 22 additions & 24 deletions app/src/main/java/org/andbootmgr/app/FixDroidBootFlow.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
Expand All @@ -20,19 +21,14 @@ class FixDroidBootFlow(): WizardFlow() {
override fun get(vm: WizardActivityState): List<IWizardPage> {
return listOf(WizardPage("start",
NavButton(vm.activity.getString(R.string.cancel)) { it.finish() },
NavButton(vm.activity.getString(R.string.next)) { it.navigate(if (vm.deviceInfo.postInstallScript) "shSel" else "select") })
NavButton("") {})
{
Start()
}, WizardPage("shSel",
NavButton(vm.activity.getString(R.string.prev)) { it.navigate("start") },
NavButton("") {}
) {
SelectInstallSh(vm)
},WizardPage("select",
NavButton(vm.activity.getString(R.string.prev)) { it.navigate(if (vm.deviceInfo.postInstallScript) "shSel" else "start") },
Start(vm)
}, WizardPage("dload",
NavButton(vm.activity.getString(R.string.cancel)) { it.finish() },
NavButton("") {}
) {
SelectDroidBoot(vm)
WizardDownloader(vm)
}, WizardPage("flash",
NavButton("") {},
NavButton("") {}
Expand All @@ -43,12 +39,20 @@ class FixDroidBootFlow(): WizardFlow() {
}

@Composable
private fun Start() {
Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxSize()
) {
Text(stringResource(id = R.string.welcome_text))
Text(stringResource(R.string.reinstall_dboot))
private fun Start(vm: WizardActivityState) {
LoadDroidBootJson(vm) {
LaunchedEffect(Unit) {
vm.nextText = vm.activity.getString(R.string.next)
vm.onNext = { it.navigate(if (vm.idNeeded.isNotEmpty()) "dload" else "flash") }
}
Column(
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxSize()
) {
Text(stringResource(id = R.string.welcome_text))
Text(stringResource(R.string.reinstall_dboot))
}
}
}

Expand All @@ -58,7 +62,7 @@ private fun Flash(vm: WizardActivityState) {
vm.logic.extractToolkit(terminal)
val tmpFile = if (vm.deviceInfo.postInstallScript) {
val tmpFile = createTempFileSu("abm", ".sh", vm.logic.rootTmpDir)
vm.copyPriv(vm.flashStream("InstallShFlashType"), tmpFile)
vm.copyPriv(vm.chosen["install"]!!.openInputStream(vm), tmpFile)
tmpFile.setExecutable(true)
tmpFile
} else null
Expand All @@ -69,18 +73,12 @@ private fun Flash(vm: WizardActivityState) {
terminal.add(vm.activity.getString(R.string.term_cant_write_bl))
vm.copyPriv(SuFileInputStream.open(vm.deviceInfo.blBlock), backupLk)
try {
vm.copyPriv(vm.flashStream("DroidBootFlashType"), File(vm.deviceInfo.blBlock))
vm.copyPriv(vm.chosen["droidboot"]!!.openInputStream(vm), File(vm.deviceInfo.blBlock))
} catch (e: IOException) {
terminal.add(vm.activity.getString(R.string.term_bl_failed))
terminal.add(e.message ?: "(null)")
terminal.add(vm.activity.getString(R.string.term_consult_doc))
return@Terminal
} catch (e: HashMismatchException) {
terminal.add(e.message ?: "(null)")
terminal.add(vm.activity.getString(R.string.restoring_backup))
vm.copyPriv(SuFileInputStream.open(backupLk), File(vm.deviceInfo.blBlock))
terminal.add(vm.activity.getString(R.string.term_consult_doc))
return@Terminal
}
if (vm.deviceInfo.postInstallScript) {
terminal.add(vm.activity.getString(R.string.term_device_setup))
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/andbootmgr/app/Start.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ private fun PartTool(vm: MainActivityState) {
editEntryID = null
},
title = {
Text(text = if (e.has("title")) "\"${e["title"]}\"" else if (f != null) stringResource(id = R.string.invalid_entry2) else stringResource(id = R.string.new_entry2))
Text(text = if (e.has("title")) e["title"]!! else if (f != null) stringResource(id = R.string.invalid_entry2) else stringResource(id = R.string.new_entry2))
},
icon = {
Icon(painterResource(id = R.drawable.ic_roms), stringResource(R.string.icon_content_desc))
Expand Down
Loading

0 comments on commit aa590e6

Please sign in to comment.