morgane/EverShelf
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix: preloader + update notification robustness

Browse Source 
- Add full-screen CSS preloader to webapp (fades out when _initApp completes)
- Defer _checkWebappUpdate() to 6s after app init so it does not compete
  with startup API calls (fixes perceived slowness on first load)
- Switch update-check throttle from sessionStorage to localStorage (6h TTL);
  use release published_at instead of version string for comparison, so the
  banner correctly appears when a new release is published regardless of whether
  the tag is a semver or the rolling "latest" tag
- PHP _isLatestVersion(): return true (do not suppress error reports) when
  tag_name is non-semver (e.g. "latest") — was incorrectly blocking ALL reports
- Kiosk checkForUpdates(): show banner only when the release asset actually
  contains an APK for the component; handle non-semver tag by treating it
  as always-update (prevents silent no-op with rolling "latest" tag)
- Scale gateway checkForUpdates(): same non-semver fix; apkUrl now defaults
  to empty and bails out if no matching APK found in assets (prevents 404 install)
This commit is contained in:
dadaloop82
2026-05-03 17:46:42 +00:00
parent f9718fee6d
commit 58e69625bd
6 changed files with 118 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt
+21 -12
View File
@@ -699,21 +699,16 @@ class KioskActivity : AppCompatActivity() {
// Normalise: strip leading 'v' for comparison
val norm = { v: String -> v.trimStart('v') }
val kioskNeedsUpdate = latestTag.isNotEmpty() && currentKiosk.isNotEmpty() &&
norm(latestTag) != norm(currentKiosk)
val gatewayNeedsUpdate = currentGateway != null && latestTag.isNotEmpty() &&
norm(latestTag) != norm(currentGateway)
if (!kioskNeedsUpdate && !gatewayNeedsUpdate) return@Thread
// If tag is not semver-like (e.g. "latest") we can't compare — treat as "needs update"
val isSemver = latestTag.trimStart('v').matches(Regex("\\d+\\.\\d+.*"))
// Find APK download URLs in release assets
val assets = json.optJSONArray("assets")
var kioskApkUrl = KIOSK_DOWNLOAD_URL
var gatewayApkUrl = GATEWAY_DOWNLOAD_URL
var kioskApkUrl = "" // only set if the release actually contains the APK
var gatewayApkUrl = ""
if (assets != null) {
for (i in 0 until assets.length()) {
val a = assets.getJSONObject(i)
val a = assets.getJSONObject(i)
val name = a.optString("name", "").lowercase()
val url = a.optString("browser_download_url", "")
if (name.contains("kiosk") && url.isNotEmpty()) kioskApkUrl = url
@@ -721,15 +716,29 @@ class KioskActivity : AppCompatActivity() {
}
}
// Kiosk needs update: APK is in release AND (non-semver tag OR version mismatch)
val kioskHasApk = kioskApkUrl.isNotEmpty()
val kioskNeedsUpdate = kioskHasApk && currentKiosk.isNotEmpty() &&
(!isSemver || norm(latestTag) != norm(currentKiosk))
// Gateway needs update: installed AND APK in release AND (non-semver OR mismatch)
val gatewayHasApk = gatewayApkUrl.isNotEmpty()
val gatewayNeedsUpdate = currentGateway != null && gatewayHasApk &&
(!isSemver || norm(latestTag) != norm(currentGateway))
if (!kioskNeedsUpdate && !gatewayNeedsUpdate) return@Thread
// Build message and choose primary download (kiosk takes precedence)
val lines = mutableListOf<String>()
var primaryApkUrl = ""
if (kioskNeedsUpdate) {
lines += "🔄 Kiosk $currentKiosk → $latestTag"
val label = if (isSemver) "$currentKiosk → $latestTag" else latestTag
lines += "🔄 Kiosk $label"
primaryApkUrl = kioskApkUrl
}
if (gatewayNeedsUpdate) {
lines += "🔄 Scale Gateway $currentGateway → $latestTag"
val label = if (isSemver) "$currentGateway → $latestTag" else latestTag
lines += "🔄 Scale Gateway $label"
if (primaryApkUrl.isEmpty()) primaryApkUrl = gatewayApkUrl
}
val message = lines.joinToString(" • ")