Compare commits

...
7 Commits
Author SHA1 Message Date
Vaishno Singh 153bf3598d fix(update): reliable background update notifications, dedicated AppUpdateWorker, intent handling (v1.2.2)
Build & Release Android APK / Build & Publish Release APK (push) Failing after 3m26s
2026-11-19 18:36:06 +05:30
Vaishno Singh 61e2b2445b fix(notifications): instant state transition polling, 2-stage verification to prevent false positives (v1.2.1)
Build & Release Android APK / Build & Publish Release APK (push) Failing after 3m28s
2026-11-19 17:56:34 +05:30
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
Vaishno Singh 256cc6cfc8 feat: send notification when new app update is available (v1.1.7)
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
2026-11-19 10:24:51 +05:30
Vaishno Singh e1bcfa21f8 fix: maintain server state on network loss, suppress command sent notifications & unify refresh button (v1.1.6)
Build & Release Android APK / Build & Publish Release APK (push) Canceled after 0s
2026-11-19 10:21:37 +05:30
12 changed files with 527 additions and 306 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 = 9 versionCode = 16
versionName = "1.1.5" versionName = "1.2.2"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
@@ -39,6 +39,7 @@ import com.expapp.trigger.ui.theme.DarkBackground
import com.expapp.trigger.ui.theme.ExpAppTheme import com.expapp.trigger.ui.theme.ExpAppTheme
import com.expapp.trigger.widget.ServerWidgetProvider import com.expapp.trigger.widget.ServerWidgetProvider
import com.expapp.trigger.worker.ActionTriggerWorker import com.expapp.trigger.worker.ActionTriggerWorker
import com.expapp.trigger.worker.AppUpdateWorker
import com.expapp.trigger.worker.NotificationHelper import com.expapp.trigger.worker.NotificationHelper
import com.expapp.trigger.worker.ServerMonitorWorker import com.expapp.trigger.worker.ServerMonitorWorker
@@ -62,6 +63,7 @@ class MainActivity : FragmentActivity() {
NotificationHelper.createNotificationChannel(this) NotificationHelper.createNotificationChannel(this)
if (appSettings.isBackgroundMonitoringEnabled) { if (appSettings.isBackgroundMonitoringEnabled) {
ServerMonitorWorker.schedule(this) ServerMonitorWorker.schedule(this)
AppUpdateWorker.schedule(this)
} }
onNotificationPermissionGrantedCallback?.invoke() onNotificationPermissionGrantedCallback?.invoke()
} else { } else {
@@ -127,9 +129,10 @@ class MainActivity : FragmentActivity() {
} }
} }
// Initialize background server monitoring // Initialize background server monitoring & update checks
if (appSettings.isBackgroundMonitoringEnabled) { if (appSettings.isBackgroundMonitoringEnabled) {
ServerMonitorWorker.schedule(this) ServerMonitorWorker.schedule(this)
AppUpdateWorker.schedule(this)
} }
// Handle initial launch intent (from NFC or Widget) // Handle initial launch intent (from NFC or Widget)
@@ -195,10 +198,12 @@ class MainActivity : FragmentActivity() {
override fun onStop() { override fun onStop() {
super.onStop() super.onStop()
// When leaving the app, trigger an immediate one-time check & ensure worker is scheduled // When leaving the app, trigger an immediate one-time check & ensure workers are scheduled
if (appSettings.isBackgroundMonitoringEnabled) { if (appSettings.isBackgroundMonitoringEnabled) {
ServerMonitorWorker.runOnce(this) ServerMonitorWorker.runOnce(this)
ServerMonitorWorker.schedule(this) ServerMonitorWorker.schedule(this)
AppUpdateWorker.runOnce(this)
AppUpdateWorker.schedule(this)
} }
} }
@@ -10,8 +10,16 @@ class AppSettings(private val storage: KeyValueStorage) {
private const val KEY_BIOMETRIC_ENABLED = "key_biometric_enabled" private const val KEY_BIOMETRIC_ENABLED = "key_biometric_enabled"
private const val KEY_BG_MONITOR_ENABLED = "key_bg_monitor_enabled" private const val KEY_BG_MONITOR_ENABLED = "key_bg_monitor_enabled"
private const val KEY_LAST_STATUS_PREFIX = "last_status_" private const val KEY_LAST_STATUS_PREFIX = "last_status_"
private const val KEY_LAST_NOTIFIED_VERSION = "key_last_notified_version"
} }
var lastNotifiedUpdateVersion: String?
get() = storage.getString(KEY_LAST_NOTIFIED_VERSION, null)
set(value) {
if (value != null) storage.putString(KEY_LAST_NOTIFIED_VERSION, value)
else storage.remove(KEY_LAST_NOTIFIED_VERSION)
}
var isBiometricEnabled: Boolean var isBiometricEnabled: Boolean
get() = storage.getBoolean(KEY_BIOMETRIC_ENABLED, true) get() = storage.getBoolean(KEY_BIOMETRIC_ENABLED, true)
set(value) = storage.putBoolean(KEY_BIOMETRIC_ENABLED, value) set(value) = storage.putBoolean(KEY_BIOMETRIC_ENABLED, value)
@@ -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
} }
@@ -198,14 +198,14 @@ class TriggerClient(
client.newCall(request).enqueue(object : Callback { client.newCall(request).enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) { override fun onFailure(call: Call, e: IOException) {
runOnMain { runOnMain {
callback(NodeStatus(isOnline = false, statusText = "OFFLINE")) callback(NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false))
} }
} }
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) }
} }
@@ -215,7 +215,7 @@ class TriggerClient(
fun checkStatusSync(device: DeviceConfig): NodeStatus { fun checkStatusSync(device: DeviceConfig): NodeStatus {
val baseStatusUrl = device.statusUrl.trim() val baseStatusUrl = device.statusUrl.trim()
if (baseStatusUrl.isBlank()) { if (baseStatusUrl.isBlank()) {
return NodeStatus(isOnline = false, statusText = "NO STATUS URL") return NodeStatus(isOnline = false, statusText = "NO STATUS URL", isReachable = false)
} }
return try { return try {
@@ -223,22 +223,50 @@ 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") 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 (matchedObj != null) {
matchedObj
} else if (targetNode.isNotBlank()) {
// Node explicitly configured but missing from sentinel nodes map
return NodeStatus(isOnline = false, statusText = "UNKNOWN NODE", isReachable = true)
} else 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
json.has("status") && json.get("status").isJsonPrimitive -> json.has("status") && json.get("status").isJsonPrimitive ->
json.get("status").asString.equals("online", ignoreCase = true) json.get("status").asString.trim().equals("online", ignoreCase = true)
else -> false else -> false
} }
val ip = if (json.has("ip") && !json.get("ip").isJsonNull) json.get("ip").asString else null val ip = if (json.has("ip") && !json.get("ip").isJsonNull) json.get("ip").asString else null
@@ -264,16 +292,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 = isHttpSuccess)
} }
} else if (isHttpSuccess) { } else if (isHttpSuccess) {
val isOnline = body.equals("ONLINE", ignoreCase = true) val isOnline = body.trim().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)
} }
} }
} }
@@ -20,5 +20,6 @@ data class NodeStatus(
val onSinceIst: String? = null, val onSinceIst: String? = null,
val lastActiveAgo: String? = null, val lastActiveAgo: String? = null,
val lastActiveIst: String? = null, val lastActiveIst: String? = null,
val timestamp: Long = System.currentTimeMillis() val timestamp: Long = System.currentTimeMillis(),
val isReachable: Boolean = true
) )
@@ -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(
@@ -318,16 +313,16 @@ fun DevicePage(
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 18.dp, vertical = 16.dp) .padding(horizontal = 16.dp, vertical = 14.dp)
) { ) {
// Title row // Top row: Server Icon + Name / Node (flexible) + Header Actions
Row( Row(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Box( Box(
modifier = Modifier modifier = Modifier
.size(44.dp) .size(42.dp)
.clip(RoundedCornerShape(12.dp)) .clip(RoundedCornerShape(12.dp))
.background( .background(
Brush.radialGradient( Brush.radialGradient(
@@ -368,12 +363,12 @@ fun DevicePage(
Column( Column(
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f, fill = true)
.padding(end = 6.dp) .padding(end = 8.dp)
) { ) {
Text( Text(
text = device.name, text = device.name,
fontSize = 18.sp, fontSize = 17.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = TextPrimary, color = TextPrimary,
maxLines = 1, maxLines = 1,
@@ -391,92 +386,66 @@ fun DevicePage(
) )
} }
// Action buttons in a fixed non-shrinking Row // Device options menu (Edit / Delete)
Row( Box {
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(4.dp)
) {
// Re-fetch R2 JSON config button
IconButton( IconButton(
onClick = onSyncConfig, onClick = { showMenu = true },
modifier = Modifier modifier = Modifier
.size(34.dp) .size(34.dp)
.clip(RoundedCornerShape(9.dp)) .clip(RoundedCornerShape(9.dp))
.background(AmberVibrant.copy(alpha = 0.08f)) .background(BorderSubtle.copy(alpha = 0.25f))
.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)) .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(17.dp) modifier = Modifier.size(18.dp)
) )
} }
// Refresh button (spins while checking) DropdownMenu(
IconButton( expanded = showMenu,
onClick = { if (!isCheckingStatus) onRefreshStatus() }, onDismissRequest = { showMenu = false },
modifier = Modifier modifier = Modifier
.size(34.dp) .background(BgElevated)
.clip(RoundedCornerShape(9.dp)) .border(1.dp, BorderSubtle, RoundedCornerShape(12.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( DropdownMenuItem(
imageVector = Icons.Default.Refresh, text = { Text("Edit Device", color = TextPrimary) },
contentDescription = "Refresh status", leadingIcon = {
tint = if (isCheckingStatus) GreenVibrant else TextMuted, Icon(
modifier = Modifier Icons.Default.Edit,
.size(17.dp) contentDescription = null,
.rotate(if (isCheckingStatus) spinAngle else 0f) tint = TextSecondary,
modifier = Modifier.size(18.dp)
)
},
onClick = {
showMenu = false
showEditDialog = true
}
) )
} DropdownMenuItem(
text = { Text("Remove Device", color = RedVibrant) },
// Delete button leadingIcon = {
IconButton( Icon(
onClick = { showDeleteConfirm = true }, Icons.Default.DeleteOutline,
modifier = Modifier contentDescription = null,
.size(34.dp) tint = RedVibrant,
.clip(RoundedCornerShape(9.dp)) modifier = Modifier.size(18.dp)
.background(RedVibrant.copy(alpha = 0.08f)) )
.border(1.dp, RedVibrant.copy(alpha = 0.15f), RoundedCornerShape(9.dp)) },
) { onClick = {
Icon( showMenu = false
imageVector = Icons.Default.DeleteOutline, showDeleteConfirm = true
contentDescription = "Remove device", }
tint = RedVibrant.copy(alpha = 0.7f),
modifier = Modifier.size(17.dp)
) )
} }
} }
} }
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(14.dp))
// ── STATUS ROW ──────────────────────────────────────────── // ── STATUS ROW ────────────────────────────────────────────
Row( Row(
@@ -93,6 +93,7 @@ import com.expapp.trigger.update.UpdateCheckResult
import com.expapp.trigger.update.UpdateManager import com.expapp.trigger.update.UpdateManager
import com.expapp.trigger.widget.ServerWidgetProvider import com.expapp.trigger.widget.ServerWidgetProvider
import com.expapp.trigger.worker.ActionTriggerWorker import com.expapp.trigger.worker.ActionTriggerWorker
import com.expapp.trigger.worker.AppUpdateWorker
import com.expapp.trigger.worker.ServerMonitorWorker import com.expapp.trigger.worker.ServerMonitorWorker
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.isActive import kotlinx.coroutines.isActive
@@ -166,8 +167,10 @@ fun MainScreen(
triggerClient.checkStatus(device) { status -> triggerClient.checkStatus(device) { status ->
checkingStatusMap[device.id] = false checkingStatusMap[device.id] = false
nodeStatuses[device.id] = status nodeStatuses[device.id] = status
// Keep background monitoring synced with the latest live status // Only update stored status when server is actually reached
appSettings.setLastStatus(device.id, status.isOnline) if (status.isReachable) {
appSettings.setLastStatus(device.id, status.isOnline)
}
} }
} }
@@ -208,6 +211,17 @@ fun MainScreen(
is UpdateCheckResult.UpdateAvailable -> { is UpdateCheckResult.UpdateAvailable -> {
availableUpdate = result.info availableUpdate = result.info
showUpdateDialog = true showUpdateDialog = true
val newVer = result.info.versionName
if (appSettings.lastNotifiedUpdateVersion != newVer) {
val notified = com.expapp.trigger.worker.NotificationHelper.sendUpdateAvailableNotification(
context = context,
newVersion = newVer,
releaseTitle = result.info.title
)
if (notified) {
appSettings.lastNotifiedUpdateVersion = newVer
}
}
if (isManual) { if (isManual) {
Toast.makeText(context, "New update available: v${result.info.versionName}!", Toast.LENGTH_SHORT).show() Toast.makeText(context, "New update available: v${result.info.versionName}!", Toast.LENGTH_SHORT).show()
} }
@@ -320,13 +334,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,
@@ -334,52 +341,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(36.dp) modifier = Modifier.size(30.dp)
) { ) {
Box(contentAlignment = Alignment.TopEnd) { Box(contentAlignment = Alignment.TopEnd) {
Icon( Icon(
@@ -404,55 +409,39 @@ fun MainScreen(
historyLogs = historyRepository.getLogs() historyLogs = historyRepository.getLogs()
showHistoryDialog = true showHistoryDialog = true
}, },
modifier = Modifier.size(36.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(20.dp) modifier = Modifier.size(18.dp)
) )
} }
// Settings Button // Settings Button
IconButton( IconButton(
onClick = { showSettingsDialog = true }, onClick = { showSettingsDialog = true },
modifier = Modifier.size(36.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(20.dp) modifier = Modifier.size(18.dp)
)
}
// R2 Sync Button
IconButton(
onClick = { syncEndpoints(true) },
enabled = !isSyncing,
modifier = Modifier.size(36.dp)
) {
Icon(
Icons.Default.Refresh,
"Sync",
tint = if (isSyncing) TextMuted else GreenVibrant,
modifier = Modifier
.size(20.dp)
.rotate(rotationAngle)
) )
} }
// 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(36.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(22.dp) modifier = Modifier.size(19.dp)
) )
} }
}, },
@@ -587,8 +576,10 @@ fun MainScreen(
appSettings.isBackgroundMonitoringEnabled = enabled appSettings.isBackgroundMonitoringEnabled = enabled
if (enabled) { if (enabled) {
ServerMonitorWorker.schedule(context) ServerMonitorWorker.schedule(context)
AppUpdateWorker.schedule(context)
} else { } else {
ServerMonitorWorker.cancel(context) ServerMonitorWorker.cancel(context)
AppUpdateWorker.cancel(context)
} }
}, },
isBiometricAvailable = BiometricHelper.isBiometricAvailable(context), isBiometricAvailable = BiometricHelper.isBiometricAvailable(context),
@@ -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,110 +128,107 @@ 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)
val jsonElement = JsonParser.parseString(body) onComplete(result)
val releasesArray = if (jsonElement.isJsonArray) {
jsonElement.asJsonArray
} else {
// In case a single release object was returned
val arr = com.google.gson.JsonArray()
if (jsonElement.isJsonObject) arr.add(jsonElement.asJsonObject)
arr
}
var highestRelease: ReleaseInfo? = null
for (item in releasesArray) {
if (!item.isJsonObject) continue
val json = item.asJsonObject
if (json.has("draft") && json.get("draft").asBoolean) continue
val tagName = json.get("tag_name")?.asString.orEmpty()
val cleanVer = tagName.removePrefix("v").removePrefix("V").trim()
val title = json.get("name")?.asString?.ifBlank { tagName } ?: tagName
val changelog = json.get("body")?.asString.orEmpty()
val assets = json.getAsJsonArray("assets")
var apkUrl: String? = null
var apkApiUrl: String? = null
var apkName = "app-release.apk"
var apkSize = 0L
if (assets != null) {
for (element in assets) {
val assetObj = element.asJsonObject
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
}
}
}
if (!apkUrl.isNullOrBlank()) {
val releaseInfo = ReleaseInfo(
tagName = tagName,
versionName = cleanVer,
title = title,
changelog = changelog,
downloadUrl = apkUrl,
assetApiUrl = apkApiUrl,
apkFileName = apkName,
sizeBytes = apkSize
)
if (highestRelease == null || isNewerVersion(cleanVer, highestRelease.versionName)) {
highestRelease = releaseInfo
}
}
}
if (highestRelease == null) {
runOnMain { callback(UpdateCheckResult.UpToDate) }
return
}
val cleanLocalVersion = currentVersionName.removePrefix("v").removePrefix("V").trim()
if (isNewerVersion(highestRelease.versionName, cleanLocalVersion)) {
runOnMain {
callback(UpdateCheckResult.UpdateAvailable(highestRelease))
}
} else {
runOnMain { callback(UpdateCheckResult.UpToDate) }
}
} catch (e: Exception) {
runOnMain {
callback(UpdateCheckResult.Error("Failed to parse update info: ${e.message}"))
}
}
} }
} }
}) })
} }
private fun parseReleases(body: String, currentVersionName: String): UpdateCheckResult {
return try {
val jsonElement = JsonParser.parseString(body)
val releasesArray = if (jsonElement.isJsonArray) {
jsonElement.asJsonArray
} else {
val arr = com.google.gson.JsonArray()
if (jsonElement.isJsonObject) arr.add(jsonElement.asJsonObject)
arr
}
var highestRelease: ReleaseInfo? = null
for (item in releasesArray) {
if (!item.isJsonObject) continue
val json = item.asJsonObject
if (json.has("draft") && json.get("draft").asBoolean) continue
val tagName = json.get("tag_name")?.asString.orEmpty()
val cleanVer = tagName.removePrefix("v").removePrefix("V").trim()
val title = json.get("name")?.asString?.ifBlank { tagName } ?: tagName
val changelog = json.get("body")?.asString.orEmpty()
val assets = json.getAsJsonArray("assets")
var apkUrl: String? = null
var apkApiUrl: String? = null
var apkName = "app-release.apk"
var apkSize = 0L
if (assets != null) {
for (element in assets) {
val assetObj = element.asJsonObject
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
}
}
}
if (!apkUrl.isNullOrBlank()) {
val releaseInfo = ReleaseInfo(
tagName = tagName,
versionName = cleanVer,
title = title,
changelog = changelog,
downloadUrl = apkUrl,
assetApiUrl = apkApiUrl,
apkFileName = apkName,
sizeBytes = apkSize
)
if (highestRelease == null || isNewerVersion(cleanVer, highestRelease.versionName)) {
highestRelease = releaseInfo
}
}
}
if (highestRelease == null) {
return UpdateCheckResult.UpToDate
}
val cleanLocalVersion = currentVersionName.removePrefix("v").removePrefix("V").trim()
if (isNewerVersion(highestRelease.versionName, cleanLocalVersion)) {
UpdateCheckResult.UpdateAvailable(highestRelease)
} else {
UpdateCheckResult.UpToDate
}
} catch (e: Exception) {
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.
* If the browser download URL fails or returns 404, automatically attempts fallback to the API asset URL. * If the browser download URL fails or returns 404, automatically attempts fallback to the API asset URL.
@@ -105,27 +105,6 @@ class ActionTriggerWorker(
"Failed to send $actionTitle: $clean" "Failed to send $actionTitle: $clean"
} }
val actionIcon = when (action) {
TriggerAction.POWER_ON -> "⚡"
TriggerAction.POWER_OFF -> "🛑"
TriggerAction.REBOOT -> "🔄"
}
val notifTitle = if (response.isSuccess) {
"$actionIcon $actionTitle: ${device.name}"
} else {
"❌ $actionTitle Failed: ${device.name}"
}
// Send system notification to drawer
NotificationHelper.sendNotification(
context = appContext,
id = (device.id.hashCode() * 31) + action.ordinal,
title = notifTitle,
message = signalMsg,
isSuccess = response.isSuccess
)
// 3. Save to history log // 3. Save to history log
historyRepo.addLog( historyRepo.addLog(
TriggerLog( TriggerLog(
@@ -157,62 +136,75 @@ class ActionTriggerWorker(
triggerClient: TriggerClient, triggerClient: TriggerClient,
appSettings: AppSettings appSettings: AppSettings
) { ) {
val maxAttempts = 15 // Up to 60 seconds (15 attempts * 4s) val maxAttempts = 30 // Up to 60 seconds (30 attempts * 2s) for instant notification
var attempts = 0 var attempts = 0
var consecutiveTargetMatches = 0
// Brief delay for hardware/OS to begin reaction // Brief delay before first check to allow server to receive trigger
delay(4000L) delay(1500L)
while (attempts < maxAttempts) { while (attempts < maxAttempts) {
attempts++ attempts++
val status = triggerClient.checkStatusSync(device) val status = triggerClient.checkStatusSync(device)
// If phone network is unavailable, do not misinterpret as server going offline
if (!status.isReachable) {
delay(2000L)
continue
}
when (action) { when (action) {
TriggerAction.POWER_ON -> { TriggerAction.POWER_ON -> {
if (status.isOnline) { if (status.isOnline) {
appSettings.setLastStatus(device.id, true) consecutiveTargetMatches++
NotificationHelper.sendNotification( // Require 2 consecutive online confirmations (or 1 if status explicitly verified)
context = appContext, if (consecutiveTargetMatches >= 2 || status.statusText == "ONLINE") {
id = device.id.hashCode(), appSettings.setLastStatus(device.id, true)
title = "✅ Server Online: ${device.name}", NotificationHelper.sendNotification(
message = "${device.name} is now online and reachable!", context = appContext,
isSuccess = true id = device.id.hashCode(),
) title = "✅ Server Online",
ServerWidgetProvider.updateAllWidgets(appContext) message = "${device.name} is now online and reachable.",
return isSuccess = true
)
ServerWidgetProvider.updateAllWidgets(appContext)
return
}
} else {
consecutiveTargetMatches = 0
} }
} }
TriggerAction.POWER_OFF -> { TriggerAction.POWER_OFF -> {
if (!status.isOnline) { if (!status.isOnline) {
appSettings.setLastStatus(device.id, false) consecutiveTargetMatches++
NotificationHelper.sendNotification( // Require 2 consecutive offline confirmations to completely eliminate false positives
context = appContext, if (consecutiveTargetMatches >= 2) {
id = device.id.hashCode(), appSettings.setLastStatus(device.id, false)
title = "🛑 Server Offline: ${device.name}", NotificationHelper.sendNotification(
message = "${device.name} has shut down and is now offline.", context = appContext,
isSuccess = false id = device.id.hashCode(),
) title = "⚠️ Server Offline",
ServerWidgetProvider.updateAllWidgets(appContext) message = "${device.name} has powered off or is offline.",
return isSuccess = false
)
ServerWidgetProvider.updateAllWidgets(appContext)
return
}
} else {
consecutiveTargetMatches = 0
} }
} }
TriggerAction.REBOOT -> { TriggerAction.REBOOT -> {
if (attempts >= 2 && status.isOnline) { // No notification for reboot per user instructions
if (attempts >= 4 && 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
} }
} }
} }
delay(4000L) delay(2000L)
} }
} }
} }
@@ -0,0 +1,105 @@
package com.expapp.trigger.worker
import android.content.Context
import androidx.work.Constraints
import androidx.work.CoroutineWorker
import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.ExistingWorkPolicy
import androidx.work.NetworkType
import androidx.work.OneTimeWorkRequestBuilder
import androidx.work.PeriodicWorkRequestBuilder
import androidx.work.WorkManager
import androidx.work.WorkerParameters
import com.expapp.trigger.BuildConfig
import com.expapp.trigger.data.repository.AppSettings
import com.expapp.trigger.update.UpdateCheckResult
import com.expapp.trigger.update.UpdateManager
import java.util.concurrent.TimeUnit
/**
* Dedicated background worker that checks for new app updates independently of server devices.
* Ensures notifications are dispatched even if no servers are configured or if servers are offline.
*/
class AppUpdateWorker(
private val appContext: Context,
workerParams: WorkerParameters
) : CoroutineWorker(appContext, workerParams) {
companion object {
const val WORK_NAME = "app_update_periodic_check"
const val ONE_TIME_WORK_NAME = "app_update_one_time_check"
fun schedule(context: Context, repeatIntervalMinutes: Long = 15) {
NotificationHelper.createNotificationChannel(context)
val constraints = Constraints.Builder()
.setRequiredNetworkType(NetworkType.CONNECTED)
.build()
val workRequest = PeriodicWorkRequestBuilder<AppUpdateWorker>(
repeatIntervalMinutes,
TimeUnit.MINUTES
)
.setConstraints(constraints)
.build()
WorkManager.getInstance(context).enqueueUniquePeriodicWork(
WORK_NAME,
ExistingPeriodicWorkPolicy.UPDATE,
workRequest
)
}
fun cancel(context: Context) {
WorkManager.getInstance(context).cancelUniqueWork(WORK_NAME)
}
fun runOnce(context: Context) {
NotificationHelper.createNotificationChannel(context)
val constraints = Constraints.Builder()
.setRequiredNetworkType(NetworkType.CONNECTED)
.build()
val oneTimeRequest = OneTimeWorkRequestBuilder<AppUpdateWorker>()
.setConstraints(constraints)
.build()
WorkManager.getInstance(context).enqueueUniqueWork(
ONE_TIME_WORK_NAME,
ExistingWorkPolicy.REPLACE,
oneTimeRequest
)
}
}
override suspend fun doWork(): Result {
val appSettings = AppSettings(appContext)
try {
val updateManager = UpdateManager(appContext)
val currentVersion = BuildConfig.VERSION_NAME
val result = updateManager.checkForUpdateSync(currentVersion)
if (result is UpdateCheckResult.UpdateAvailable) {
val newVer = result.info.versionName
val lastNotified = appSettings.lastNotifiedUpdateVersion
if (lastNotified != newVer) {
val notified = NotificationHelper.sendUpdateAvailableNotification(
context = appContext,
newVersion = newVer,
releaseTitle = result.info.title
)
if (notified) {
appSettings.lastNotifiedUpdateVersion = newVer
}
}
}
} catch (_: Exception) {
// Ignore failure; will retry next interval
}
return Result.success()
}
}
@@ -45,12 +45,16 @@ object NotificationHelper {
id: Int, id: Int,
title: String, title: String,
message: String, message: String,
isSuccess: Boolean = true isSuccess: Boolean = true,
extraAction: String? = null
): Boolean { ): Boolean {
createNotificationChannel(context) createNotificationChannel(context)
val intent = Intent(context, MainActivity::class.java).apply { val intent = Intent(context, MainActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
if (extraAction != null) {
putExtra("action_trigger", extraAction)
}
} }
val pendingIntent = PendingIntent.getActivity( val pendingIntent = PendingIntent.getActivity(
context, context,
@@ -81,6 +85,26 @@ object NotificationHelper {
} }
} }
fun sendUpdateAvailableNotification(
context: Context,
newVersion: String,
releaseTitle: String? = null
): Boolean {
val title = if (!releaseTitle.isNullOrBlank() && releaseTitle != "v$newVersion") {
"🚀 Update Available: $releaseTitle"
} else {
"🚀 Update Available: v$newVersion"
}
return sendNotification(
context = context,
id = 8888,
title = title,
message = "A new version (v$newVersion) of Device Trigger is ready to install. Tap to update!",
isSuccess = true,
extraAction = "open_update"
)
}
fun sendTestNotification(context: Context): Boolean { fun sendTestNotification(context: Context): Boolean {
return sendNotification( return sendNotification(
context = context, context = context,
@@ -91,37 +91,71 @@ class ServerMonitorWorker(
for (device in devices) { for (device in devices) {
if (device.statusUrl.isBlank()) continue if (device.statusUrl.isBlank()) continue
val status = triggerClient.checkStatusSync(device) var status = triggerClient.checkStatusSync(device)
// If the endpoint could not be reached (e.g. phone has no internet / network failure),
// do NOT treat this as the server going offline. Maintain the last known state.
if (!status.isReachable) {
continue
}
val previousStatus = appSettings.getLastStatus(device.id) val previousStatus = appSettings.getLastStatus(device.id)
// Save new status // If a transition is detected (especially online -> offline or offline -> online),
// double-check with an immediate secondary request after 2 seconds to eliminate false positives
if (previousStatus != null && previousStatus != status.isOnline) {
kotlinx.coroutines.delay(2000L)
val verificationStatus = triggerClient.checkStatusSync(device)
if (verificationStatus.isReachable && verificationStatus.isOnline == status.isOnline) {
status = verificationStatus
} else {
// False positive or transient state; do not change status or trigger false alert
continue
}
}
// Save new verified status
appSettings.setLastStatus(device.id, status.isOnline) appSettings.setLastStatus(device.id, status.isOnline)
// Determine if notification is needed // Determine if notification is needed only when server actually transitions
if (previousStatus != null && previousStatus != status.isOnline) { if (previousStatus != null && previousStatus != status.isOnline) {
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 {
"${device.name} is unreachable or offline." "${device.name} has powered off or is offline."
}, },
isSuccess = status.isOnline isSuccess = status.isOnline
) )
} else if (previousStatus == null && !status.isOnline) {
// Initial check revealed server is offline
NotificationHelper.sendNotification(
context = appContext,
id = device.id.hashCode(),
title = "⚠️ Server Offline",
message = "${device.name} is currently unreachable or offline.",
isSuccess = false
)
} }
} }
// Check for app updates in the background synchronously and notify if a new update is found
try {
val updateManager = com.expapp.trigger.update.UpdateManager(appContext)
val currentVersion = com.expapp.trigger.BuildConfig.VERSION_NAME
val result = updateManager.checkForUpdateSync(currentVersion)
if (result is com.expapp.trigger.update.UpdateCheckResult.UpdateAvailable) {
val newVer = result.info.versionName
val lastNotified = appSettings.lastNotifiedUpdateVersion
if (lastNotified != newVer) {
val notified = NotificationHelper.sendUpdateAvailableNotification(
context = appContext,
newVersion = newVer,
releaseTitle = result.info.title
)
if (notified) {
appSettings.lastNotifiedUpdateVersion = newVer
}
}
}
} catch (_: Exception) {
// Ignore background check failure
}
return Result.success() return Result.success()
} }
} }