Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5c66f6c4dc | ||
|
|
153bf3598d | ||
|
|
61e2b2445b | ||
|
|
2f38ea7dcc |
@@ -11,8 +11,8 @@ android {
|
||||
applicationId = "com.expapp.trigger"
|
||||
minSdk = 24
|
||||
targetSdk = 34
|
||||
versionCode = 13
|
||||
versionName = "1.1.9"
|
||||
versionCode = 17
|
||||
versionName = "1.2.3"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables {
|
||||
|
||||
@@ -39,6 +39,7 @@ import com.expapp.trigger.ui.theme.DarkBackground
|
||||
import com.expapp.trigger.ui.theme.ExpAppTheme
|
||||
import com.expapp.trigger.widget.ServerWidgetProvider
|
||||
import com.expapp.trigger.worker.ActionTriggerWorker
|
||||
import com.expapp.trigger.worker.AppUpdateWorker
|
||||
import com.expapp.trigger.worker.NotificationHelper
|
||||
import com.expapp.trigger.worker.ServerMonitorWorker
|
||||
|
||||
@@ -62,6 +63,7 @@ class MainActivity : FragmentActivity() {
|
||||
NotificationHelper.createNotificationChannel(this)
|
||||
if (appSettings.isBackgroundMonitoringEnabled) {
|
||||
ServerMonitorWorker.schedule(this)
|
||||
AppUpdateWorker.schedule(this)
|
||||
}
|
||||
onNotificationPermissionGrantedCallback?.invoke()
|
||||
} else {
|
||||
@@ -127,9 +129,10 @@ class MainActivity : FragmentActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize background server monitoring
|
||||
// Initialize background server monitoring & update checks
|
||||
if (appSettings.isBackgroundMonitoringEnabled) {
|
||||
ServerMonitorWorker.schedule(this)
|
||||
AppUpdateWorker.schedule(this)
|
||||
}
|
||||
|
||||
// Handle initial launch intent (from NFC or Widget)
|
||||
@@ -195,10 +198,12 @@ class MainActivity : FragmentActivity() {
|
||||
|
||||
override fun 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) {
|
||||
ServerMonitorWorker.runOnce(this)
|
||||
ServerMonitorWorker.schedule(this)
|
||||
AppUpdateWorker.runOnce(this)
|
||||
AppUpdateWorker.schedule(this)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -181,7 +181,7 @@ class TriggerClient(
|
||||
val baseStatusUrl = device.statusUrl.trim()
|
||||
if (baseStatusUrl.isBlank()) {
|
||||
runOnMain {
|
||||
callback(NodeStatus(isOnline = false, statusText = "NO STATUS URL"))
|
||||
callback(NodeStatus(isOnline = false, statusText = "NO STATUS URL", isReachable = false))
|
||||
}
|
||||
return
|
||||
}
|
||||
@@ -190,7 +190,7 @@ class TriggerClient(
|
||||
Request.Builder().url(baseStatusUrl).get().build()
|
||||
} catch (e: Exception) {
|
||||
runOnMain {
|
||||
callback(NodeStatus(isOnline = false, statusText = "INVALID URL"))
|
||||
callback(NodeStatus(isOnline = false, statusText = "INVALID URL", isReachable = false))
|
||||
}
|
||||
return
|
||||
}
|
||||
@@ -205,7 +205,7 @@ class TriggerClient(
|
||||
override fun onResponse(call: Call, response: Response) {
|
||||
val nodeStatus = response.use {
|
||||
val body = it.body?.string().orEmpty().trim()
|
||||
parseNodeStatus(body, it.isSuccessful)
|
||||
parseNodeStatus(body, it.isSuccessful, device.node)
|
||||
}
|
||||
runOnMain { callback(nodeStatus) }
|
||||
}
|
||||
@@ -223,22 +223,50 @@ class TriggerClient(
|
||||
val response = client.newCall(request).execute()
|
||||
response.use {
|
||||
val body = it.body?.string().orEmpty().trim()
|
||||
parseNodeStatus(body, it.isSuccessful)
|
||||
parseNodeStatus(body, it.isSuccessful, device.node)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
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("{")) {
|
||||
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 {
|
||||
json.has("online") && json.get("online").isJsonPrimitive && json.get("online").asJsonPrimitive.isBoolean ->
|
||||
json.get("online").asBoolean
|
||||
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
|
||||
}
|
||||
val ip = if (json.has("ip") && !json.get("ip").isJsonNull) json.get("ip").asString else null
|
||||
@@ -264,16 +292,17 @@ class TriggerClient(
|
||||
uptime = uptime,
|
||||
onSinceIst = onSinceIst,
|
||||
lastActiveAgo = lastActiveAgo,
|
||||
lastActiveIst = lastActiveIst
|
||||
lastActiveIst = lastActiveIst,
|
||||
isReachable = true
|
||||
)
|
||||
} catch (e: Exception) {
|
||||
NodeStatus(isOnline = false, statusText = "ERROR")
|
||||
NodeStatus(isOnline = false, statusText = "ERROR", isReachable = isHttpSuccess)
|
||||
}
|
||||
} else if (isHttpSuccess) {
|
||||
val isOnline = body.equals("ONLINE", ignoreCase = true)
|
||||
return NodeStatus(isOnline = isOnline, statusText = if (isOnline) "ONLINE" else "OFFLINE")
|
||||
val isOnline = body.trim().equals("ONLINE", ignoreCase = true)
|
||||
return NodeStatus(isOnline = isOnline, statusText = if (isOnline) "ONLINE" else "OFFLINE", isReachable = true)
|
||||
} else {
|
||||
return NodeStatus(isOnline = false, statusText = "OFFLINE")
|
||||
return NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,6 +93,7 @@ import com.expapp.trigger.update.UpdateCheckResult
|
||||
import com.expapp.trigger.update.UpdateManager
|
||||
import com.expapp.trigger.widget.ServerWidgetProvider
|
||||
import com.expapp.trigger.worker.ActionTriggerWorker
|
||||
import com.expapp.trigger.worker.AppUpdateWorker
|
||||
import com.expapp.trigger.worker.ServerMonitorWorker
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.isActive
|
||||
@@ -212,8 +213,14 @@ fun MainScreen(
|
||||
showUpdateDialog = true
|
||||
val newVer = result.info.versionName
|
||||
if (appSettings.lastNotifiedUpdateVersion != newVer) {
|
||||
appSettings.lastNotifiedUpdateVersion = newVer
|
||||
com.expapp.trigger.worker.NotificationHelper.sendUpdateAvailableNotification(context, newVer)
|
||||
val notified = com.expapp.trigger.worker.NotificationHelper.sendUpdateAvailableNotification(
|
||||
context = context,
|
||||
newVersion = newVer,
|
||||
releaseTitle = result.info.title
|
||||
)
|
||||
if (notified) {
|
||||
appSettings.lastNotifiedUpdateVersion = newVer
|
||||
}
|
||||
}
|
||||
if (isManual) {
|
||||
Toast.makeText(context, "New update available: v${result.info.versionName}!", Toast.LENGTH_SHORT).show()
|
||||
@@ -569,8 +576,10 @@ fun MainScreen(
|
||||
appSettings.isBackgroundMonitoringEnabled = enabled
|
||||
if (enabled) {
|
||||
ServerMonitorWorker.schedule(context)
|
||||
AppUpdateWorker.schedule(context)
|
||||
} else {
|
||||
ServerMonitorWorker.cancel(context)
|
||||
AppUpdateWorker.cancel(context)
|
||||
}
|
||||
},
|
||||
isBiometricAvailable = BiometricHelper.isBiometricAvailable(context),
|
||||
|
||||
@@ -30,7 +30,8 @@ class UpdateManager(
|
||||
.connectTimeout(30, TimeUnit.SECONDS)
|
||||
.readTimeout(60, TimeUnit.SECONDS)
|
||||
.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 {
|
||||
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).
|
||||
*/
|
||||
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()
|
||||
.url(url)
|
||||
.addHeader("Accept", "application/vnd.github.v3+json")
|
||||
@@ -63,16 +80,76 @@ class UpdateManager(
|
||||
return UpdateCheckResult.UpToDate
|
||||
}
|
||||
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()
|
||||
parseReleases(body, currentVersionName)
|
||||
}
|
||||
} 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 {
|
||||
return try {
|
||||
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.
|
||||
|
||||
@@ -57,22 +57,34 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
||||
appWidgetManager: AppWidgetManager,
|
||||
appWidgetIds: IntArray
|
||||
) {
|
||||
val repository = DeviceRepository(SharedPrefsStorage(context))
|
||||
val devices = repository.getDevices()
|
||||
try {
|
||||
val repository = DeviceRepository(SharedPrefsStorage(context))
|
||||
val devices = repository.getDevices()
|
||||
|
||||
for (appWidgetId in appWidgetIds) {
|
||||
val device = devices.firstOrNull()
|
||||
renderWidget(context, appWidgetManager, appWidgetId, device, null)
|
||||
for (appWidgetId in appWidgetIds) {
|
||||
val device = devices.firstOrNull()
|
||||
renderWidget(context, appWidgetManager, appWidgetId, device, null)
|
||||
|
||||
// If device exists, fetch live status asynchronously
|
||||
if (device != null && device.statusUrl.isNotBlank()) {
|
||||
executor.execute {
|
||||
val status = TriggerClient().checkStatusSync(device)
|
||||
mainHandler.post {
|
||||
renderWidget(context, appWidgetManager, appWidgetId, device, status)
|
||||
// If device exists, fetch live status asynchronously
|
||||
if (device != null && device.statusUrl.isNotBlank()) {
|
||||
executor.execute {
|
||||
try {
|
||||
val status = TriggerClient().checkStatusSync(device)
|
||||
mainHandler.post {
|
||||
try {
|
||||
renderWidget(context, appWidgetManager, appWidgetId, device, status)
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -131,92 +143,96 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
||||
status: NodeStatus?,
|
||||
footerOverride: String? = null
|
||||
) {
|
||||
val views = RemoteViews(context.packageName, R.layout.widget_server_control)
|
||||
try {
|
||||
val views = RemoteViews(context.packageName, R.layout.widget_server_control)
|
||||
|
||||
if (device == null) {
|
||||
views.setTextViewText(R.id.widget_device_name, "No Device")
|
||||
views.setTextViewText(R.id.widget_node_name, "Configure in app")
|
||||
views.setTextViewText(R.id.widget_status_text, "OFFLINE")
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_gray)
|
||||
views.setTextViewText(R.id.widget_footer_text, "Open app to add server")
|
||||
if (device == null) {
|
||||
views.setTextViewText(R.id.widget_device_name, "No Device")
|
||||
views.setTextViewText(R.id.widget_node_name, "Configure in app")
|
||||
views.setTextViewText(R.id.widget_status_text, "OFFLINE")
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_gray)
|
||||
views.setTextViewText(R.id.widget_footer_text, "Open app to add server")
|
||||
|
||||
val appIntent = Intent(context, MainActivity::class.java)
|
||||
val pendingApp = PendingIntent.getActivity(
|
||||
context, 0, appIntent,
|
||||
val appIntent = Intent(context, MainActivity::class.java)
|
||||
val pendingApp = PendingIntent.getActivity(
|
||||
context, 0, appIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||
)
|
||||
views.setOnClickPendingIntent(R.id.widget_header_clickable, pendingApp)
|
||||
views.setOnClickPendingIntent(R.id.widget_root, pendingApp)
|
||||
appWidgetManager.updateAppWidget(appWidgetId, views)
|
||||
return
|
||||
}
|
||||
|
||||
views.setTextViewText(R.id.widget_device_name, device.name)
|
||||
views.setTextViewText(R.id.widget_node_name, device.node)
|
||||
|
||||
// Status display
|
||||
if (status == null) {
|
||||
views.setTextViewText(R.id.widget_status_text, "SYNCING")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFF71717A.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_gray)
|
||||
} else if (status.isOnline) {
|
||||
views.setTextViewText(R.id.widget_status_text, "ONLINE")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFF22C55E.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_green)
|
||||
} else {
|
||||
views.setTextViewText(R.id.widget_status_text, "OFFLINE")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFFEF4444.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_red)
|
||||
}
|
||||
|
||||
views.setTextViewText(
|
||||
R.id.widget_footer_text,
|
||||
footerOverride ?: (if (status?.uptime != null) "Up: ${status.uptime}" else "Tap header to open • Tap button to trigger")
|
||||
)
|
||||
|
||||
// Header click -> Open app
|
||||
val openAppIntent = Intent(context, MainActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
}
|
||||
val pendingOpenApp = PendingIntent.getActivity(
|
||||
context,
|
||||
appWidgetId * 10,
|
||||
openAppIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||
)
|
||||
views.setOnClickPendingIntent(R.id.widget_header_clickable, pendingApp)
|
||||
views.setOnClickPendingIntent(R.id.widget_root, pendingApp)
|
||||
views.setOnClickPendingIntent(R.id.widget_header_clickable, pendingOpenApp)
|
||||
|
||||
// Refresh click
|
||||
val refreshIntent = Intent(context, ServerWidgetProvider::class.java).apply {
|
||||
action = ACTION_REFRESH
|
||||
}
|
||||
val pendingRefresh = PendingIntent.getBroadcast(
|
||||
context,
|
||||
appWidgetId * 10 + 1,
|
||||
refreshIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||
)
|
||||
views.setOnClickPendingIntent(R.id.widget_btn_refresh, pendingRefresh)
|
||||
|
||||
// Power On click
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_power_on,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 2, device.id, TriggerAction.POWER_ON)
|
||||
)
|
||||
|
||||
// Reboot click
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_reboot,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 3, device.id, TriggerAction.REBOOT)
|
||||
)
|
||||
|
||||
// Power Off click
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_power_off,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 4, device.id, TriggerAction.POWER_OFF)
|
||||
)
|
||||
|
||||
appWidgetManager.updateAppWidget(appWidgetId, views)
|
||||
return
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
|
||||
views.setTextViewText(R.id.widget_device_name, device.name)
|
||||
views.setTextViewText(R.id.widget_node_name, device.node)
|
||||
|
||||
// Status display
|
||||
if (status == null) {
|
||||
views.setTextViewText(R.id.widget_status_text, "SYNCING")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFF71717A.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_gray)
|
||||
} else if (status.isOnline) {
|
||||
views.setTextViewText(R.id.widget_status_text, "ONLINE")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFF22C55E.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_green)
|
||||
} else {
|
||||
views.setTextViewText(R.id.widget_status_text, "OFFLINE")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFFEF4444.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_red)
|
||||
}
|
||||
|
||||
views.setTextViewText(
|
||||
R.id.widget_footer_text,
|
||||
footerOverride ?: (if (status?.uptime != null) "Up: ${status.uptime}" else "Tap header to open • Tap button to trigger")
|
||||
)
|
||||
|
||||
// Header click -> Open app
|
||||
val openAppIntent = Intent(context, MainActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
}
|
||||
val pendingOpenApp = PendingIntent.getActivity(
|
||||
context,
|
||||
appWidgetId * 10,
|
||||
openAppIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||
)
|
||||
views.setOnClickPendingIntent(R.id.widget_header_clickable, pendingOpenApp)
|
||||
|
||||
// Refresh click
|
||||
val refreshIntent = Intent(context, ServerWidgetProvider::class.java).apply {
|
||||
action = ACTION_REFRESH
|
||||
}
|
||||
val pendingRefresh = PendingIntent.getBroadcast(
|
||||
context,
|
||||
appWidgetId * 10 + 1,
|
||||
refreshIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||
)
|
||||
views.setOnClickPendingIntent(R.id.widget_btn_refresh, pendingRefresh)
|
||||
|
||||
// Power On click
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_power_on,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 2, device.id, TriggerAction.POWER_ON)
|
||||
)
|
||||
|
||||
// Reboot click
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_reboot,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 3, device.id, TriggerAction.REBOOT)
|
||||
)
|
||||
|
||||
// Power Off click
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_power_off,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 4, device.id, TriggerAction.POWER_OFF)
|
||||
)
|
||||
|
||||
appWidgetManager.updateAppWidget(appWidgetId, views)
|
||||
}
|
||||
|
||||
private fun createTriggerPendingIntent(
|
||||
|
||||
@@ -136,11 +136,12 @@ class ActionTriggerWorker(
|
||||
triggerClient: TriggerClient,
|
||||
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 consecutiveTargetMatches = 0
|
||||
|
||||
// Brief delay for hardware/OS to begin reaction
|
||||
delay(4000L)
|
||||
// Brief delay before first check to allow server to receive trigger
|
||||
delay(1500L)
|
||||
|
||||
while (attempts < maxAttempts) {
|
||||
attempts++
|
||||
@@ -148,56 +149,62 @@ class ActionTriggerWorker(
|
||||
|
||||
// If phone network is unavailable, do not misinterpret as server going offline
|
||||
if (!status.isReachable) {
|
||||
delay(4000L)
|
||||
delay(2000L)
|
||||
continue
|
||||
}
|
||||
|
||||
when (action) {
|
||||
TriggerAction.POWER_ON -> {
|
||||
if (status.isOnline) {
|
||||
appSettings.setLastStatus(device.id, true)
|
||||
NotificationHelper.sendNotification(
|
||||
context = appContext,
|
||||
id = device.id.hashCode(),
|
||||
title = "✅ Server Online: ${device.name}",
|
||||
message = "${device.name} is now online and reachable!",
|
||||
isSuccess = true
|
||||
)
|
||||
ServerWidgetProvider.updateAllWidgets(appContext)
|
||||
return
|
||||
consecutiveTargetMatches++
|
||||
// Require 2 consecutive online confirmations (or 1 if status explicitly verified)
|
||||
if (consecutiveTargetMatches >= 2 || status.statusText == "ONLINE") {
|
||||
appSettings.setLastStatus(device.id, true)
|
||||
NotificationHelper.sendNotification(
|
||||
context = appContext,
|
||||
id = device.id.hashCode(),
|
||||
title = "✅ Server Online",
|
||||
message = "${device.name} is now online and reachable.",
|
||||
isSuccess = true
|
||||
)
|
||||
ServerWidgetProvider.updateAllWidgets(appContext)
|
||||
return
|
||||
}
|
||||
} else {
|
||||
consecutiveTargetMatches = 0
|
||||
}
|
||||
}
|
||||
TriggerAction.POWER_OFF -> {
|
||||
if (!status.isOnline) {
|
||||
appSettings.setLastStatus(device.id, false)
|
||||
NotificationHelper.sendNotification(
|
||||
context = appContext,
|
||||
id = device.id.hashCode(),
|
||||
title = "🛑 Server Offline: ${device.name}",
|
||||
message = "${device.name} has shut down and is now offline.",
|
||||
isSuccess = false
|
||||
)
|
||||
ServerWidgetProvider.updateAllWidgets(appContext)
|
||||
return
|
||||
consecutiveTargetMatches++
|
||||
// Require 2 consecutive offline confirmations to completely eliminate false positives
|
||||
if (consecutiveTargetMatches >= 2) {
|
||||
appSettings.setLastStatus(device.id, false)
|
||||
NotificationHelper.sendNotification(
|
||||
context = appContext,
|
||||
id = device.id.hashCode(),
|
||||
title = "⚠️ Server Offline",
|
||||
message = "${device.name} has powered off or is offline.",
|
||||
isSuccess = false
|
||||
)
|
||||
ServerWidgetProvider.updateAllWidgets(appContext)
|
||||
return
|
||||
}
|
||||
} else {
|
||||
consecutiveTargetMatches = 0
|
||||
}
|
||||
}
|
||||
TriggerAction.REBOOT -> {
|
||||
if (attempts >= 2 && status.isOnline) {
|
||||
// No notification for reboot per user instructions
|
||||
if (attempts >= 4 && status.isOnline) {
|
||||
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)
|
||||
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()
|
||||
}
|
||||
}
|
||||
@@ -85,11 +85,20 @@ object NotificationHelper {
|
||||
}
|
||||
}
|
||||
|
||||
fun sendUpdateAvailableNotification(context: Context, newVersion: String): Boolean {
|
||||
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 = "🚀 Update Available: v$newVersion",
|
||||
title = title,
|
||||
message = "A new version (v$newVersion) of Device Trigger is ready to install. Tap to update!",
|
||||
isSuccess = true,
|
||||
extraAction = "open_update"
|
||||
|
||||
@@ -91,7 +91,7 @@ class ServerMonitorWorker(
|
||||
for (device in devices) {
|
||||
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.
|
||||
@@ -101,7 +101,20 @@ class ServerMonitorWorker(
|
||||
|
||||
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)
|
||||
|
||||
// Determine if notification is needed only when server actually transitions
|
||||
@@ -109,7 +122,7 @@ class ServerMonitorWorker(
|
||||
NotificationHelper.sendNotification(
|
||||
context = appContext,
|
||||
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) {
|
||||
"${device.name} is now online and reachable."
|
||||
} else {
|
||||
@@ -129,8 +142,14 @@ class ServerMonitorWorker(
|
||||
val newVer = result.info.versionName
|
||||
val lastNotified = appSettings.lastNotifiedUpdateVersion
|
||||
if (lastNotified != newVer) {
|
||||
appSettings.lastNotifiedUpdateVersion = newVer
|
||||
NotificationHelper.sendUpdateAvailableNotification(appContext, newVer)
|
||||
val notified = NotificationHelper.sendUpdateAvailableNotification(
|
||||
context = appContext,
|
||||
newVersion = newVer,
|
||||
releaseTitle = result.info.title
|
||||
)
|
||||
if (notified) {
|
||||
appSettings.lastNotifiedUpdateVersion = newVer
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (_: Exception) {
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 324 B |
Binary file not shown.
|
After Width: | Height: | Size: 314 B |
@@ -17,7 +17,7 @@
|
||||
<ImageView
|
||||
android:layout_width="18dp"
|
||||
android:layout_height="18dp"
|
||||
android:src="@drawable/ic_terminal"
|
||||
android:src="@drawable/widget_ic_terminal"
|
||||
android:contentDescription="Server" />
|
||||
|
||||
<LinearLayout
|
||||
@@ -82,14 +82,13 @@
|
||||
android:id="@+id/widget_btn_refresh"
|
||||
android:layout_width="26dp"
|
||||
android:layout_height="26dp"
|
||||
android:background="?android:attr/selectableItemBackgroundBorderless"
|
||||
android:contentDescription="Refresh"
|
||||
android:padding="3dp"
|
||||
android:src="@drawable/ic_refresh" />
|
||||
android:src="@drawable/widget_ic_refresh" />
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Spacer / Divider -->
|
||||
<View
|
||||
<!-- Spacer / Divider (FrameLayout is explicitly whitelisted in RemoteViews) -->
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginTop="8dp"
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:minWidth="250dp"
|
||||
android:minHeight="100dp"
|
||||
android:minWidth="220dp"
|
||||
android:minHeight="90dp"
|
||||
android:targetCellWidth="3"
|
||||
android:targetCellHeight="2"
|
||||
android:minResizeWidth="180dp"
|
||||
android:minResizeHeight="70dp"
|
||||
android:updatePeriodMillis="1800000"
|
||||
android:initialLayout="@layout/widget_server_control"
|
||||
android:resizeMode="horizontal|vertical"
|
||||
|
||||
Reference in New Issue
Block a user