Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d8eaceb314 | ||
|
|
256cc6cfc8 | ||
|
|
e1bcfa21f8 | ||
|
|
d16b87143d |
@@ -11,8 +11,8 @@ android {
|
|||||||
applicationId = "com.expapp.trigger"
|
applicationId = "com.expapp.trigger"
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 8
|
versionCode = 12
|
||||||
versionName = "1.1.4"
|
versionName = "1.1.8"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables {
|
vectorDrawables {
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ import com.expapp.trigger.ui.screens.MainScreen
|
|||||||
import com.expapp.trigger.ui.theme.DarkBackground
|
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.NotificationHelper
|
import com.expapp.trigger.worker.NotificationHelper
|
||||||
import com.expapp.trigger.worker.ServerMonitorWorker
|
import com.expapp.trigger.worker.ServerMonitorWorker
|
||||||
|
|
||||||
@@ -265,27 +266,7 @@ class MainActivity : FragmentActivity() {
|
|||||||
val onAuthorized = {
|
val onAuthorized = {
|
||||||
vibrateFeedback(true)
|
vibrateFeedback(true)
|
||||||
Toast.makeText(this, "Sending $actionName signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
Toast.makeText(this, "Sending $actionName signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
||||||
triggerClient.sendTrigger(device, action) { response ->
|
ActionTriggerWorker.enqueue(this, device.id, action, source)
|
||||||
val msg = if (response.isSuccess) {
|
|
||||||
"$actionName signal sent successfully"
|
|
||||||
} else {
|
|
||||||
"Failed: ${response.message.take(50)}"
|
|
||||||
}
|
|
||||||
Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
|
|
||||||
historyRepository.addLog(
|
|
||||||
TriggerLog(
|
|
||||||
deviceId = device.id,
|
|
||||||
deviceName = device.name,
|
|
||||||
node = device.node,
|
|
||||||
action = action,
|
|
||||||
isSuccess = response.isSuccess,
|
|
||||||
statusCode = response.statusCode,
|
|
||||||
message = response.message,
|
|
||||||
source = source
|
|
||||||
)
|
|
||||||
)
|
|
||||||
ServerWidgetProvider.updateAllWidgets(this)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(this)) {
|
if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(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)
|
||||||
|
|||||||
@@ -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
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -31,7 +31,9 @@ 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
|
||||||
@@ -119,6 +121,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) }
|
||||||
@@ -318,16 +321,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 +371,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 +394,104 @@ fun DevicePage(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Action buttons in a fixed non-shrinking Row
|
// Compact, non-overlapping actions: Single Refresh + Overflow Menu
|
||||||
Row(
|
Row(
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
horizontalArrangement = Arrangement.spacedBy(4.dp)
|
horizontalArrangement = Arrangement.spacedBy(6.dp)
|
||||||
) {
|
) {
|
||||||
// Re-fetch R2 JSON config button
|
// Refresh button (syncs status & R2 endpoints)
|
||||||
IconButton(
|
IconButton(
|
||||||
onClick = onSyncConfig,
|
onClick = {
|
||||||
modifier = Modifier
|
if (!isCheckingStatus) {
|
||||||
.size(34.dp)
|
onRefreshStatus()
|
||||||
.clip(RoundedCornerShape(9.dp))
|
onSyncConfig()
|
||||||
.background(AmberVibrant.copy(alpha = 0.08f))
|
}
|
||||||
.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))
|
|
||||||
) {
|
|
||||||
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
|
modifier = Modifier
|
||||||
.size(34.dp)
|
.size(34.dp)
|
||||||
.clip(RoundedCornerShape(9.dp))
|
.clip(RoundedCornerShape(9.dp))
|
||||||
.background(
|
.background(
|
||||||
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.12f)
|
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.15f)
|
||||||
else BorderSubtle.copy(alpha = 0.3f)
|
else BorderSubtle.copy(alpha = 0.25f)
|
||||||
)
|
)
|
||||||
.border(
|
.border(
|
||||||
1.dp,
|
1.dp,
|
||||||
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.3f)
|
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.4f)
|
||||||
else BorderSubtle,
|
else BorderSubtle,
|
||||||
RoundedCornerShape(9.dp)
|
RoundedCornerShape(9.dp)
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = Icons.Default.Refresh,
|
imageVector = Icons.Default.Refresh,
|
||||||
contentDescription = "Refresh status",
|
contentDescription = "Refresh server",
|
||||||
tint = if (isCheckingStatus) GreenVibrant else TextMuted,
|
tint = if (isCheckingStatus) GreenVibrant else TextSecondary,
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.size(17.dp)
|
.size(17.dp)
|
||||||
.rotate(if (isCheckingStatus) spinAngle else 0f)
|
.rotate(if (isCheckingStatus) spinAngle else 0f)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete button
|
// More Options Overflow (Edit / Delete)
|
||||||
IconButton(
|
Box {
|
||||||
onClick = { showDeleteConfirm = true },
|
IconButton(
|
||||||
modifier = Modifier
|
onClick = { showMenu = true },
|
||||||
.size(34.dp)
|
modifier = Modifier
|
||||||
.clip(RoundedCornerShape(9.dp))
|
.size(34.dp)
|
||||||
.background(RedVibrant.copy(alpha = 0.08f))
|
.clip(RoundedCornerShape(9.dp))
|
||||||
.border(1.dp, RedVibrant.copy(alpha = 0.15f), RoundedCornerShape(9.dp))
|
.background(BorderSubtle.copy(alpha = 0.25f))
|
||||||
) {
|
.border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
|
||||||
Icon(
|
) {
|
||||||
imageVector = Icons.Default.DeleteOutline,
|
Icon(
|
||||||
contentDescription = "Remove device",
|
imageVector = Icons.Default.MoreVert,
|
||||||
tint = RedVibrant.copy(alpha = 0.7f),
|
contentDescription = "Device options",
|
||||||
modifier = Modifier.size(17.dp)
|
tint = TextSecondary,
|
||||||
)
|
modifier = Modifier.size(18.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
DropdownMenu(
|
||||||
|
expanded = showMenu,
|
||||||
|
onDismissRequest = { showMenu = false },
|
||||||
|
modifier = Modifier
|
||||||
|
.background(BgElevated)
|
||||||
|
.border(1.dp, BorderSubtle, RoundedCornerShape(12.dp))
|
||||||
|
) {
|
||||||
|
DropdownMenuItem(
|
||||||
|
text = { Text("Edit Device", color = TextPrimary) },
|
||||||
|
leadingIcon = {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.Edit,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = TextSecondary,
|
||||||
|
modifier = Modifier.size(18.dp)
|
||||||
|
)
|
||||||
|
},
|
||||||
|
onClick = {
|
||||||
|
showMenu = false
|
||||||
|
showEditDialog = true
|
||||||
|
}
|
||||||
|
)
|
||||||
|
DropdownMenuItem(
|
||||||
|
text = { Text("Remove Device", color = RedVibrant) },
|
||||||
|
leadingIcon = {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.DeleteOutline,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = RedVibrant,
|
||||||
|
modifier = Modifier.size(18.dp)
|
||||||
|
)
|
||||||
|
},
|
||||||
|
onClick = {
|
||||||
|
showMenu = false
|
||||||
|
showDeleteConfirm = true
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Spacer(modifier = Modifier.height(16.dp))
|
Spacer(modifier = Modifier.height(14.dp))
|
||||||
|
|
||||||
// ── STATUS ROW ────────────────────────────────────────────
|
// ── STATUS ROW ────────────────────────────────────────────
|
||||||
Row(
|
Row(
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ import com.expapp.trigger.update.ReleaseInfo
|
|||||||
import com.expapp.trigger.update.UpdateCheckResult
|
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.ServerMonitorWorker
|
import com.expapp.trigger.worker.ServerMonitorWorker
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.isActive
|
import kotlinx.coroutines.isActive
|
||||||
@@ -165,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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -207,6 +210,11 @@ 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) {
|
||||||
|
appSettings.lastNotifiedUpdateVersion = newVer
|
||||||
|
com.expapp.trigger.worker.NotificationHelper.sendUpdateAvailableNotification(context, 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()
|
||||||
}
|
}
|
||||||
@@ -283,45 +291,22 @@ fun MainScreen(
|
|||||||
val performDispatch = {
|
val performDispatch = {
|
||||||
loadingStates[device.id] = true
|
loadingStates[device.id] = true
|
||||||
statusStates.remove(device.id)
|
statusStates.remove(device.id)
|
||||||
triggerClient.sendTrigger(device, action) { response ->
|
Toast.makeText(context, "Sending $actionTitle signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
||||||
loadingStates[device.id] = false
|
|
||||||
val msg = if (response.isSuccess) {
|
|
||||||
when (action) {
|
|
||||||
TriggerAction.POWER_ON -> "Power on signal sent"
|
|
||||||
TriggerAction.POWER_OFF -> "Shutdown signal sent"
|
|
||||||
TriggerAction.REBOOT -> "Restart signal sent"
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
val raw = response.message.trim()
|
|
||||||
val clean = if (raw.startsWith("<")) "Request failed (HTTP ${response.statusCode})" else raw.take(60)
|
|
||||||
"Failed — $clean"
|
|
||||||
}
|
|
||||||
statusStates[device.id] = msg to response.isSuccess
|
|
||||||
Toast.makeText(context, msg, Toast.LENGTH_SHORT).show()
|
|
||||||
|
|
||||||
// Save to history log
|
// Enqueue guaranteed background worker: executes HTTP request, sends notifications, updates widgets & monitors transition
|
||||||
historyRepository.addLog(
|
ActionTriggerWorker.enqueue(context, device.id, action, "App")
|
||||||
TriggerLog(
|
|
||||||
deviceId = device.id,
|
// In foreground, refresh UI smoothly after short intervals if user stays in the app
|
||||||
deviceName = device.name,
|
coroutineScope.launch {
|
||||||
node = device.node,
|
delay(2000)
|
||||||
action = action,
|
refreshStatus(device, showIndicator = true)
|
||||||
isSuccess = response.isSuccess,
|
|
||||||
statusCode = response.statusCode,
|
|
||||||
message = msg,
|
|
||||||
source = "App"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
historyLogs = historyRepository.getLogs()
|
historyLogs = historyRepository.getLogs()
|
||||||
|
loadingStates[device.id] = false
|
||||||
// Update home screen widgets
|
delay(3000)
|
||||||
ServerWidgetProvider.updateAllWidgets(context)
|
refreshStatus(device, showIndicator = false)
|
||||||
|
historyLogs = historyRepository.getLogs()
|
||||||
coroutineScope.launch {
|
delay(4000)
|
||||||
delay(1500); refreshStatus(device, showIndicator = true)
|
refreshStatus(device, showIndicator = false)
|
||||||
delay(4000); refreshStatus(device)
|
|
||||||
delay(5000); refreshStatus(device)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -342,13 +327,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,
|
||||||
@@ -356,52 +334,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(
|
||||||
@@ -426,55 +402,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)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import com.expapp.trigger.data.repository.TriggerHistoryRepository
|
|||||||
import com.expapp.trigger.network.NodeStatus
|
import com.expapp.trigger.network.NodeStatus
|
||||||
import com.expapp.trigger.network.TriggerAction
|
import com.expapp.trigger.network.TriggerAction
|
||||||
import com.expapp.trigger.network.TriggerClient
|
import com.expapp.trigger.network.TriggerClient
|
||||||
|
import com.expapp.trigger.worker.ActionTriggerWorker
|
||||||
import java.util.concurrent.Executors
|
import java.util.concurrent.Executors
|
||||||
|
|
||||||
class ServerWidgetProvider : AppWidgetProvider() {
|
class ServerWidgetProvider : AppWidgetProvider() {
|
||||||
@@ -95,41 +96,9 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
|||||||
}
|
}
|
||||||
context.startActivity(launchIntent)
|
context.startActivity(launchIntent)
|
||||||
} else {
|
} else {
|
||||||
// Biometric disabled: execute directly in background
|
// Biometric disabled: execute via guaranteed background worker
|
||||||
executor.execute {
|
Toast.makeText(context, "Sending ${action.name} signal...", Toast.LENGTH_SHORT).show()
|
||||||
val repository = DeviceRepository(SharedPrefsStorage(context))
|
ActionTriggerWorker.enqueue(context, deviceId, action, "Widget")
|
||||||
val device = repository.getDevices().find { it.id == deviceId } ?: return@execute
|
|
||||||
val client = TriggerClient()
|
|
||||||
|
|
||||||
val response = client.sendTriggerSync(device, action)
|
|
||||||
val historyRepo = TriggerHistoryRepository(context)
|
|
||||||
historyRepo.addLog(
|
|
||||||
TriggerLog(
|
|
||||||
deviceId = device.id,
|
|
||||||
deviceName = device.name,
|
|
||||||
node = device.node,
|
|
||||||
action = action,
|
|
||||||
isSuccess = response.isSuccess,
|
|
||||||
statusCode = response.statusCode,
|
|
||||||
message = response.message,
|
|
||||||
source = "Widget"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
mainHandler.post {
|
|
||||||
val msg = if (response.isSuccess) {
|
|
||||||
when (action) {
|
|
||||||
TriggerAction.POWER_ON -> "Power on sent to ${device.name}"
|
|
||||||
TriggerAction.REBOOT -> "Restart sent to ${device.name}"
|
|
||||||
TriggerAction.POWER_OFF -> "Shutdown sent to ${device.name}"
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
"Failed: ${response.message.take(40)}"
|
|
||||||
}
|
|
||||||
Toast.makeText(context, msg, Toast.LENGTH_SHORT).show()
|
|
||||||
updateAllWidgets(context)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,203 @@
|
|||||||
|
package com.expapp.trigger.worker
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import androidx.work.Constraints
|
||||||
|
import androidx.work.CoroutineWorker
|
||||||
|
import androidx.work.Data
|
||||||
|
import androidx.work.ExistingWorkPolicy
|
||||||
|
import androidx.work.NetworkType
|
||||||
|
import androidx.work.OneTimeWorkRequestBuilder
|
||||||
|
import androidx.work.WorkManager
|
||||||
|
import androidx.work.WorkerParameters
|
||||||
|
import com.expapp.trigger.data.model.DeviceConfig
|
||||||
|
import com.expapp.trigger.data.model.TriggerLog
|
||||||
|
import com.expapp.trigger.data.repository.AppSettings
|
||||||
|
import com.expapp.trigger.data.repository.DeviceRepository
|
||||||
|
import com.expapp.trigger.data.repository.SharedPrefsStorage
|
||||||
|
import com.expapp.trigger.data.repository.TriggerHistoryRepository
|
||||||
|
import com.expapp.trigger.network.TriggerAction
|
||||||
|
import com.expapp.trigger.network.TriggerClient
|
||||||
|
import com.expapp.trigger.widget.ServerWidgetProvider
|
||||||
|
import kotlinx.coroutines.delay
|
||||||
|
|
||||||
|
class ActionTriggerWorker(
|
||||||
|
private val appContext: Context,
|
||||||
|
workerParams: WorkerParameters
|
||||||
|
) : CoroutineWorker(appContext, workerParams) {
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val KEY_DEVICE_ID = "device_id"
|
||||||
|
const val KEY_ACTION = "action"
|
||||||
|
const val KEY_SOURCE = "source"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enqueues guaranteed background execution of a server power action.
|
||||||
|
* Runs even if the user immediately closes the app, locks phone, or clears recents.
|
||||||
|
*/
|
||||||
|
fun enqueue(
|
||||||
|
context: Context,
|
||||||
|
deviceId: String,
|
||||||
|
action: TriggerAction,
|
||||||
|
source: String = "App"
|
||||||
|
) {
|
||||||
|
NotificationHelper.createNotificationChannel(context)
|
||||||
|
|
||||||
|
val inputData = Data.Builder()
|
||||||
|
.putString(KEY_DEVICE_ID, deviceId)
|
||||||
|
.putString(KEY_ACTION, action.name)
|
||||||
|
.putString(KEY_SOURCE, source)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
val constraints = Constraints.Builder()
|
||||||
|
.setRequiredNetworkType(NetworkType.CONNECTED)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
val workRequest = OneTimeWorkRequestBuilder<ActionTriggerWorker>()
|
||||||
|
.setInputData(inputData)
|
||||||
|
.setConstraints(constraints)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
WorkManager.getInstance(context).enqueueUniqueWork(
|
||||||
|
"action_trigger_${deviceId}",
|
||||||
|
ExistingWorkPolicy.REPLACE,
|
||||||
|
workRequest
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun doWork(): Result {
|
||||||
|
val deviceId = inputData.getString(KEY_DEVICE_ID) ?: return Result.failure()
|
||||||
|
val actionName = inputData.getString(KEY_ACTION) ?: return Result.failure()
|
||||||
|
val source = inputData.getString(KEY_SOURCE) ?: "App"
|
||||||
|
|
||||||
|
val action = try {
|
||||||
|
TriggerAction.valueOf(actionName)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
return Result.failure()
|
||||||
|
}
|
||||||
|
|
||||||
|
val repository = DeviceRepository(SharedPrefsStorage(appContext))
|
||||||
|
val device = repository.getDevices().find { it.id == deviceId } ?: return Result.failure()
|
||||||
|
|
||||||
|
val actionTitle = when (action) {
|
||||||
|
TriggerAction.POWER_ON -> "Power On"
|
||||||
|
TriggerAction.REBOOT -> "Reboot"
|
||||||
|
TriggerAction.POWER_OFF -> "Shutdown"
|
||||||
|
}
|
||||||
|
|
||||||
|
val triggerClient = TriggerClient()
|
||||||
|
val historyRepo = TriggerHistoryRepository(appContext)
|
||||||
|
val appSettings = AppSettings(appContext)
|
||||||
|
|
||||||
|
// 1. Execute the HTTP trigger to the server
|
||||||
|
val response = triggerClient.sendTriggerSync(device, action)
|
||||||
|
|
||||||
|
// 2. Post notification immediately confirming the signal was sent (or failed)
|
||||||
|
val signalMsg = if (response.isSuccess) {
|
||||||
|
when (action) {
|
||||||
|
TriggerAction.POWER_ON -> "Power on signal sent successfully to ${device.name}"
|
||||||
|
TriggerAction.POWER_OFF -> "Shutdown signal sent to ${device.name}"
|
||||||
|
TriggerAction.REBOOT -> "Reboot signal sent to ${device.name}"
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
val raw = response.message.trim()
|
||||||
|
val clean = if (raw.startsWith("<")) "HTTP ${response.statusCode}" else raw.take(60)
|
||||||
|
"Failed to send $actionTitle: $clean"
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Save to history log
|
||||||
|
historyRepo.addLog(
|
||||||
|
TriggerLog(
|
||||||
|
deviceId = device.id,
|
||||||
|
deviceName = device.name,
|
||||||
|
node = device.node,
|
||||||
|
action = action,
|
||||||
|
isSuccess = response.isSuccess,
|
||||||
|
statusCode = response.statusCode,
|
||||||
|
message = signalMsg,
|
||||||
|
source = source
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
// 4. Update home screen widgets
|
||||||
|
ServerWidgetProvider.updateAllWidgets(appContext)
|
||||||
|
|
||||||
|
// 5. If trigger succeeded and device has a status endpoint, actively poll until state changes!
|
||||||
|
if (response.isSuccess && device.statusUrl.isNotBlank()) {
|
||||||
|
pollForTransition(device, action, triggerClient, appSettings)
|
||||||
|
}
|
||||||
|
|
||||||
|
return Result.success()
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun pollForTransition(
|
||||||
|
device: DeviceConfig,
|
||||||
|
action: TriggerAction,
|
||||||
|
triggerClient: TriggerClient,
|
||||||
|
appSettings: AppSettings
|
||||||
|
) {
|
||||||
|
val maxAttempts = 15 // Up to 60 seconds (15 attempts * 4s)
|
||||||
|
var attempts = 0
|
||||||
|
|
||||||
|
// Brief delay for hardware/OS to begin reaction
|
||||||
|
delay(4000L)
|
||||||
|
|
||||||
|
while (attempts < maxAttempts) {
|
||||||
|
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) {
|
||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
TriggerAction.REBOOT -> {
|
||||||
|
if (attempts >= 2 && 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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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,17 @@ object NotificationHelper {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun sendUpdateAvailableNotification(context: Context, newVersion: String): Boolean {
|
||||||
|
return sendNotification(
|
||||||
|
context = context,
|
||||||
|
id = 8888,
|
||||||
|
title = "🚀 Update Available: v$newVersion",
|
||||||
|
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,
|
||||||
|
|||||||
@@ -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,22 +113,31 @@ 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
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check for app updates in the background 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
|
||||||
|
updateManager.checkForUpdate(currentVersion) { result ->
|
||||||
|
if (result is com.expapp.trigger.update.UpdateCheckResult.UpdateAvailable) {
|
||||||
|
val newVer = result.info.versionName
|
||||||
|
val lastNotified = appSettings.lastNotifiedUpdateVersion
|
||||||
|
if (lastNotified != newVer) {
|
||||||
|
appSettings.lastNotifiedUpdateVersion = newVer
|
||||||
|
NotificationHelper.sendUpdateAvailableNotification(appContext, newVer)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (_: Exception) {
|
||||||
|
// Ignore background check failure
|
||||||
|
}
|
||||||
|
|
||||||
return Result.success()
|
return Result.success()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user