Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
27b632bcaa | ||
|
|
0bcca1fbf4 | ||
|
|
898b2468c5 |
@@ -11,8 +11,8 @@ android {
|
||||
applicationId = "com.expapp.trigger"
|
||||
minSdk = 24
|
||||
targetSdk = 34
|
||||
versionCode = 5
|
||||
versionName = "1.1.1"
|
||||
versionCode = 8
|
||||
versionName = "1.1.4"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables {
|
||||
|
||||
@@ -91,6 +91,25 @@ class MainActivity : FragmentActivity() {
|
||||
enableEdgeToEdge()
|
||||
|
||||
repository = DeviceRepository(SharedPrefsStorage(applicationContext))
|
||||
val settingsPrefs = getSharedPreferences("app_settings_prefs", Context.MODE_PRIVATE)
|
||||
val hasSeeded = settingsPrefs.getBoolean("has_seeded_default_device", false)
|
||||
if (!hasSeeded) {
|
||||
settingsPrefs.edit().putBoolean("has_seeded_default_device", true).apply()
|
||||
if (repository.getDevices().isEmpty()) {
|
||||
val defaultDevice = DeviceConfig(
|
||||
id = "2dc98ae9-9f71-4f29-95a6-a59ac94d7bf6",
|
||||
name = "Server",
|
||||
node = "debian",
|
||||
powerOffUrl = "https://cosmos.linuxguy.space/poweroff?node=debian",
|
||||
powerOnUrl = "https://trigger.macrodroid.com/87f2f62c-09ee-43cb-8796-fd1a6465754b/wakeserver",
|
||||
r2Url = "https://bucket.linuxguy.space/home-server-app/endpoints.json",
|
||||
rebootUrl = "https://cosmos.linuxguy.space/reboot?node=debian",
|
||||
secretKey = "Carbon@12",
|
||||
statusUrl = "https://cosmos.linuxguy.space/status?node=debian"
|
||||
)
|
||||
repository.addDevice(defaultDevice)
|
||||
}
|
||||
}
|
||||
triggerClient = TriggerClient()
|
||||
appSettings = AppSettings(applicationContext)
|
||||
historyRepository = TriggerHistoryRepository(applicationContext)
|
||||
|
||||
@@ -208,7 +208,7 @@ fun UpdateDialog(
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Text(
|
||||
text = "Downloading update…",
|
||||
text = if (downloadState.bytesDownloaded == 0L) "Connecting to server…" else "Downloading update…",
|
||||
fontSize = 12.sp,
|
||||
color = TextSecondary
|
||||
)
|
||||
@@ -220,15 +220,26 @@ fun UpdateDialog(
|
||||
)
|
||||
}
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
LinearProgressIndicator(
|
||||
progress = { downloadState.progressPercent / 100f },
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(8.dp)
|
||||
.clip(RoundedCornerShape(4.dp)),
|
||||
color = GreenVibrant,
|
||||
trackColor = GreenVibrant.copy(alpha = 0.15f)
|
||||
)
|
||||
if (downloadState.bytesDownloaded == 0L && downloadState.progressPercent == 0) {
|
||||
LinearProgressIndicator(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(8.dp)
|
||||
.clip(RoundedCornerShape(4.dp)),
|
||||
color = GreenVibrant,
|
||||
trackColor = GreenVibrant.copy(alpha = 0.15f)
|
||||
)
|
||||
} else {
|
||||
LinearProgressIndicator(
|
||||
progress = { (downloadState.progressPercent / 100f).coerceIn(0f, 1f) },
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(8.dp)
|
||||
.clip(RoundedCornerShape(4.dp)),
|
||||
color = GreenVibrant,
|
||||
trackColor = GreenVibrant.copy(alpha = 0.15f)
|
||||
)
|
||||
}
|
||||
if (downloadState.totalBytes > 0) {
|
||||
Spacer(modifier = Modifier.height(6.dp))
|
||||
val downloadedMb = String.format("%.1f", downloadState.bytesDownloaded / (1024.0 * 1024.0))
|
||||
@@ -238,6 +249,14 @@ fun UpdateDialog(
|
||||
fontSize = 11.sp,
|
||||
color = TextMuted
|
||||
)
|
||||
} else if (downloadState.bytesDownloaded > 0) {
|
||||
Spacer(modifier = Modifier.height(6.dp))
|
||||
val downloadedMb = String.format("%.1f MB", downloadState.bytesDownloaded / (1024.0 * 1024.0))
|
||||
Text(
|
||||
text = "$downloadedMb downloaded",
|
||||
fontSize = 11.sp,
|
||||
color = TextMuted
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -199,25 +199,27 @@ fun MainScreen(
|
||||
}
|
||||
}
|
||||
|
||||
fun checkAppUpdate(showToast: Boolean = false) {
|
||||
fun checkAppUpdate(isManual: Boolean = false) {
|
||||
isCheckingUpdate = true
|
||||
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
|
||||
isCheckingUpdate = false
|
||||
when (result) {
|
||||
is UpdateCheckResult.UpdateAvailable -> {
|
||||
availableUpdate = result.info
|
||||
if (showToast || dismissedVersion != result.info.versionName) {
|
||||
showUpdateDialog = true
|
||||
showUpdateDialog = true
|
||||
if (isManual) {
|
||||
Toast.makeText(context, "New update available: v${result.info.versionName}!", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
is UpdateCheckResult.UpToDate -> {
|
||||
if (showToast) {
|
||||
Toast.makeText(context, "App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
||||
availableUpdate = null
|
||||
if (isManual) {
|
||||
Toast.makeText(context, "Page refreshed • App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
is UpdateCheckResult.Error -> {
|
||||
if (showToast) {
|
||||
Toast.makeText(context, "Update check failed: ${result.message}", Toast.LENGTH_SHORT).show()
|
||||
if (isManual) {
|
||||
Toast.makeText(context, "Page refreshed • Update check failed", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -227,6 +229,7 @@ fun MainScreen(
|
||||
// Pull-to-refresh entire page handler
|
||||
fun refreshWholePage() {
|
||||
isPullRefreshing = true
|
||||
dismissedVersion = null
|
||||
coroutineScope.launch {
|
||||
// 1. Sync R2 endpoints
|
||||
syncEndpoints(showToast = false)
|
||||
@@ -236,15 +239,14 @@ fun MainScreen(
|
||||
refreshStatus(dev, showIndicator = true)
|
||||
}
|
||||
|
||||
// 3. Check for app updates
|
||||
checkAppUpdate(showToast = false)
|
||||
// 3. Explicitly check for app updates with user feedback
|
||||
checkAppUpdate(isManual = true)
|
||||
|
||||
// 4. Update home screen widgets
|
||||
ServerWidgetProvider.updateAllWidgets(context)
|
||||
|
||||
delay(750)
|
||||
isPullRefreshing = false
|
||||
Toast.makeText(context, "Page refreshed", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -648,9 +650,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, info.sizeBytes)
|
||||
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { checkResult ->
|
||||
if (checkResult is UpdateCheckResult.UpdateAvailable) {
|
||||
availableUpdate = checkResult.info
|
||||
val fresh = checkResult.info
|
||||
updateManager.downloadApk(fresh.downloadUrl, fresh.assetApiUrl, fresh.sizeBytes) { state ->
|
||||
downloadState = state
|
||||
}
|
||||
} else {
|
||||
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl, info.sizeBytes) { state ->
|
||||
downloadState = state
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
downloadState = DownloadState.Downloading(0, 0, info.sizeBytes)
|
||||
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl, info.sizeBytes) { 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,53 @@ 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,
|
||||
expectedSizeBytes: Long = 0L,
|
||||
onProgress: (DownloadState) -> Unit
|
||||
): Call {
|
||||
val request = Request.Builder()
|
||||
.url(downloadUrl)
|
||||
.addHeader("User-Agent", "ServerControlApp")
|
||||
.get()
|
||||
.build()
|
||||
return startDownloadCall(downloadUrl, assetApiUrl, expectedSizeBytes, isFallback = false, onProgress)
|
||||
}
|
||||
|
||||
private fun startDownloadCall(
|
||||
url: String,
|
||||
fallbackUrl: String?,
|
||||
expectedSizeBytes: Long,
|
||||
isFallback: Boolean,
|
||||
onProgress: (DownloadState) -> Unit
|
||||
): Call {
|
||||
// Instantly notify UI that connection/download is initializing so user gets immediate visual feedback
|
||||
runOnMain {
|
||||
onProgress(
|
||||
DownloadState.Downloading(
|
||||
progressPercent = 0,
|
||||
bytesDownloaded = 0L,
|
||||
totalBytes = expectedSizeBytes
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
val requestBuilder = Request.Builder()
|
||||
.url(url)
|
||||
.addHeader("User-Agent", "ServerControlApp")
|
||||
.addHeader("Accept-Encoding", "identity") // Disables gzip recompression to stream raw binary immediately with exact Content-Length
|
||||
|
||||
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, expectedSizeBytes, isFallback = true, onProgress)
|
||||
} else {
|
||||
runOnMain {
|
||||
onProgress(DownloadState.Failed("Download failed: ${e.localizedMessage}"))
|
||||
}
|
||||
@@ -184,15 +222,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, expectedSizeBytes, 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"))
|
||||
}
|
||||
@@ -209,14 +256,16 @@ class UpdateManager(
|
||||
}
|
||||
|
||||
try {
|
||||
val totalBytes = responseBody.contentLength()
|
||||
val rawLength = responseBody.contentLength()
|
||||
val totalBytes = if (rawLength > 0L) rawLength else expectedSizeBytes
|
||||
var bytesDownloaded = 0L
|
||||
|
||||
responseBody.byteStream().use { input ->
|
||||
FileOutputStream(apkFile).use { output ->
|
||||
val buffer = ByteArray(8192)
|
||||
responseBody.byteStream().buffered(65536).use { input ->
|
||||
FileOutputStream(apkFile).buffered(65536).use { output ->
|
||||
val buffer = ByteArray(65536)
|
||||
var read: Int
|
||||
var lastPercent = -1
|
||||
var lastUpdateTime = 0L
|
||||
|
||||
while (input.read(buffer).also { read = it } != -1) {
|
||||
if (call.isCanceled()) return
|
||||
@@ -224,12 +273,14 @@ class UpdateManager(
|
||||
output.write(buffer, 0, read)
|
||||
bytesDownloaded += read
|
||||
|
||||
val percent = if (totalBytes > 0) {
|
||||
((bytesDownloaded * 100) / totalBytes).toInt()
|
||||
val percent = if (totalBytes > 0L) {
|
||||
((bytesDownloaded * 100) / totalBytes).toInt().coerceIn(0, 100)
|
||||
} else 0
|
||||
|
||||
if (percent != lastPercent) {
|
||||
val now = System.currentTimeMillis()
|
||||
if (percent != lastPercent || (now - lastUpdateTime >= 100)) {
|
||||
lastPercent = percent
|
||||
lastUpdateTime = now
|
||||
runOnMain {
|
||||
onProgress(
|
||||
DownloadState.Downloading(
|
||||
@@ -245,8 +296,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 +311,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 {
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="108"
|
||||
android:viewportHeight="108">
|
||||
<group
|
||||
android:translateX="27.6"
|
||||
android:translateY="27.6"
|
||||
android:scaleX="2.2"
|
||||
android:scaleY="2.2">
|
||||
<path
|
||||
android:fillColor="#22C55E"
|
||||
android:pathData="M20,4H4C2.89,4 2,4.9 2,6v12c0,1.1 0.89,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18H4V8h16V18zM6.5,16.5l3.5,-3.5L6.5,9.5L7.91,8.09L12.83,13l-4.92,4.91L6.5,16.5zM12,15h5v2h-5V15z"/>
|
||||
</group>
|
||||
</vector>
|
||||
@@ -0,0 +1,15 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="108"
|
||||
android:viewportHeight="108">
|
||||
<group
|
||||
android:translateX="27.6"
|
||||
android:translateY="27.6"
|
||||
android:scaleX="2.2"
|
||||
android:scaleY="2.2">
|
||||
<path
|
||||
android:fillColor="#FFFFFFFF"
|
||||
android:pathData="M20,4H4C2.89,4 2,4.9 2,6v12c0,1.1 0.89,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18H4V8h16V18zM6.5,16.5l3.5,-3.5L6.5,9.5L7.91,8.09L12.83,13l-4.92,4.91L6.5,16.5zM12,15h5v2h-5V15z"/>
|
||||
</group>
|
||||
</vector>
|
||||
@@ -25,12 +25,13 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/widget_device_name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
@@ -41,7 +42,7 @@
|
||||
|
||||
<TextView
|
||||
android:id="@+id/widget_node_name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
|
||||
</adaptive-icon>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
|
||||
</adaptive-icon>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="ic_launcher_background">#0B0F19</color>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user