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

This commit is contained in:
Vaishno Singh
2026-11-19 10:21:37 +05:30
parent d16b87143d
commit e1bcfa21f8
7 changed files with 77 additions and 103 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 = 10
versionName = "1.1.5" versionName = "1.1.6"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
@@ -198,7 +198,7 @@ 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))
} }
} }
@@ -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 {
@@ -226,7 +226,7 @@ class TriggerClient(
parseNodeStatus(body, it.isSuccessful) parseNodeStatus(body, it.isSuccessful)
} }
} catch (e: Exception) { } catch (e: Exception) {
NodeStatus(isOnline = false, statusText = "OFFLINE") 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
) )
@@ -318,16 +318,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 +368,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,25 +391,40 @@ fun DevicePage(
) )
} }
// Action buttons in a fixed non-shrinking Row // Compact, non-overlapping button bar
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(4.dp) horizontalArrangement = Arrangement.spacedBy(8.dp)
) { ) {
// Re-fetch R2 JSON config button // Refresh button (syncs status & R2 endpoints)
IconButton( IconButton(
onClick = onSyncConfig, onClick = {
if (!isCheckingStatus) {
onRefreshStatus()
onSyncConfig()
}
},
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(
.border(1.dp, AmberVibrant.copy(alpha = 0.2f), RoundedCornerShape(9.dp)) 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( Icon(
imageVector = Icons.Default.CloudSync, imageVector = Icons.Default.Refresh,
contentDescription = "Re-fetch R2 JSON", contentDescription = "Refresh server",
tint = AmberVibrant, tint = if (isCheckingStatus) GreenVibrant else TextSecondary,
modifier = Modifier.size(17.dp) modifier = Modifier
.size(17.dp)
.rotate(if (isCheckingStatus) spinAngle else 0f)
) )
} }
@@ -419,41 +434,14 @@ fun DevicePage(
modifier = Modifier modifier = Modifier
.size(34.dp) .size(34.dp)
.clip(RoundedCornerShape(9.dp)) .clip(RoundedCornerShape(9.dp))
.background(BorderSubtle.copy(alpha = 0.3f)) .background(BorderSubtle.copy(alpha = 0.25f))
.border(1.dp, BorderSubtle, RoundedCornerShape(9.dp)) .border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
) { ) {
Icon( Icon(
imageVector = Icons.Default.Edit, imageVector = Icons.Default.Edit,
contentDescription = "Edit device", contentDescription = "Edit device",
tint = TextSecondary, tint = TextSecondary,
modifier = Modifier.size(17.dp) modifier = Modifier.size(16.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)
) )
} }
@@ -464,19 +452,19 @@ fun DevicePage(
.size(34.dp) .size(34.dp)
.clip(RoundedCornerShape(9.dp)) .clip(RoundedCornerShape(9.dp))
.background(RedVibrant.copy(alpha = 0.08f)) .background(RedVibrant.copy(alpha = 0.08f))
.border(1.dp, RedVibrant.copy(alpha = 0.15f), RoundedCornerShape(9.dp)) .border(1.dp, RedVibrant.copy(alpha = 0.2f), RoundedCornerShape(9.dp))
) { ) {
Icon( Icon(
imageVector = Icons.Default.DeleteOutline, imageVector = Icons.Default.DeleteOutline,
contentDescription = "Remove device", contentDescription = "Remove device",
tint = RedVibrant.copy(alpha = 0.7f), tint = RedVibrant.copy(alpha = 0.8f),
modifier = Modifier.size(17.dp) modifier = Modifier.size(17.dp)
) )
} }
} }
} }
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(14.dp))
// ── STATUS ROW ──────────────────────────────────────────── // ── STATUS ROW ────────────────────────────────────────────
Row( Row(
@@ -166,8 +166,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)
}
} }
} }
@@ -379,7 +381,7 @@ fun MainScreen(
if (availableUpdate != null) { if (availableUpdate != null) {
IconButton( IconButton(
onClick = { showUpdateDialog = true }, onClick = { showUpdateDialog = true },
modifier = Modifier.size(36.dp) modifier = Modifier.size(32.dp)
) { ) {
Box(contentAlignment = Alignment.TopEnd) { Box(contentAlignment = Alignment.TopEnd) {
Icon( Icon(
@@ -404,55 +406,55 @@ fun MainScreen(
historyLogs = historyRepository.getLogs() historyLogs = historyRepository.getLogs()
showHistoryDialog = true showHistoryDialog = true
}, },
modifier = Modifier.size(36.dp) modifier = Modifier.size(32.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(19.dp)
) )
} }
// Settings Button // Settings Button
IconButton( IconButton(
onClick = { showSettingsDialog = true }, onClick = { showSettingsDialog = true },
modifier = Modifier.size(36.dp) modifier = Modifier.size(32.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(19.dp)
) )
} }
// R2 Sync Button // Unified Refresh / Sync Button
IconButton( IconButton(
onClick = { syncEndpoints(true) }, onClick = { refreshWholePage() },
enabled = !isSyncing, enabled = !isSyncing && !isPullRefreshing,
modifier = Modifier.size(36.dp) modifier = Modifier.size(32.dp)
) { ) {
Icon( Icon(
Icons.Default.Refresh, Icons.Default.Refresh,
"Sync", "Refresh all",
tint = if (isSyncing) TextMuted else GreenVibrant, tint = if (isSyncing || isPullRefreshing) TextMuted else GreenVibrant,
modifier = Modifier modifier = Modifier
.size(20.dp) .size(19.dp)
.rotate(rotationAngle) .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(36.dp) modifier = Modifier.size(32.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(20.dp)
) )
} }
}, },
@@ -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(
@@ -167,6 +146,12 @@ class ActionTriggerWorker(
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(4000L)
continue
}
when (action) { when (action) {
TriggerAction.POWER_ON -> { TriggerAction.POWER_ON -> {
if (status.isOnline) { if (status.isOnline) {
@@ -92,12 +92,19 @@ class ServerMonitorWorker(
if (device.statusUrl.isBlank()) continue if (device.statusUrl.isBlank()) continue
val status = triggerClient.checkStatusSync(device) val 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 // Save new 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,
@@ -106,19 +113,10 @@ class ServerMonitorWorker(
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
)
} }
} }