fix(update): add direct API asset fallback for 404s & layout ellipsis for long device names (v1.1.2)
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run

This commit is contained in:
Vaishno Singh
2026-11-19 00:59:46 +05:30
parent ff989afcc1
commit 898b2468c5
6 changed files with 218 additions and 153 deletions
@@ -68,6 +68,7 @@ import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.expapp.trigger.data.model.DeviceConfig
@@ -317,159 +318,161 @@ fun DevicePage(
Column(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 20.dp, vertical = 18.dp)
.padding(horizontal = 18.dp, vertical = 16.dp)
) {
// Title row
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween
verticalAlignment = Alignment.CenterVertically
) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.weight(1f)
) {
Box(
modifier = Modifier
.size(48.dp)
.clip(RoundedCornerShape(14.dp))
.background(
Brush.radialGradient(
listOf(
when (isOnline) {
true -> GreenVibrant.copy(alpha = 0.18f)
false -> RedVibrant.copy(alpha = 0.12f)
null -> BorderDefault.copy(alpha = 0.1f)
},
Color.Transparent
)
Box(
modifier = Modifier
.size(44.dp)
.clip(RoundedCornerShape(12.dp))
.background(
Brush.radialGradient(
listOf(
when (isOnline) {
true -> GreenVibrant.copy(alpha = 0.18f)
false -> RedVibrant.copy(alpha = 0.12f)
null -> BorderDefault.copy(alpha = 0.1f)
},
Color.Transparent
)
)
.border(
1.dp,
when (isOnline) {
true -> GreenVibrant.copy(alpha = 0.35f)
false -> RedVibrant.copy(alpha = 0.25f)
null -> BorderSubtle
},
RoundedCornerShape(14.dp)
),
contentAlignment = Alignment.Center
) {
Icon(
imageVector = Icons.Default.Terminal,
contentDescription = null,
tint = when (isOnline) {
true -> GreenVibrant
false -> RedVibrant.copy(alpha = 0.6f)
null -> TextSecondary
},
modifier = Modifier.size(22.dp)
)
}
Spacer(modifier = Modifier.width(14.dp))
Column {
Text(
text = device.name,
fontSize = 20.sp,
fontWeight = FontWeight.Bold,
color = TextPrimary,
maxLines = 1
)
Text(
text = device.node,
fontSize = 11.sp,
color = TextMuted,
fontFamily = FontFamily.Monospace,
letterSpacing = 0.5.sp
)
}
}
// Re-fetch R2 JSON config button
IconButton(
onClick = onSyncConfig,
modifier = Modifier
.size(36.dp)
.clip(RoundedCornerShape(10.dp))
.background(AmberVibrant.copy(alpha = 0.08f))
.border(1.dp, AmberVibrant.copy(alpha = 0.2f), RoundedCornerShape(10.dp))
) {
Icon(
imageVector = Icons.Default.CloudSync,
contentDescription = "Re-fetch R2 JSON",
tint = AmberVibrant,
modifier = Modifier.size(18.dp)
)
}
Spacer(modifier = Modifier.width(6.dp))
// Edit device button
IconButton(
onClick = { showEditDialog = true },
modifier = Modifier
.size(36.dp)
.clip(RoundedCornerShape(10.dp))
.background(BorderSubtle.copy(alpha = 0.3f))
.border(1.dp, BorderSubtle, RoundedCornerShape(10.dp))
) {
Icon(
imageVector = Icons.Default.Edit,
contentDescription = "Edit device",
tint = TextSecondary,
modifier = Modifier.size(18.dp)
)
}
Spacer(modifier = Modifier.width(6.dp))
// Refresh button (spins while checking)
IconButton(
onClick = { if (!isCheckingStatus) onRefreshStatus() },
modifier = Modifier
.size(36.dp)
.clip(RoundedCornerShape(10.dp))
.background(
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.12f)
else BorderSubtle.copy(alpha = 0.3f)
)
.border(
1.dp,
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.3f)
else BorderSubtle,
RoundedCornerShape(10.dp)
)
when (isOnline) {
true -> GreenVibrant.copy(alpha = 0.35f)
false -> RedVibrant.copy(alpha = 0.25f)
null -> BorderSubtle
},
RoundedCornerShape(12.dp)
),
contentAlignment = Alignment.Center
) {
Icon(
imageVector = Icons.Default.Refresh,
contentDescription = "Refresh status",
tint = if (isCheckingStatus) GreenVibrant else TextMuted,
modifier = Modifier
.size(18.dp)
.rotate(if (isCheckingStatus) spinAngle else 0f)
imageVector = Icons.Default.Terminal,
contentDescription = null,
tint = when (isOnline) {
true -> GreenVibrant
false -> RedVibrant.copy(alpha = 0.6f)
null -> TextSecondary
},
modifier = Modifier.size(20.dp)
)
}
Spacer(modifier = Modifier.width(8.dp))
Spacer(modifier = Modifier.width(10.dp))
// Delete button
IconButton(
onClick = { showDeleteConfirm = true },
Column(
modifier = Modifier
.size(36.dp)
.clip(RoundedCornerShape(10.dp))
.background(RedVibrant.copy(alpha = 0.08f))
.border(1.dp, RedVibrant.copy(alpha = 0.15f), RoundedCornerShape(10.dp))
.weight(1f)
.padding(end = 6.dp)
) {
Icon(
imageVector = Icons.Default.DeleteOutline,
contentDescription = "Remove device",
tint = RedVibrant.copy(alpha = 0.7f),
modifier = Modifier.size(18.dp)
Text(
text = device.name,
fontSize = 18.sp,
fontWeight = FontWeight.Bold,
color = TextPrimary,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
Spacer(modifier = Modifier.height(2.dp))
Text(
text = device.node,
fontSize = 11.sp,
color = TextMuted,
fontFamily = FontFamily.Monospace,
letterSpacing = 0.5.sp,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
}
// Action buttons in a fixed non-shrinking Row
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(4.dp)
) {
// Re-fetch R2 JSON config button
IconButton(
onClick = onSyncConfig,
modifier = Modifier
.size(34.dp)
.clip(RoundedCornerShape(9.dp))
.background(AmberVibrant.copy(alpha = 0.08f))
.border(1.dp, AmberVibrant.copy(alpha = 0.2f), RoundedCornerShape(9.dp))
) {
Icon(
imageVector = Icons.Default.CloudSync,
contentDescription = "Re-fetch R2 JSON",
tint = AmberVibrant,
modifier = Modifier.size(17.dp)
)
}
// Edit device button
IconButton(
onClick = { showEditDialog = true },
modifier = Modifier
.size(34.dp)
.clip(RoundedCornerShape(9.dp))
.background(BorderSubtle.copy(alpha = 0.3f))
.border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
) {
Icon(
imageVector = Icons.Default.Edit,
contentDescription = "Edit device",
tint = TextSecondary,
modifier = Modifier.size(17.dp)
)
}
// Refresh button (spins while checking)
IconButton(
onClick = { if (!isCheckingStatus) onRefreshStatus() },
modifier = Modifier
.size(34.dp)
.clip(RoundedCornerShape(9.dp))
.background(
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.12f)
else BorderSubtle.copy(alpha = 0.3f)
)
.border(
1.dp,
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.3f)
else BorderSubtle,
RoundedCornerShape(9.dp)
)
) {
Icon(
imageVector = Icons.Default.Refresh,
contentDescription = "Refresh status",
tint = if (isCheckingStatus) GreenVibrant else TextMuted,
modifier = Modifier
.size(17.dp)
.rotate(if (isCheckingStatus) spinAngle else 0f)
)
}
// Delete button
IconButton(
onClick = { showDeleteConfirm = true },
modifier = Modifier
.size(34.dp)
.clip(RoundedCornerShape(9.dp))
.background(RedVibrant.copy(alpha = 0.08f))
.border(1.dp, RedVibrant.copy(alpha = 0.15f), RoundedCornerShape(9.dp))
) {
Icon(
imageVector = Icons.Default.DeleteOutline,
contentDescription = "Remove device",
tint = RedVibrant.copy(alpha = 0.7f),
modifier = Modifier.size(17.dp)
)
}
}
}
@@ -648,9 +648,28 @@ fun MainScreen(
currentVersion = BuildConfig.VERSION_NAME,
downloadState = downloadState,
onDownload = {
downloadState = DownloadState.Downloading(0, 0, availableUpdate!!.sizeBytes)
updateManager.downloadApk(availableUpdate!!.downloadUrl) { state ->
downloadState = state
val info = availableUpdate!!
// If retrying from failure, re-check to get fresh release asset URLs
if (downloadState is DownloadState.Failed) {
downloadState = DownloadState.Downloading(0, 0, 0)
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { checkResult ->
if (checkResult is UpdateCheckResult.UpdateAvailable) {
availableUpdate = checkResult.info
val fresh = checkResult.info
updateManager.downloadApk(fresh.downloadUrl, fresh.assetApiUrl) { state ->
downloadState = state
}
} else {
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl) { state ->
downloadState = state
}
}
}
} else {
downloadState = DownloadState.Downloading(0, 0, info.sizeBytes)
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl) { state ->
downloadState = state
}
}
},
onInstall = { file ->
@@ -24,6 +24,9 @@ import java.util.concurrent.TimeUnit
class UpdateManager(
private val context: Context,
private val okHttpClient: OkHttpClient = OkHttpClient.Builder()
.followRedirects(true)
.followSslRedirects(true)
.retryOnConnectionFailure(true)
.connectTimeout(30, TimeUnit.SECONDS)
.readTimeout(60, TimeUnit.SECONDS)
.build(),
@@ -103,6 +106,7 @@ class UpdateManager(
val assets = json.getAsJsonArray("assets")
var apkUrl: String? = null
var apkApiUrl: String? = null
var apkName = "app-release.apk"
var apkSize = 0L
@@ -112,6 +116,7 @@ class UpdateManager(
val name = assetObj.get("name")?.asString.orEmpty()
if (name.endsWith(".apk", ignoreCase = true)) {
apkUrl = assetObj.get("browser_download_url")?.asString
apkApiUrl = assetObj.get("url")?.asString
apkName = name
apkSize = assetObj.get("size")?.asLong ?: 0L
break
@@ -126,6 +131,7 @@ class UpdateManager(
title = title,
changelog = changelog,
downloadUrl = apkUrl,
assetApiUrl = apkApiUrl,
apkFileName = apkName,
sizeBytes = apkSize
)
@@ -162,21 +168,39 @@ class UpdateManager(
/**
* Downloads the APK file to the app's cache directory and streams progress updates.
* If the browser download URL fails or returns 404, automatically attempts fallback to the API asset URL.
*/
fun downloadApk(
downloadUrl: String,
assetApiUrl: String? = null,
onProgress: (DownloadState) -> Unit
): Call {
val request = Request.Builder()
.url(downloadUrl)
.addHeader("User-Agent", "ServerControlApp")
.get()
.build()
return startDownloadCall(downloadUrl, assetApiUrl, isFallback = false, onProgress)
}
private fun startDownloadCall(
url: String,
fallbackUrl: String?,
isFallback: Boolean,
onProgress: (DownloadState) -> Unit
): Call {
val requestBuilder = Request.Builder()
.url(url)
.addHeader("User-Agent", "ServerControlApp")
if (isFallback) {
requestBuilder.addHeader("Accept", "application/octet-stream")
}
val request = requestBuilder.get().build()
val call = okHttpClient.newCall(request)
call.enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) {
if (!call.isCanceled()) {
if (call.isCanceled()) return
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
startDownloadCall(fallbackUrl, null, isFallback = true, onProgress)
} else {
runOnMain {
onProgress(DownloadState.Failed("Download failed: ${e.localizedMessage}"))
}
@@ -184,15 +208,24 @@ class UpdateManager(
}
override fun onResponse(call: Call, response: Response) {
if (call.isCanceled()) return
if (!response.isSuccessful) {
runOnMain {
onProgress(DownloadState.Failed("Server returned HTTP ${response.code}"))
response.close()
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
// Fallback to direct asset API
startDownloadCall(fallbackUrl, null, isFallback = true, onProgress)
} else {
runOnMain {
onProgress(DownloadState.Failed("Server returned HTTP ${response.code}"))
}
}
return
}
val responseBody = response.body
if (responseBody == null) {
response.close()
runOnMain {
onProgress(DownloadState.Failed("Response body was empty"))
}
@@ -245,8 +278,14 @@ class UpdateManager(
}
}
runOnMain {
onProgress(DownloadState.ReadyToInstall(apkFile))
if (apkFile.exists() && apkFile.length() > 0) {
runOnMain {
onProgress(DownloadState.ReadyToInstall(apkFile))
}
} else {
runOnMain {
onProgress(DownloadState.Failed("Downloaded file was empty"))
}
}
} catch (e: Exception) {
if (!call.isCanceled()) {
@@ -254,6 +293,8 @@ class UpdateManager(
onProgress(DownloadState.Failed("File write failed: ${e.localizedMessage}"))
}
}
} finally {
response.close()
}
}
})
@@ -8,8 +8,9 @@ data class ReleaseInfo(
val title: String,
val changelog: String,
val downloadUrl: String,
val apkFileName: String,
val sizeBytes: Long
val assetApiUrl: String? = null,
val apkFileName: String = "app-release.apk",
val sizeBytes: Long = 0L
)
sealed class UpdateCheckResult {