Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
27b632bcaa |
@@ -11,8 +11,8 @@ android {
|
|||||||
applicationId = "com.expapp.trigger"
|
applicationId = "com.expapp.trigger"
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 7
|
versionCode = 8
|
||||||
versionName = "1.1.3"
|
versionName = "1.1.4"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables {
|
vectorDrawables {
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ fun UpdateDialog(
|
|||||||
horizontalArrangement = Arrangement.SpaceBetween
|
horizontalArrangement = Arrangement.SpaceBetween
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = "Downloading update…",
|
text = if (downloadState.bytesDownloaded == 0L) "Connecting to server…" else "Downloading update…",
|
||||||
fontSize = 12.sp,
|
fontSize = 12.sp,
|
||||||
color = TextSecondary
|
color = TextSecondary
|
||||||
)
|
)
|
||||||
@@ -220,8 +220,8 @@ fun UpdateDialog(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
Spacer(modifier = Modifier.height(8.dp))
|
Spacer(modifier = Modifier.height(8.dp))
|
||||||
|
if (downloadState.bytesDownloaded == 0L && downloadState.progressPercent == 0) {
|
||||||
LinearProgressIndicator(
|
LinearProgressIndicator(
|
||||||
progress = { downloadState.progressPercent / 100f },
|
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.height(8.dp)
|
.height(8.dp)
|
||||||
@@ -229,6 +229,17 @@ fun UpdateDialog(
|
|||||||
color = GreenVibrant,
|
color = GreenVibrant,
|
||||||
trackColor = GreenVibrant.copy(alpha = 0.15f)
|
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) {
|
if (downloadState.totalBytes > 0) {
|
||||||
Spacer(modifier = Modifier.height(6.dp))
|
Spacer(modifier = Modifier.height(6.dp))
|
||||||
val downloadedMb = String.format("%.1f", downloadState.bytesDownloaded / (1024.0 * 1024.0))
|
val downloadedMb = String.format("%.1f", downloadState.bytesDownloaded / (1024.0 * 1024.0))
|
||||||
@@ -238,6 +249,14 @@ fun UpdateDialog(
|
|||||||
fontSize = 11.sp,
|
fontSize = 11.sp,
|
||||||
color = TextMuted
|
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
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -199,25 +199,27 @@ fun MainScreen(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun checkAppUpdate(showToast: Boolean = false) {
|
fun checkAppUpdate(isManual: Boolean = false) {
|
||||||
isCheckingUpdate = true
|
isCheckingUpdate = true
|
||||||
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
|
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
|
||||||
isCheckingUpdate = false
|
isCheckingUpdate = false
|
||||||
when (result) {
|
when (result) {
|
||||||
is UpdateCheckResult.UpdateAvailable -> {
|
is UpdateCheckResult.UpdateAvailable -> {
|
||||||
availableUpdate = result.info
|
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 -> {
|
is UpdateCheckResult.UpToDate -> {
|
||||||
if (showToast) {
|
availableUpdate = null
|
||||||
Toast.makeText(context, "App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
if (isManual) {
|
||||||
|
Toast.makeText(context, "Page refreshed • App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
is UpdateCheckResult.Error -> {
|
is UpdateCheckResult.Error -> {
|
||||||
if (showToast) {
|
if (isManual) {
|
||||||
Toast.makeText(context, "Update check failed: ${result.message}", Toast.LENGTH_SHORT).show()
|
Toast.makeText(context, "Page refreshed • Update check failed", Toast.LENGTH_SHORT).show()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -227,6 +229,7 @@ fun MainScreen(
|
|||||||
// Pull-to-refresh entire page handler
|
// Pull-to-refresh entire page handler
|
||||||
fun refreshWholePage() {
|
fun refreshWholePage() {
|
||||||
isPullRefreshing = true
|
isPullRefreshing = true
|
||||||
|
dismissedVersion = null
|
||||||
coroutineScope.launch {
|
coroutineScope.launch {
|
||||||
// 1. Sync R2 endpoints
|
// 1. Sync R2 endpoints
|
||||||
syncEndpoints(showToast = false)
|
syncEndpoints(showToast = false)
|
||||||
@@ -236,15 +239,14 @@ fun MainScreen(
|
|||||||
refreshStatus(dev, showIndicator = true)
|
refreshStatus(dev, showIndicator = true)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. Check for app updates
|
// 3. Explicitly check for app updates with user feedback
|
||||||
checkAppUpdate(showToast = false)
|
checkAppUpdate(isManual = true)
|
||||||
|
|
||||||
// 4. Update home screen widgets
|
// 4. Update home screen widgets
|
||||||
ServerWidgetProvider.updateAllWidgets(context)
|
ServerWidgetProvider.updateAllWidgets(context)
|
||||||
|
|
||||||
delay(750)
|
delay(750)
|
||||||
isPullRefreshing = false
|
isPullRefreshing = false
|
||||||
Toast.makeText(context, "Page refreshed", Toast.LENGTH_SHORT).show()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -651,23 +653,23 @@ fun MainScreen(
|
|||||||
val info = availableUpdate!!
|
val info = availableUpdate!!
|
||||||
// If retrying from failure, re-check to get fresh release asset URLs
|
// If retrying from failure, re-check to get fresh release asset URLs
|
||||||
if (downloadState is DownloadState.Failed) {
|
if (downloadState is DownloadState.Failed) {
|
||||||
downloadState = DownloadState.Downloading(0, 0, 0)
|
downloadState = DownloadState.Downloading(0, 0, info.sizeBytes)
|
||||||
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { checkResult ->
|
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { checkResult ->
|
||||||
if (checkResult is UpdateCheckResult.UpdateAvailable) {
|
if (checkResult is UpdateCheckResult.UpdateAvailable) {
|
||||||
availableUpdate = checkResult.info
|
availableUpdate = checkResult.info
|
||||||
val fresh = checkResult.info
|
val fresh = checkResult.info
|
||||||
updateManager.downloadApk(fresh.downloadUrl, fresh.assetApiUrl) { state ->
|
updateManager.downloadApk(fresh.downloadUrl, fresh.assetApiUrl, fresh.sizeBytes) { state ->
|
||||||
downloadState = state
|
downloadState = state
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl) { state ->
|
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl, info.sizeBytes) { state ->
|
||||||
downloadState = state
|
downloadState = state
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
downloadState = DownloadState.Downloading(0, 0, info.sizeBytes)
|
downloadState = DownloadState.Downloading(0, 0, info.sizeBytes)
|
||||||
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl) { state ->
|
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl, info.sizeBytes) { state ->
|
||||||
downloadState = state
|
downloadState = state
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -173,20 +173,34 @@ class UpdateManager(
|
|||||||
fun downloadApk(
|
fun downloadApk(
|
||||||
downloadUrl: String,
|
downloadUrl: String,
|
||||||
assetApiUrl: String? = null,
|
assetApiUrl: String? = null,
|
||||||
|
expectedSizeBytes: Long = 0L,
|
||||||
onProgress: (DownloadState) -> Unit
|
onProgress: (DownloadState) -> Unit
|
||||||
): Call {
|
): Call {
|
||||||
return startDownloadCall(downloadUrl, assetApiUrl, isFallback = false, onProgress)
|
return startDownloadCall(downloadUrl, assetApiUrl, expectedSizeBytes, isFallback = false, onProgress)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun startDownloadCall(
|
private fun startDownloadCall(
|
||||||
url: String,
|
url: String,
|
||||||
fallbackUrl: String?,
|
fallbackUrl: String?,
|
||||||
|
expectedSizeBytes: Long,
|
||||||
isFallback: Boolean,
|
isFallback: Boolean,
|
||||||
onProgress: (DownloadState) -> Unit
|
onProgress: (DownloadState) -> Unit
|
||||||
): Call {
|
): 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()
|
val requestBuilder = Request.Builder()
|
||||||
.url(url)
|
.url(url)
|
||||||
.addHeader("User-Agent", "ServerControlApp")
|
.addHeader("User-Agent", "ServerControlApp")
|
||||||
|
.addHeader("Accept-Encoding", "identity") // Disables gzip recompression to stream raw binary immediately with exact Content-Length
|
||||||
|
|
||||||
if (isFallback) {
|
if (isFallback) {
|
||||||
requestBuilder.addHeader("Accept", "application/octet-stream")
|
requestBuilder.addHeader("Accept", "application/octet-stream")
|
||||||
@@ -199,7 +213,7 @@ class UpdateManager(
|
|||||||
override fun onFailure(call: Call, e: IOException) {
|
override fun onFailure(call: Call, e: IOException) {
|
||||||
if (call.isCanceled()) return
|
if (call.isCanceled()) return
|
||||||
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
|
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
|
||||||
startDownloadCall(fallbackUrl, null, isFallback = true, onProgress)
|
startDownloadCall(fallbackUrl, null, expectedSizeBytes, isFallback = true, onProgress)
|
||||||
} else {
|
} else {
|
||||||
runOnMain {
|
runOnMain {
|
||||||
onProgress(DownloadState.Failed("Download failed: ${e.localizedMessage}"))
|
onProgress(DownloadState.Failed("Download failed: ${e.localizedMessage}"))
|
||||||
@@ -214,7 +228,7 @@ class UpdateManager(
|
|||||||
response.close()
|
response.close()
|
||||||
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
|
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
|
||||||
// Fallback to direct asset API
|
// Fallback to direct asset API
|
||||||
startDownloadCall(fallbackUrl, null, isFallback = true, onProgress)
|
startDownloadCall(fallbackUrl, null, expectedSizeBytes, isFallback = true, onProgress)
|
||||||
} else {
|
} else {
|
||||||
runOnMain {
|
runOnMain {
|
||||||
onProgress(DownloadState.Failed("Server returned HTTP ${response.code}"))
|
onProgress(DownloadState.Failed("Server returned HTTP ${response.code}"))
|
||||||
@@ -242,14 +256,16 @@ class UpdateManager(
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
val totalBytes = responseBody.contentLength()
|
val rawLength = responseBody.contentLength()
|
||||||
|
val totalBytes = if (rawLength > 0L) rawLength else expectedSizeBytes
|
||||||
var bytesDownloaded = 0L
|
var bytesDownloaded = 0L
|
||||||
|
|
||||||
responseBody.byteStream().use { input ->
|
responseBody.byteStream().buffered(65536).use { input ->
|
||||||
FileOutputStream(apkFile).use { output ->
|
FileOutputStream(apkFile).buffered(65536).use { output ->
|
||||||
val buffer = ByteArray(8192)
|
val buffer = ByteArray(65536)
|
||||||
var read: Int
|
var read: Int
|
||||||
var lastPercent = -1
|
var lastPercent = -1
|
||||||
|
var lastUpdateTime = 0L
|
||||||
|
|
||||||
while (input.read(buffer).also { read = it } != -1) {
|
while (input.read(buffer).also { read = it } != -1) {
|
||||||
if (call.isCanceled()) return
|
if (call.isCanceled()) return
|
||||||
@@ -257,12 +273,14 @@ class UpdateManager(
|
|||||||
output.write(buffer, 0, read)
|
output.write(buffer, 0, read)
|
||||||
bytesDownloaded += read
|
bytesDownloaded += read
|
||||||
|
|
||||||
val percent = if (totalBytes > 0) {
|
val percent = if (totalBytes > 0L) {
|
||||||
((bytesDownloaded * 100) / totalBytes).toInt()
|
((bytesDownloaded * 100) / totalBytes).toInt().coerceIn(0, 100)
|
||||||
} else 0
|
} else 0
|
||||||
|
|
||||||
if (percent != lastPercent) {
|
val now = System.currentTimeMillis()
|
||||||
|
if (percent != lastPercent || (now - lastUpdateTime >= 100)) {
|
||||||
lastPercent = percent
|
lastPercent = percent
|
||||||
|
lastUpdateTime = now
|
||||||
runOnMain {
|
runOnMain {
|
||||||
onProgress(
|
onProgress(
|
||||||
DownloadState.Downloading(
|
DownloadState.Downloading(
|
||||||
|
|||||||
Reference in New Issue
Block a user