Skip to content

Commit 172c9bb

Browse files
committed
fix crash
1 parent ec229f9 commit 172c9bb

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

app/src/main/java/org/andbootmgr/app/util/Terminal.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import androidx.compose.ui.Modifier
1717
import androidx.compose.ui.platform.LocalContext
1818
import androidx.compose.ui.text.font.FontFamily
1919
import androidx.compose.ui.unit.dp
20+
import com.topjohnwu.superuser.io.SuFileOutputStream
2021
import kotlinx.coroutines.CoroutineScope
2122
import kotlinx.coroutines.Dispatchers
2223
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -25,10 +26,10 @@ import kotlinx.coroutines.launch
2526
import kotlinx.coroutines.withContext
2627
import org.andbootmgr.app.R
2728
import java.io.File
28-
import java.io.FileOutputStream
29+
import java.io.OutputStream
2930

3031
private class BudgetCallbackList(private val scope: CoroutineScope,
31-
private val log: FileOutputStream?)
32+
private val log: OutputStream?)
3233
: MutableList<String>, TerminalList {
3334
override var isCancelled by mutableStateOf<Boolean?>(null)
3435
override var cancel: (() -> Unit)? = null
@@ -171,13 +172,13 @@ fun TerminalWork(logFile: String? = null, action: suspend (TerminalList) -> Unit
171172
val ctx = LocalContext.current.applicationContext
172173
LaunchedEffect(Unit) {
173174
val logDispatcher = Dispatchers.IO.limitedParallelism(1)
174-
val log = logFile?.let { FileOutputStream(File(ctx.externalCacheDir, it)) }
175+
val log = logFile?.let { SuFileOutputStream.open(File(ctx.externalCacheDir, it)) }
175176
val s = BudgetCallbackList(CoroutineScope(logDispatcher), log)
176177
StayAliveConnection(ctx, {
177178
withContext(Dispatchers.Default) {
178179
try {
179180
action(s)
180-
} catch (e: TerminalCancelException) {
181+
} catch (_: TerminalCancelException) {
181182
s.add(ctx.getString(R.string.install_canceled))
182183
} catch (e: Throwable) {
183184
s.add(ctx.getString(R.string.term_failure))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<string name="connecting_text">(Connecting…)</string>
5656
<string name="downloading">Downloading…</string>
5757
<string name="downloading_s">Downloading %s…</string>
58-
<string name="provide_images">Please now provide images for all required IDs. You can use the recommended ones using the \"Download\" button!</string>
58+
<string name="provide_images">If you have already downloaded some files, you can select to use them here. Otherwise, the app will download all files it requires for you when you press \"Install\".</string>
5959
<string name="user_selected">User-selected</string>
6060
<string name="undo">Undo</string>
6161
<string name="download_progress">%s of %s downloaded</string>

0 commit comments

Comments
 (0)