2 Commits
Author SHA1 Message Date
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
5 changed files with 181 additions and 98 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 = 13 versionCode = 15
versionName = "1.1.9" versionName = "1.2.1"
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,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", 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 (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)
} }
} }
} }
@@ -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,11 +45,27 @@ class UpdateManager(
} }
/** /**
* Synchronously 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). * Suitable for use inside background workers (e.g. WorkManager CoroutineWorker).
*/ */
fun checkForUpdateSync(currentVersionName: String): UpdateCheckResult { fun checkForUpdateSync(currentVersionName: String): UpdateCheckResult {
val url = "https://api.github.com/repos/$githubRepo/releases" // 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() val request = Request.Builder()
.url(url) .url(url)
.addHeader("Accept", "application/vnd.github.v3+json") .addHeader("Accept", "application/vnd.github.v3+json")
@@ -63,16 +80,76 @@ class UpdateManager(
return UpdateCheckResult.UpToDate return UpdateCheckResult.UpToDate
} }
if (!res.isSuccessful) { if (!res.isSuccessful) {
return UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates") return UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates from $url")
} }
val body = res.body?.string().orEmpty() val body = res.body?.string().orEmpty()
parseReleases(body, currentVersionName) parseReleases(body, currentVersionName)
} }
} catch (e: Exception) { } catch (e: Exception) {
UpdateCheckResult.Error("Network error: ${e.localizedMessage}") UpdateCheckResult.Error("Network error ($url): ${e.localizedMessage}")
} }
} }
/**
* Asynchronously checks for updates with primary (self-hosted) -> fallback (GitHub) strategy.
*/
fun checkForUpdate(
currentVersionName: String,
callback: (UpdateCheckResult) -> Unit
) {
// Try Primary first
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()
.url(url)
.addHeader("Accept", "application/vnd.github.v3+json")
.addHeader("User-Agent", "ServerControlApp")
.get()
.build()
okHttpClient.newCall(request).enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) {
onComplete(UpdateCheckResult.Error("Network error: ${e.localizedMessage}"))
}
override fun onResponse(call: Call, response: Response) {
response.use { res ->
if (res.code == 404) {
onComplete(UpdateCheckResult.UpToDate)
return
}
if (!res.isSuccessful) {
onComplete(UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates"))
return
}
val body = res.body?.string().orEmpty()
val result = parseReleases(body, currentVersionName)
onComplete(result)
}
}
})
}
private fun parseReleases(body: String, currentVersionName: String): UpdateCheckResult { private fun parseReleases(body: String, currentVersionName: String): UpdateCheckResult {
return try { return try {
val jsonElement = JsonParser.parseString(body) val jsonElement = JsonParser.parseString(body)
@@ -150,50 +227,7 @@ class UpdateManager(
} }
} }
/**
* Checks GitHub Releases API for the latest published release.
*/
fun checkForUpdate(
currentVersionName: String,
callback: (UpdateCheckResult) -> Unit
) {
// Query releases list so we always inspect the highest semantic version
val url = "https://api.github.com/repos/$githubRepo/releases"
val request = Request.Builder()
.url(url)
.addHeader("Accept", "application/vnd.github.v3+json")
.addHeader("User-Agent", "ServerControlApp")
.get()
.build()
okHttpClient.newCall(request).enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) {
runOnMain {
callback(UpdateCheckResult.Error("Network error: ${e.localizedMessage}"))
}
}
override fun onResponse(call: Call, response: Response) {
response.use { res ->
if (res.code == 404) {
runOnMain { callback(UpdateCheckResult.UpToDate) }
return
}
if (!res.isSuccessful) {
runOnMain {
callback(UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates"))
}
return
}
val body = res.body?.string().orEmpty()
val result = parseReleases(body, currentVersionName)
runOnMain { callback(result) }
}
}
})
}
/** /**
* 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.
@@ -136,11 +136,12 @@ 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++
@@ -148,56 +149,62 @@ class ActionTriggerWorker(
// If phone network is unavailable, do not misinterpret as server going offline // If phone network is unavailable, do not misinterpret as server going offline
if (!status.isReachable) { if (!status.isReachable) {
delay(4000L) delay(2000L)
continue 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)
} }
} }
} }
@@ -91,7 +91,7 @@ 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), // 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. // do NOT treat this as the server going offline. Maintain the last known state.
@@ -101,7 +101,20 @@ class ServerMonitorWorker(
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 only when server actually transitions // Determine if notification is needed only when server actually transitions
@@ -109,7 +122,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 {