From e1bcfa21f8dc80d7d0399cace825a6c6b1ef2aca Mon Sep 17 00:00:00 2001 From: Vaishno Singh Date: Thu, 19 Nov 2026 10:21:37 +0530 Subject: [PATCH] fix: maintain server state on network loss, suppress command sent notifications & unify refresh button (v1.1.6) --- app/build.gradle.kts | 4 +- .../expapp/trigger/network/TriggerClient.kt | 6 +- .../expapp/trigger/network/TriggerResult.kt | 3 +- .../expapp/trigger/ui/screens/DevicePage.kt | 84 ++++++++----------- .../expapp/trigger/ui/screens/MainScreen.kt | 36 ++++---- .../trigger/worker/ActionTriggerWorker.kt | 27 ++---- .../trigger/worker/ServerMonitorWorker.kt | 20 ++--- 7 files changed, 77 insertions(+), 103 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a47f4d9..f03780c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "com.expapp.trigger" minSdk = 24 targetSdk = 34 - versionCode = 9 - versionName = "1.1.5" + versionCode = 10 + versionName = "1.1.6" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/app/src/main/java/com/expapp/trigger/network/TriggerClient.kt b/app/src/main/java/com/expapp/trigger/network/TriggerClient.kt index d77f5e9..758d684 100644 --- a/app/src/main/java/com/expapp/trigger/network/TriggerClient.kt +++ b/app/src/main/java/com/expapp/trigger/network/TriggerClient.kt @@ -198,7 +198,7 @@ class TriggerClient( client.newCall(request).enqueue(object : Callback { override fun onFailure(call: Call, e: IOException) { 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 { val baseStatusUrl = device.statusUrl.trim() if (baseStatusUrl.isBlank()) { - return NodeStatus(isOnline = false, statusText = "NO STATUS URL") + return NodeStatus(isOnline = false, statusText = "NO STATUS URL", isReachable = false) } return try { @@ -226,7 +226,7 @@ class TriggerClient( parseNodeStatus(body, it.isSuccessful) } } catch (e: Exception) { - NodeStatus(isOnline = false, statusText = "OFFLINE") + NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false) } } diff --git a/app/src/main/java/com/expapp/trigger/network/TriggerResult.kt b/app/src/main/java/com/expapp/trigger/network/TriggerResult.kt index 9afa296..124db9d 100644 --- a/app/src/main/java/com/expapp/trigger/network/TriggerResult.kt +++ b/app/src/main/java/com/expapp/trigger/network/TriggerResult.kt @@ -20,5 +20,6 @@ data class NodeStatus( val onSinceIst: String? = null, val lastActiveAgo: String? = null, val lastActiveIst: String? = null, - val timestamp: Long = System.currentTimeMillis() + val timestamp: Long = System.currentTimeMillis(), + val isReachable: Boolean = true ) diff --git a/app/src/main/java/com/expapp/trigger/ui/screens/DevicePage.kt b/app/src/main/java/com/expapp/trigger/ui/screens/DevicePage.kt index 851830d..924017b 100644 --- a/app/src/main/java/com/expapp/trigger/ui/screens/DevicePage.kt +++ b/app/src/main/java/com/expapp/trigger/ui/screens/DevicePage.kt @@ -318,16 +318,16 @@ fun DevicePage( Column( modifier = Modifier .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( modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically ) { Box( modifier = Modifier - .size(44.dp) + .size(42.dp) .clip(RoundedCornerShape(12.dp)) .background( Brush.radialGradient( @@ -368,12 +368,12 @@ fun DevicePage( Column( modifier = Modifier - .weight(1f) - .padding(end = 6.dp) + .weight(1f, fill = true) + .padding(end = 8.dp) ) { Text( text = device.name, - fontSize = 18.sp, + fontSize = 17.sp, fontWeight = FontWeight.Bold, color = TextPrimary, maxLines = 1, @@ -391,25 +391,40 @@ fun DevicePage( ) } - // Action buttons in a fixed non-shrinking Row + // Compact, non-overlapping button bar Row( 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( - onClick = onSyncConfig, + onClick = { + if (!isCheckingStatus) { + onRefreshStatus() + onSyncConfig() + } + }, modifier = Modifier .size(34.dp) .clip(RoundedCornerShape(9.dp)) - .background(AmberVibrant.copy(alpha = 0.08f)) - .border(1.dp, AmberVibrant.copy(alpha = 0.2f), 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.CloudSync, - contentDescription = "Re-fetch R2 JSON", - tint = AmberVibrant, - modifier = Modifier.size(17.dp) + imageVector = Icons.Default.Refresh, + contentDescription = "Refresh server", + tint = if (isCheckingStatus) GreenVibrant else TextSecondary, + modifier = Modifier + .size(17.dp) + .rotate(if (isCheckingStatus) spinAngle else 0f) ) } @@ -419,41 +434,14 @@ fun DevicePage( modifier = Modifier .size(34.dp) .clip(RoundedCornerShape(9.dp)) - .background(BorderSubtle.copy(alpha = 0.3f)) + .background(BorderSubtle.copy(alpha = 0.25f)) .border(1.dp, BorderSubtle, RoundedCornerShape(9.dp)) ) { Icon( imageVector = Icons.Default.Edit, contentDescription = "Edit device", tint = TextSecondary, - modifier = Modifier.size(17.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) + modifier = Modifier.size(16.dp) ) } @@ -464,19 +452,19 @@ fun DevicePage( .size(34.dp) .clip(RoundedCornerShape(9.dp)) .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( imageVector = Icons.Default.DeleteOutline, contentDescription = "Remove device", - tint = RedVibrant.copy(alpha = 0.7f), + tint = RedVibrant.copy(alpha = 0.8f), modifier = Modifier.size(17.dp) ) } } } - Spacer(modifier = Modifier.height(16.dp)) + Spacer(modifier = Modifier.height(14.dp)) // ── STATUS ROW ──────────────────────────────────────────── Row( diff --git a/app/src/main/java/com/expapp/trigger/ui/screens/MainScreen.kt b/app/src/main/java/com/expapp/trigger/ui/screens/MainScreen.kt index 6654f04..3d3b3ff 100644 --- a/app/src/main/java/com/expapp/trigger/ui/screens/MainScreen.kt +++ b/app/src/main/java/com/expapp/trigger/ui/screens/MainScreen.kt @@ -166,8 +166,10 @@ fun MainScreen( triggerClient.checkStatus(device) { status -> checkingStatusMap[device.id] = false nodeStatuses[device.id] = status - // Keep background monitoring synced with the latest live status - appSettings.setLastStatus(device.id, status.isOnline) + // Only update stored status when server is actually reached + if (status.isReachable) { + appSettings.setLastStatus(device.id, status.isOnline) + } } } @@ -379,7 +381,7 @@ fun MainScreen( if (availableUpdate != null) { IconButton( onClick = { showUpdateDialog = true }, - modifier = Modifier.size(36.dp) + modifier = Modifier.size(32.dp) ) { Box(contentAlignment = Alignment.TopEnd) { Icon( @@ -404,55 +406,55 @@ fun MainScreen( historyLogs = historyRepository.getLogs() showHistoryDialog = true }, - modifier = Modifier.size(36.dp) + modifier = Modifier.size(32.dp) ) { Icon( Icons.Default.History, contentDescription = "Trigger History", tint = TextSecondary, - modifier = Modifier.size(20.dp) + modifier = Modifier.size(19.dp) ) } // Settings Button IconButton( onClick = { showSettingsDialog = true }, - modifier = Modifier.size(36.dp) + modifier = Modifier.size(32.dp) ) { Icon( Icons.Default.Settings, contentDescription = "Settings", tint = TextSecondary, - modifier = Modifier.size(20.dp) + modifier = Modifier.size(19.dp) ) } - // R2 Sync Button + // Unified Refresh / Sync Button IconButton( - onClick = { syncEndpoints(true) }, - enabled = !isSyncing, - modifier = Modifier.size(36.dp) + onClick = { refreshWholePage() }, + enabled = !isSyncing && !isPullRefreshing, + modifier = Modifier.size(32.dp) ) { Icon( Icons.Default.Refresh, - "Sync", - tint = if (isSyncing) TextMuted else GreenVibrant, + "Refresh all", + tint = if (isSyncing || isPullRefreshing) TextMuted else GreenVibrant, modifier = Modifier - .size(20.dp) - .rotate(rotationAngle) + .size(19.dp) + .rotate(if (isSyncing || isPullRefreshing) rotationAngle else 0f) ) } // Add Device Button IconButton( onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } }, - modifier = Modifier.size(36.dp) + modifier = Modifier.size(32.dp) ) { Icon( Icons.Default.Add, "Add Device", tint = GreenVibrant, - modifier = Modifier.size(22.dp) + modifier = Modifier.size(20.dp) ) } }, diff --git a/app/src/main/java/com/expapp/trigger/worker/ActionTriggerWorker.kt b/app/src/main/java/com/expapp/trigger/worker/ActionTriggerWorker.kt index 0e483cd..b380c61 100644 --- a/app/src/main/java/com/expapp/trigger/worker/ActionTriggerWorker.kt +++ b/app/src/main/java/com/expapp/trigger/worker/ActionTriggerWorker.kt @@ -105,27 +105,6 @@ class ActionTriggerWorker( "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 historyRepo.addLog( TriggerLog( @@ -167,6 +146,12 @@ class ActionTriggerWorker( attempts++ 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) { TriggerAction.POWER_ON -> { if (status.isOnline) { diff --git a/app/src/main/java/com/expapp/trigger/worker/ServerMonitorWorker.kt b/app/src/main/java/com/expapp/trigger/worker/ServerMonitorWorker.kt index 8239e27..8a9a72f 100644 --- a/app/src/main/java/com/expapp/trigger/worker/ServerMonitorWorker.kt +++ b/app/src/main/java/com/expapp/trigger/worker/ServerMonitorWorker.kt @@ -92,12 +92,19 @@ class ServerMonitorWorker( if (device.statusUrl.isBlank()) continue 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) // Save new status 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) { NotificationHelper.sendNotification( context = appContext, @@ -106,19 +113,10 @@ class ServerMonitorWorker( message = if (status.isOnline) { "${device.name} is now online and reachable." } else { - "${device.name} is unreachable or offline." + "${device.name} has powered off or is offline." }, 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 - ) } }