3 Commits
Author SHA1 Message Date
Vaishno Singh 2f38ea7dcc feat(update,notifications): fetch updates from forge.linuxguy.space with github fallback, refine notifications, disable reboot alerts (v1.2.0)
Build & Release Android APK / Build & Publish Release APK (push) Successful in 9m48s
2026-11-19 15:06:15 +05:30
Vaishno Singh bba5caf79d fix(ui,update): remove refresh button, rely on pull-to-refresh, sync update check in background worker (v1.1.9)
Build & Release Android APK / Build & Publish Release APK (push) Successful in 32m10s
2026-11-19 10:50:47 +05:30
Vaishno Singh d8eaceb314 fix(ui): eliminate button overlapping with overflow menu & clean top bar (v1.1.8)
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
2026-11-19 10:35:50 +05:30
7 changed files with 263 additions and 230 deletions
+2 -2
View File
@@ -11,8 +11,8 @@ android {
applicationId = "com.expapp.trigger" applicationId = "com.expapp.trigger"
minSdk = 24 minSdk = 24
targetSdk = 34 targetSdk = 34
versionCode = 11 versionCode = 14
versionName = "1.1.7" versionName = "1.2.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
@@ -181,7 +181,7 @@ class TriggerClient(
val baseStatusUrl = device.statusUrl.trim() val baseStatusUrl = device.statusUrl.trim()
if (baseStatusUrl.isBlank()) { if (baseStatusUrl.isBlank()) {
runOnMain { runOnMain {
callback(NodeStatus(isOnline = false, statusText = "NO STATUS URL")) callback(NodeStatus(isOnline = false, statusText = "NO STATUS URL", isReachable = false))
} }
return return
} }
@@ -190,7 +190,7 @@ class TriggerClient(
Request.Builder().url(baseStatusUrl).get().build() Request.Builder().url(baseStatusUrl).get().build()
} catch (e: Exception) { } catch (e: Exception) {
runOnMain { runOnMain {
callback(NodeStatus(isOnline = false, statusText = "INVALID URL")) callback(NodeStatus(isOnline = false, statusText = "INVALID URL", isReachable = false))
} }
return return
} }
@@ -205,7 +205,7 @@ class TriggerClient(
override fun onResponse(call: Call, response: Response) { override fun onResponse(call: Call, response: Response) {
val nodeStatus = response.use { val nodeStatus = response.use {
val body = it.body?.string().orEmpty().trim() val body = it.body?.string().orEmpty().trim()
parseNodeStatus(body, it.isSuccessful) parseNodeStatus(body, it.isSuccessful, device.node)
} }
runOnMain { callback(nodeStatus) } runOnMain { callback(nodeStatus) }
} }
@@ -223,17 +223,37 @@ class TriggerClient(
val response = client.newCall(request).execute() val response = client.newCall(request).execute()
response.use { response.use {
val body = it.body?.string().orEmpty().trim() val body = it.body?.string().orEmpty().trim()
parseNodeStatus(body, it.isSuccessful) parseNodeStatus(body, it.isSuccessful, device.node)
} }
} catch (e: Exception) { } catch (e: Exception) {
NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false) NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false)
} }
} }
private fun parseNodeStatus(body: String, isHttpSuccess: Boolean): NodeStatus { private fun parseNodeStatus(body: String, isHttpSuccess: Boolean, targetNode: String = ""): NodeStatus {
if (body.startsWith("{")) { if (body.startsWith("{")) {
return try { return try {
val json = com.google.gson.JsonParser.parseString(body).asJsonObject val rootJson = com.google.gson.JsonParser.parseString(body).asJsonObject
// Support both single-node JSON ({"node":"debian", "online":true, ...})
// and multi-node dashboard JSON ({"service":"Tailscale Sentinel", "nodes":{"debian":{...}, ...}})
val json = if (rootJson.has("nodes") && rootJson.get("nodes").isJsonObject) {
val nodesObj = rootJson.getAsJsonObject("nodes")
var matchedObj: com.google.gson.JsonObject? = null
if (targetNode.isNotBlank()) {
for (key in nodesObj.keySet()) {
if (key.equals(targetNode, ignoreCase = true)) {
matchedObj = nodesObj.getAsJsonObject(key)
break
}
}
}
// If targetNode not matched or not provided, fallback to root or first entry
matchedObj ?: if (nodesObj.size() > 0) nodesObj.entrySet().first().value.asJsonObject else rootJson
} else {
rootJson
}
val online = when { val online = when {
json.has("online") && json.get("online").isJsonPrimitive && json.get("online").asJsonPrimitive.isBoolean -> json.has("online") && json.get("online").isJsonPrimitive && json.get("online").asJsonPrimitive.isBoolean ->
json.get("online").asBoolean json.get("online").asBoolean
@@ -264,16 +284,17 @@ class TriggerClient(
uptime = uptime, uptime = uptime,
onSinceIst = onSinceIst, onSinceIst = onSinceIst,
lastActiveAgo = lastActiveAgo, lastActiveAgo = lastActiveAgo,
lastActiveIst = lastActiveIst lastActiveIst = lastActiveIst,
isReachable = true
) )
} catch (e: Exception) { } catch (e: Exception) {
NodeStatus(isOnline = false, statusText = "ERROR") NodeStatus(isOnline = false, statusText = "ERROR", isReachable = true)
} }
} else if (isHttpSuccess) { } else if (isHttpSuccess) {
val isOnline = body.equals("ONLINE", ignoreCase = true) val isOnline = body.equals("ONLINE", ignoreCase = true)
return NodeStatus(isOnline = isOnline, statusText = if (isOnline) "ONLINE" else "OFFLINE") return NodeStatus(isOnline = isOnline, statusText = if (isOnline) "ONLINE" else "OFFLINE", isReachable = true)
} else { } else {
return NodeStatus(isOnline = false, statusText = "OFFLINE") return NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false)
} }
} }
} }
@@ -31,12 +31,13 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.CloudSync import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material.icons.filled.DeleteOutline import androidx.compose.material.icons.filled.DeleteOutline
import androidx.compose.material.icons.filled.Edit import androidx.compose.material.icons.filled.Edit
import androidx.compose.material.icons.filled.PowerOff import androidx.compose.material.icons.filled.PowerOff
import androidx.compose.material.icons.filled.PowerSettingsNew import androidx.compose.material.icons.filled.PowerSettingsNew
import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.icons.filled.RestartAlt import androidx.compose.material.icons.filled.RestartAlt
import androidx.compose.material.icons.filled.Schedule import androidx.compose.material.icons.filled.Schedule
import androidx.compose.material.icons.filled.Terminal import androidx.compose.material.icons.filled.Terminal
@@ -119,6 +120,7 @@ fun DevicePage(
var pendingAction by remember { mutableStateOf<TriggerAction?>(null) } var pendingAction by remember { mutableStateOf<TriggerAction?>(null) }
var showDeleteConfirm by remember { mutableStateOf(false) } var showDeleteConfirm by remember { mutableStateOf(false) }
var showEditDialog by remember { mutableStateOf(false) } var showEditDialog by remember { mutableStateOf(false) }
var showMenu by remember { mutableStateOf(false) }
if (showEditDialog) { if (showEditDialog) {
var editName by remember { mutableStateOf(device.name) } var editName by remember { mutableStateOf(device.name) }
@@ -259,15 +261,8 @@ fun DevicePage(
) )
} }
// Spin animation for refresh icon
val infiniteTransition = rememberInfiniteTransition(label = "refresh_spin")
val spinAngle by infiniteTransition.animateFloat(
initialValue = 0f, targetValue = 360f,
animationSpec = infiniteRepeatable(tween(900, easing = LinearEasing)),
label = "spin"
)
// Pulse for online dot // Pulse for online dot
val infiniteTransition = rememberInfiniteTransition(label = "pulse_transition")
val pulseScale by infiniteTransition.animateFloat( val pulseScale by infiniteTransition.animateFloat(
initialValue = 0.8f, targetValue = 1.5f, initialValue = 0.8f, targetValue = 1.5f,
animationSpec = infiniteRepeatable( animationSpec = infiniteRepeatable(
@@ -391,46 +386,10 @@ fun DevicePage(
) )
} }
// Compact, non-overlapping button bar // Device options menu (Edit / Delete)
Row( Box {
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
// Refresh button (syncs status & R2 endpoints)
IconButton( IconButton(
onClick = { onClick = { showMenu = true },
if (!isCheckingStatus) {
onRefreshStatus()
onSyncConfig()
}
},
modifier = Modifier
.size(34.dp)
.clip(RoundedCornerShape(9.dp))
.background(
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.15f)
else BorderSubtle.copy(alpha = 0.25f)
)
.border(
1.dp,
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.4f)
else BorderSubtle,
RoundedCornerShape(9.dp)
)
) {
Icon(
imageVector = Icons.Default.Refresh,
contentDescription = "Refresh server",
tint = if (isCheckingStatus) GreenVibrant else TextSecondary,
modifier = Modifier
.size(17.dp)
.rotate(if (isCheckingStatus) spinAngle else 0f)
)
}
// Edit device button
IconButton(
onClick = { showEditDialog = true },
modifier = Modifier modifier = Modifier
.size(34.dp) .size(34.dp)
.clip(RoundedCornerShape(9.dp)) .clip(RoundedCornerShape(9.dp))
@@ -438,27 +397,49 @@ fun DevicePage(
.border(1.dp, BorderSubtle, RoundedCornerShape(9.dp)) .border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
) { ) {
Icon( Icon(
imageVector = Icons.Default.Edit, imageVector = Icons.Default.MoreVert,
contentDescription = "Edit device", contentDescription = "Device options",
tint = TextSecondary, tint = TextSecondary,
modifier = Modifier.size(16.dp) modifier = Modifier.size(18.dp)
) )
} }
// Delete button DropdownMenu(
IconButton( expanded = showMenu,
onClick = { showDeleteConfirm = true }, onDismissRequest = { showMenu = false },
modifier = Modifier modifier = Modifier
.size(34.dp) .background(BgElevated)
.clip(RoundedCornerShape(9.dp)) .border(1.dp, BorderSubtle, RoundedCornerShape(12.dp))
.background(RedVibrant.copy(alpha = 0.08f))
.border(1.dp, RedVibrant.copy(alpha = 0.2f), RoundedCornerShape(9.dp))
) { ) {
DropdownMenuItem(
text = { Text("Edit Device", color = TextPrimary) },
leadingIcon = {
Icon( Icon(
imageVector = Icons.Default.DeleteOutline, Icons.Default.Edit,
contentDescription = "Remove device", contentDescription = null,
tint = RedVibrant.copy(alpha = 0.8f), tint = TextSecondary,
modifier = Modifier.size(17.dp) modifier = Modifier.size(18.dp)
)
},
onClick = {
showMenu = false
showEditDialog = true
}
)
DropdownMenuItem(
text = { Text("Remove Device", color = RedVibrant) },
leadingIcon = {
Icon(
Icons.Default.DeleteOutline,
contentDescription = null,
tint = RedVibrant,
modifier = Modifier.size(18.dp)
)
},
onClick = {
showMenu = false
showDeleteConfirm = true
}
) )
} }
} }
@@ -327,13 +327,6 @@ fun MainScreen(
} }
} }
// Spin animation for sync button
val rotationAngle by animateFloatAsState(
targetValue = if (isSyncing) 360f else 0f,
animationSpec = if (isSyncing) tween(900, easing = FastOutSlowInEasing) else tween(0),
label = "sync_rotate"
)
Scaffold( Scaffold(
modifier = modifier.fillMaxSize(), modifier = modifier.fillMaxSize(),
containerColor = BgBase, containerColor = BgBase,
@@ -341,52 +334,50 @@ fun MainScreen(
TopAppBar( TopAppBar(
title = { title = {
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically
modifier = Modifier.padding(start = 2.dp)
) { ) {
Icon( Icon(
Icons.Default.Terminal, Icons.Default.Terminal,
contentDescription = null, contentDescription = null,
tint = GreenVibrant, tint = GreenVibrant,
modifier = Modifier.size(18.dp) modifier = Modifier.size(16.dp)
) )
Spacer(modifier = Modifier.width(6.dp)) Spacer(modifier = Modifier.width(4.dp))
Text( Text(
text = "DEVICE TRIGGER", text = "TRIGGER",
fontSize = 12.sp, fontSize = 12.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
letterSpacing = 1.2.sp, letterSpacing = 1.sp,
color = TextPrimary, color = TextPrimary,
fontFamily = FontFamily.Monospace, fontFamily = FontFamily.Monospace,
maxLines = 1 maxLines = 1
) )
val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true } val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true }
if (devices.isNotEmpty() && onlineCount > 0) { if (devices.isNotEmpty() && onlineCount > 0) {
Spacer(modifier = Modifier.width(6.dp)) Spacer(modifier = Modifier.width(4.dp))
Box( Box(
modifier = Modifier modifier = Modifier
.clip(CircleShape) .clip(CircleShape)
.background(OnlineBg) .background(OnlineBg)
.border(1.dp, OnlineBorder, CircleShape) .border(1.dp, OnlineBorder, CircleShape)
.padding(horizontal = 6.dp, vertical = 2.dp) .padding(horizontal = 5.dp, vertical = 1.dp)
) { ) {
Text( Text(
"$onlineCount on", "$onlineCount",
fontSize = 9.sp, fontSize = 9.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = OnlineText, color = OnlineText
letterSpacing = 0.5.sp
) )
} }
} }
} }
}, },
actions = { actions = {
// Update Button // Update Button (only when update is ready)
if (availableUpdate != null) { if (availableUpdate != null) {
IconButton( IconButton(
onClick = { showUpdateDialog = true }, onClick = { showUpdateDialog = true },
modifier = Modifier.size(32.dp) modifier = Modifier.size(30.dp)
) { ) {
Box(contentAlignment = Alignment.TopEnd) { Box(contentAlignment = Alignment.TopEnd) {
Icon( Icon(
@@ -411,55 +402,39 @@ fun MainScreen(
historyLogs = historyRepository.getLogs() historyLogs = historyRepository.getLogs()
showHistoryDialog = true showHistoryDialog = true
}, },
modifier = Modifier.size(32.dp) modifier = Modifier.size(30.dp)
) { ) {
Icon( Icon(
Icons.Default.History, Icons.Default.History,
contentDescription = "Trigger History", contentDescription = "Trigger History",
tint = TextSecondary, tint = TextSecondary,
modifier = Modifier.size(19.dp) modifier = Modifier.size(18.dp)
) )
} }
// Settings Button // Settings Button
IconButton( IconButton(
onClick = { showSettingsDialog = true }, onClick = { showSettingsDialog = true },
modifier = Modifier.size(32.dp) modifier = Modifier.size(30.dp)
) { ) {
Icon( Icon(
Icons.Default.Settings, Icons.Default.Settings,
contentDescription = "Settings", contentDescription = "Settings",
tint = TextSecondary, tint = TextSecondary,
modifier = Modifier.size(19.dp) modifier = Modifier.size(18.dp)
)
}
// Unified Refresh / Sync Button
IconButton(
onClick = { refreshWholePage() },
enabled = !isSyncing && !isPullRefreshing,
modifier = Modifier.size(32.dp)
) {
Icon(
Icons.Default.Refresh,
"Refresh all",
tint = if (isSyncing || isPullRefreshing) TextMuted else GreenVibrant,
modifier = Modifier
.size(19.dp)
.rotate(if (isSyncing || isPullRefreshing) rotationAngle else 0f)
) )
} }
// Add Device Button // Add Device Button
IconButton( IconButton(
onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } }, onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } },
modifier = Modifier.size(32.dp) modifier = Modifier.size(30.dp)
) { ) {
Icon( Icon(
Icons.Default.Add, Icons.Default.Add,
"Add Device", "Add Device",
tint = GreenVibrant, tint = GreenVibrant,
modifier = Modifier.size(20.dp) modifier = Modifier.size(19.dp)
) )
} }
}, },
@@ -30,7 +30,8 @@ class UpdateManager(
.connectTimeout(30, TimeUnit.SECONDS) .connectTimeout(30, TimeUnit.SECONDS)
.readTimeout(60, TimeUnit.SECONDS) .readTimeout(60, TimeUnit.SECONDS)
.build(), .build(),
val githubRepo: String = "vaishnosingh/server-control-app" val primaryReleasesUrl: String = "https://forge.linuxguy.space/api/v1/repos/vaishnosingh/server-control-app/releases",
val fallbackReleasesUrl: String = "https://api.github.com/repos/vaishnosingh/server-control-app/releases"
) { ) {
private val mainHandler = try { private val mainHandler = try {
val looper = Looper.getMainLooper() val looper = Looper.getMainLooper()
@@ -44,15 +45,80 @@ class UpdateManager(
} }
/** /**
* Checks GitHub Releases API for the latest published release. * Synchronously checks for updates from the self-hosted Git server (primary),
* and automatically falls back to GitHub if the primary server fails or is unreachable.
* Suitable for use inside background workers (e.g. WorkManager CoroutineWorker).
*/
fun checkForUpdateSync(currentVersionName: String): UpdateCheckResult {
// 1. Try Primary: Self-hosted Git server (forge.linuxguy.space)
val primaryResult = queryReleasesSync(primaryReleasesUrl, currentVersionName)
if (primaryResult is UpdateCheckResult.UpdateAvailable || primaryResult is UpdateCheckResult.UpToDate) {
return primaryResult
}
// 2. Fallback: GitHub releases API
val fallbackResult = queryReleasesSync(fallbackReleasesUrl, currentVersionName)
if (fallbackResult is UpdateCheckResult.UpdateAvailable || fallbackResult is UpdateCheckResult.UpToDate) {
return fallbackResult
}
return primaryResult // Return original error if both failed
}
private fun queryReleasesSync(url: String, currentVersionName: String): UpdateCheckResult {
val request = Request.Builder()
.url(url)
.addHeader("Accept", "application/vnd.github.v3+json")
.addHeader("User-Agent", "ServerControlApp")
.get()
.build()
return try {
val response = okHttpClient.newCall(request).execute()
response.use { res ->
if (res.code == 404) {
return UpdateCheckResult.UpToDate
}
if (!res.isSuccessful) {
return UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates from $url")
}
val body = res.body?.string().orEmpty()
parseReleases(body, currentVersionName)
}
} catch (e: Exception) {
UpdateCheckResult.Error("Network error ($url): ${e.localizedMessage}")
}
}
/**
* Asynchronously checks for updates with primary (self-hosted) -> fallback (GitHub) strategy.
*/ */
fun checkForUpdate( fun checkForUpdate(
currentVersionName: String, currentVersionName: String,
callback: (UpdateCheckResult) -> Unit callback: (UpdateCheckResult) -> Unit
) { ) {
// Query releases list so we always inspect the highest semantic version // Try Primary first
val url = "https://api.github.com/repos/$githubRepo/releases" queryReleasesAsync(primaryReleasesUrl, currentVersionName) { primaryResult ->
if (primaryResult is UpdateCheckResult.UpdateAvailable || primaryResult is UpdateCheckResult.UpToDate) {
runOnMain { callback(primaryResult) }
} else {
// Primary failed, query GitHub fallback
queryReleasesAsync(fallbackReleasesUrl, currentVersionName) { fallbackResult ->
if (fallbackResult is UpdateCheckResult.UpdateAvailable || fallbackResult is UpdateCheckResult.UpToDate) {
runOnMain { callback(fallbackResult) }
} else {
runOnMain { callback(primaryResult) }
}
}
}
}
}
private fun queryReleasesAsync(
url: String,
currentVersionName: String,
onComplete: (UpdateCheckResult) -> Unit
) {
val request = Request.Builder() val request = Request.Builder()
.url(url) .url(url)
.addHeader("Accept", "application/vnd.github.v3+json") .addHeader("Accept", "application/vnd.github.v3+json")
@@ -62,31 +128,34 @@ class UpdateManager(
okHttpClient.newCall(request).enqueue(object : Callback { okHttpClient.newCall(request).enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) { override fun onFailure(call: Call, e: IOException) {
runOnMain { onComplete(UpdateCheckResult.Error("Network error: ${e.localizedMessage}"))
callback(UpdateCheckResult.Error("Network error: ${e.localizedMessage}"))
}
} }
override fun onResponse(call: Call, response: Response) { override fun onResponse(call: Call, response: Response) {
response.use { res -> response.use { res ->
if (res.code == 404) { if (res.code == 404) {
runOnMain { callback(UpdateCheckResult.UpToDate) } onComplete(UpdateCheckResult.UpToDate)
return return
} }
if (!res.isSuccessful) { if (!res.isSuccessful) {
runOnMain { onComplete(UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates"))
callback(UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates"))
}
return return
} }
val body = res.body?.string().orEmpty() val body = res.body?.string().orEmpty()
try { val result = parseReleases(body, currentVersionName)
onComplete(result)
}
}
})
}
private fun parseReleases(body: String, currentVersionName: String): UpdateCheckResult {
return try {
val jsonElement = JsonParser.parseString(body) val jsonElement = JsonParser.parseString(body)
val releasesArray = if (jsonElement.isJsonArray) { val releasesArray = if (jsonElement.isJsonArray) {
jsonElement.asJsonArray jsonElement.asJsonArray
} else { } else {
// In case a single release object was returned
val arr = com.google.gson.JsonArray() val arr = com.google.gson.JsonArray()
if (jsonElement.isJsonObject) arr.add(jsonElement.asJsonObject) if (jsonElement.isJsonObject) arr.add(jsonElement.asJsonObject)
arr arr
@@ -143,28 +212,22 @@ class UpdateManager(
} }
if (highestRelease == null) { if (highestRelease == null) {
runOnMain { callback(UpdateCheckResult.UpToDate) } return UpdateCheckResult.UpToDate
return
} }
val cleanLocalVersion = currentVersionName.removePrefix("v").removePrefix("V").trim() val cleanLocalVersion = currentVersionName.removePrefix("v").removePrefix("V").trim()
if (isNewerVersion(highestRelease.versionName, cleanLocalVersion)) { if (isNewerVersion(highestRelease.versionName, cleanLocalVersion)) {
runOnMain { UpdateCheckResult.UpdateAvailable(highestRelease)
callback(UpdateCheckResult.UpdateAvailable(highestRelease))
}
} else { } else {
runOnMain { callback(UpdateCheckResult.UpToDate) } UpdateCheckResult.UpToDate
} }
} catch (e: Exception) { } catch (e: Exception) {
runOnMain { UpdateCheckResult.Error("Failed to parse update info: ${e.message}")
callback(UpdateCheckResult.Error("Failed to parse update info: ${e.message}"))
} }
} }
}
}
})
}
/** /**
* Downloads the APK file to the app's cache directory and streams progress updates. * Downloads the APK file to the app's cache directory and streams progress updates.
@@ -159,8 +159,8 @@ class ActionTriggerWorker(
NotificationHelper.sendNotification( NotificationHelper.sendNotification(
context = appContext, context = appContext,
id = device.id.hashCode(), id = device.id.hashCode(),
title = "✅ Server Online: ${device.name}", title = "✅ Server Online",
message = "${device.name} is now online and reachable!", message = "${device.name} is now online and reachable.",
isSuccess = true isSuccess = true
) )
ServerWidgetProvider.updateAllWidgets(appContext) ServerWidgetProvider.updateAllWidgets(appContext)
@@ -173,8 +173,8 @@ class ActionTriggerWorker(
NotificationHelper.sendNotification( NotificationHelper.sendNotification(
context = appContext, context = appContext,
id = device.id.hashCode(), id = device.id.hashCode(),
title = "🛑 Server Offline: ${device.name}", title = "⚠️ Server Offline",
message = "${device.name} has shut down and is now offline.", message = "${device.name} has powered off or is offline.",
isSuccess = false isSuccess = false
) )
ServerWidgetProvider.updateAllWidgets(appContext) ServerWidgetProvider.updateAllWidgets(appContext)
@@ -182,15 +182,9 @@ class ActionTriggerWorker(
} }
} }
TriggerAction.REBOOT -> { TriggerAction.REBOOT -> {
// No notification for reboot per user instructions
if (attempts >= 2 && status.isOnline) { if (attempts >= 2 && status.isOnline) {
appSettings.setLastStatus(device.id, true) appSettings.setLastStatus(device.id, true)
NotificationHelper.sendNotification(
context = appContext,
id = device.id.hashCode(),
title = "✅ Reboot Complete: ${device.name}",
message = "${device.name} successfully rebooted and is back online!",
isSuccess = true
)
ServerWidgetProvider.updateAllWidgets(appContext) ServerWidgetProvider.updateAllWidgets(appContext)
return return
} }
@@ -109,7 +109,7 @@ class ServerMonitorWorker(
NotificationHelper.sendNotification( NotificationHelper.sendNotification(
context = appContext, context = appContext,
id = device.id.hashCode(), id = device.id.hashCode(),
title = if (status.isOnline) "✅ Server Back Online" else "⚠️ Server Offline", title = if (status.isOnline) "✅ Server Online" else "⚠️ Server Offline",
message = if (status.isOnline) { message = if (status.isOnline) {
"${device.name} is now online and reachable." "${device.name} is now online and reachable."
} else { } else {
@@ -120,11 +120,11 @@ class ServerMonitorWorker(
} }
} }
// Check for app updates in the background and notify if a new update is found // Check for app updates in the background synchronously and notify if a new update is found
try { try {
val updateManager = com.expapp.trigger.update.UpdateManager(appContext) val updateManager = com.expapp.trigger.update.UpdateManager(appContext)
val currentVersion = com.expapp.trigger.BuildConfig.VERSION_NAME val currentVersion = com.expapp.trigger.BuildConfig.VERSION_NAME
updateManager.checkForUpdate(currentVersion) { result -> val result = updateManager.checkForUpdateSync(currentVersion)
if (result is com.expapp.trigger.update.UpdateCheckResult.UpdateAvailable) { if (result is com.expapp.trigger.update.UpdateCheckResult.UpdateAvailable) {
val newVer = result.info.versionName val newVer = result.info.versionName
val lastNotified = appSettings.lastNotifiedUpdateVersion val lastNotified = appSettings.lastNotifiedUpdateVersion
@@ -133,7 +133,6 @@ class ServerMonitorWorker(
NotificationHelper.sendUpdateAvailableNotification(appContext, newVer) NotificationHelper.sendUpdateAvailableNotification(appContext, newVer)
} }
} }
}
} catch (_: Exception) { } catch (_: Exception) {
// Ignore background check failure // Ignore background check failure
} }