Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 84 additions & 0 deletions app/src/main/java/org/randomcoder/udroid/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.os.IBinder
import android.provider.OpenableColumns
import androidx.activity.ComponentActivity
import androidx.activity.SystemBarStyle
import androidx.activity.compose.setContent
Expand Down Expand Up @@ -69,8 +70,10 @@ import org.randomcoder.udroid.runtime.RuntimePhase
import org.randomcoder.udroid.runtime.RuntimeSnapshot
import org.randomcoder.udroid.runtime.RuntimeSupervisorService
import org.randomcoder.udroid.runtime.RootfsStorageUsage
import org.randomcoder.udroid.runtime.TerminalFileImporter
import org.randomcoder.udroid.runtime.TerminalProfileStore
import org.randomcoder.udroid.runtime.TerminalProfiles
import org.randomcoder.udroid.runtime.TerminalTabSnapshot
import org.randomcoder.udroid.runtime.VirglServerMode
import org.randomcoder.udroid.ui.UdroidApp
import org.randomcoder.udroid.ui.UdroidCanvas
Expand Down Expand Up @@ -98,6 +101,11 @@ private data class PendingDesktopStart(
val configuration: DesktopConfiguration,
)

private data class PendingTerminalUpload(
val tabId: String,
val rootfsName: String,
)

class MainActivity : ComponentActivity() {
private val app: UdroidApplication
get() = application as UdroidApplication
Expand Down Expand Up @@ -132,6 +140,9 @@ class MainActivity : ComponentActivity() {
private var linuxApplicationsState by
mutableStateOf<LinuxApplicationsState>(LinuxApplicationsState.Loading)
private var linuxApplicationMessage by mutableStateOf<String?>(null)
private var terminalUploadTabId by mutableStateOf<String?>(null)
private var terminalUploadMessage by mutableStateOf<String?>(null)
private var terminalUploadFailed by mutableStateOf(false)
private var pendingLinuxApplication: PendingLinuxApplication? = null
private var pendingLinuxApplicationId: String? = null
private var pendingDesktopStart: PendingDesktopStart? = null
Expand All @@ -140,6 +151,7 @@ class MainActivity : ComponentActivity() {
private var pendingDebugDesktop: DebugCommand? = null
private var pendingDebugStopDesktop = false
private var pendingMicrophoneRootfsName: String? = null
private var pendingTerminalUpload: PendingTerminalUpload? = null
private var linuxApplicationsLoadGeneration = 0L
private var desktopScanGeneration = 0L
private var ociTagsLoadGeneration = 0L
Expand Down Expand Up @@ -174,6 +186,49 @@ class MainActivity : ComponentActivity() {
}
}

private val terminalFilePicker =
registerForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
val target = pendingTerminalUpload
pendingTerminalUpload = null
if (uri == null || target == null) return@registerForActivityResult

terminalUploadTabId = target.tabId
terminalUploadMessage = null
lifecycleScope.launch {
val result =
withContext(Dispatchers.IO) {
runCatching {
val rootfs =
app.rootfsRegistry
.all()
.firstOrNull { it.name == target.rootfsName }
?.directory
?: error(
"Linux system ${target.rootfsName} is not installed or ready",
)
val sourceName = terminalUploadDisplayName(uri)
val source =
contentResolver.openInputStream(uri)
?: error("The selected file could not be opened")
source.use {
TerminalFileImporter.import(rootfs, sourceName, it)
}
}
}
terminalUploadTabId = null
result.fold(
onSuccess = {
terminalUploadFailed = false
terminalUploadMessage = "Uploaded to $it"
},
onFailure = {
terminalUploadFailed = true
terminalUploadMessage = it.message ?: "The selected file could not be uploaded"
},
)
}
}

private val runtimeServiceConnection =
object : ServiceConnection {
override fun onServiceConnected(
Expand Down Expand Up @@ -254,6 +309,9 @@ class MainActivity : ComponentActivity() {
onTerminalAppearanceChanged = {
applySystemBars(UdroidDestination.TERMINAL)
},
terminalUploadTabId = terminalUploadTabId,
terminalUploadMessage = terminalUploadMessage,
terminalUploadFailed = terminalUploadFailed,
onDestinationSelected = ::selectDestination,
onPrimaryDestinationSelected = ::selectPrimaryDestination,
onStart = {
Expand All @@ -262,6 +320,7 @@ class MainActivity : ComponentActivity() {
selectDestination(UdroidDestination.TERMINAL)
},
onStop = { RuntimeSupervisorService.stop(this) },
onUploadTerminalFile = ::uploadTerminalFile,
onRefresh = { refreshAll() },
onReloadCatalogue = { loadCatalogue() },
onPreviewInstall = { selectDistro(it) },
Expand Down Expand Up @@ -1480,6 +1539,31 @@ class MainActivity : ComponentActivity() {
selectDestination(UdroidDestination.TERMINAL)
}

private fun uploadTerminalFile(tab: TerminalTabSnapshot) {
if (pendingTerminalUpload != null || terminalUploadTabId != null) {
terminalUploadFailed = true
terminalUploadMessage = "Wait for the current upload to finish"
return
}
pendingTerminalUpload = PendingTerminalUpload(tab.id, tab.rootfsName)
terminalUploadMessage = null
terminalFilePicker.launch(arrayOf("*/*"))
}

private fun terminalUploadDisplayName(uri: Uri): String? =
runCatching {
contentResolver
.query(
uri,
arrayOf(OpenableColumns.DISPLAY_NAME),
null,
null,
null,
)?.use { cursor ->
if (cursor.moveToFirst()) cursor.getString(0) else null
}
}.getOrNull() ?: uri.lastPathSegment

private fun ensureNotificationPermission() {
if (Build.VERSION.SDK_INT >= 33 &&
checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) !=
Expand Down
Comment thread
mohit-kota marked this conversation as resolved.
Resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
package org.randomcoder.udroid.runtime

import java.io.File
import java.io.FileOutputStream
import java.io.InputStream
import java.nio.file.AtomicMoveNotSupportedException
import java.nio.file.Files
import java.nio.file.LinkOption
import java.nio.file.StandardCopyOption
import java.nio.file.attribute.PosixFilePermission
import java.nio.file.attribute.PosixFilePermissions
import java.util.UUID

internal object TerminalFileImporter {
fun import(
rootfs: File,
sourceName: String?,
source: InputStream,
): String {
val root = rootfs.toPath().toAbsolutePath().normalize()
require(Files.isDirectory(root, LinkOption.NOFOLLOW_LINKS)) {
"The selected Linux system is unavailable"
}

val temporaryDirectory = root.resolve("tmp")
if (Files.exists(temporaryDirectory, LinkOption.NOFOLLOW_LINKS)) {
check(Files.isDirectory(temporaryDirectory, LinkOption.NOFOLLOW_LINKS)) {
"/tmp is not a directory"
}
} else {
Files.createDirectory(temporaryDirectory)
}

val fileName = safeFileName(sourceName)
val guestDestination = "/tmp/$fileName"
val destination = temporaryDirectory.resolve(fileName)

val staging = temporaryDirectory.resolve(".upload-${UUID.randomUUID()}.part")
try {
Files.createFile(
staging,
PosixFilePermissions.asFileAttribute(
setOf(
PosixFilePermission.OWNER_READ,
PosixFilePermission.OWNER_WRITE,
),
),
)
FileOutputStream(staging.toFile()).use { output ->
source.copyTo(output)
output.fd.sync()
}
try {
Files.move(
staging,
destination,
StandardCopyOption.ATOMIC_MOVE,
StandardCopyOption.REPLACE_EXISTING,
)
} catch (_: AtomicMoveNotSupportedException) {
Files.move(staging, destination, StandardCopyOption.REPLACE_EXISTING)
}
} finally {
Files.deleteIfExists(staging)
}
return guestDestination
}

internal fun safeFileName(sourceName: String?): String {
val sanitized =
sourceName
.orEmpty()
.substringAfterLast('/')
.substringAfterLast('\\')
.map { character ->
if (character.code < 32 || character.code == 127) '_' else character
}.joinToString("")
return sanitized.takeUnless { it.isBlank() || it == "." || it == ".." } ?: "upload"
}
Comment thread
mohit-kota marked this conversation as resolved.
Resolved
}
9 changes: 9 additions & 0 deletions app/src/main/java/org/randomcoder/udroid/ui/AppShell.kt
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ import org.randomcoder.udroid.runtime.TerminalColorProfile
import org.randomcoder.udroid.runtime.TerminalProfileState
import org.randomcoder.udroid.runtime.TerminalProfileStore
import org.randomcoder.udroid.runtime.TerminalProfiles
import org.randomcoder.udroid.runtime.TerminalTabSnapshot
import org.randomcoder.udroid.runtime.TerminalTypographyState
import org.randomcoder.udroid.runtime.TerminalTypographyStore
import org.randomcoder.udroid.runtime.VirglServerMode
Expand Down Expand Up @@ -208,10 +209,14 @@ fun UdroidApp(
showInstallTerminal: Boolean,
runtimeService: RuntimeSupervisorService?,
onTerminalAppearanceChanged: () -> Unit,
terminalUploadTabId: String?,
terminalUploadMessage: String?,
terminalUploadFailed: Boolean,
onDestinationSelected: (UdroidDestination) -> Unit,
onPrimaryDestinationSelected: (UdroidDestination) -> Unit,
onStart: () -> Unit,
onStop: () -> Unit,
onUploadTerminalFile: (TerminalTabSnapshot) -> Unit,
onRefresh: () -> Unit,
onReloadCatalogue: () -> Unit,
onPreviewInstall: (DistroVariant) -> Unit,
Expand Down Expand Up @@ -344,8 +349,12 @@ fun UdroidApp(
)
},
onTypographyChanged = ::applyTerminalTypography,
uploadingTabId = terminalUploadTabId,
uploadMessage = terminalUploadMessage,
uploadFailed = terminalUploadFailed,
onStart = onStart,
onStop = onStop,
onUploadFile = onUploadTerminalFile,
onExit = { onDestinationSelected(UdroidDestination.SYSTEM) },
)
}
Expand Down
48 changes: 48 additions & 0 deletions app/src/main/java/org/randomcoder/udroid/ui/TerminalPage.kt
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import androidx.compose.material.icons.outlined.KeyboardArrowDown
import androidx.compose.material.icons.outlined.MoreVert
import androidx.compose.material.icons.outlined.Settings
import androidx.compose.material.icons.outlined.Terminal
import androidx.compose.material.icons.outlined.UploadFile
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.CircularProgressIndicator
Expand Down Expand Up @@ -119,8 +120,12 @@ fun InteractiveTerminalPage(
onSaveProfile: (TerminalColorProfile) -> Unit,
onDeleteProfile: (String) -> Unit,
onTypographyChanged: (TerminalTypographyState) -> Unit,
uploadingTabId: String?,
uploadMessage: String?,
uploadFailed: Boolean,
onStart: () -> Unit,
onStop: () -> Unit,
onUploadFile: (TerminalTabSnapshot) -> Unit,
onExit: () -> Unit,
) {
val context = LocalContext.current
Expand Down Expand Up @@ -189,9 +194,11 @@ fun InteractiveTerminalPage(
session = session,
activeTab = activeTab,
stopping = stopping,
uploading = uploadingTabId != null,
onExit = onExit,
onChooseDistro = { showDistroPicker = true },
onShowSettings = { showSettings = true },
onUpload = { activeTab?.let(onUploadFile) },
onStop = {
stopRequested = true
onStop()
Expand Down Expand Up @@ -231,6 +238,20 @@ fun InteractiveTerminalPage(
)
}

uploadMessage?.let { message ->
Text(
text = message,
modifier =
Modifier
.fillMaxWidth()
.background(UdroidTerminalSurface)
.padding(horizontal = 14.dp, vertical = 6.dp),
color = if (uploadFailed) MaterialTheme.colorScheme.error else UdroidTerminalGreen,
style = MaterialTheme.typography.labelSmall,
maxLines = 2,
)
}

if (stopping) {
StoppingTerminalState(
modifier = Modifier.weight(1f),
Expand Down Expand Up @@ -319,9 +340,11 @@ private fun TerminalSessionBar(
session: TerminalSession?,
activeTab: TerminalTabSnapshot?,
stopping: Boolean,
uploading: Boolean,
onExit: () -> Unit,
onChooseDistro: () -> Unit,
onShowSettings: () -> Unit,
onUpload: () -> Unit,
onStop: () -> Unit,
) {
val tabClosing =
Expand Down Expand Up @@ -401,6 +424,31 @@ private fun TerminalSessionBar(
}
}
}
if (running) {
if (uploading) {
Box(
modifier = Modifier.size(48.dp),
contentAlignment = Alignment.Center,
) {
CircularProgressIndicator(
modifier = Modifier.size(22.dp),
color = UdroidTerminalGreen,
strokeWidth = 2.dp,
)
}
} else {
IconButton(
onClick = onUpload,
enabled = activeTab != null,
) {
Icon(
imageVector = Icons.Outlined.UploadFile,
contentDescription = "Upload file to terminal",
tint = UdroidTerminalText,
)
}
}
}
if (stopping) {
Box(
modifier = Modifier.size(48.dp),
Expand Down
Loading
Loading