Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a897236b90 | ||
|
|
1ef05a04cb | ||
|
|
5c66f6c4dc | ||
|
|
153bf3598d | ||
|
|
61e2b2445b | ||
|
|
2f38ea7dcc | ||
|
|
bba5caf79d | ||
|
|
d8eaceb314 | ||
|
|
256cc6cfc8 | ||
|
|
e1bcfa21f8 | ||
|
|
d16b87143d | ||
|
|
27b632bcaa |
@@ -11,8 +11,8 @@ android {
|
||||
applicationId = "com.expapp.trigger"
|
||||
minSdk = 24
|
||||
targetSdk = 34
|
||||
versionCode = 7
|
||||
versionName = "1.1.3"
|
||||
versionCode = 18
|
||||
versionName = "1.2.4"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables {
|
||||
|
||||
@@ -60,6 +60,15 @@
|
||||
android:name=".update.InstallStatusReceiver"
|
||||
android:exported="false" />
|
||||
|
||||
<!-- Transparent Widget Biometric Auth Activity (Floating Prompt on Launcher) -->
|
||||
<activity
|
||||
android:name=".widget.WidgetAuthActivity"
|
||||
android:exported="false"
|
||||
android:theme="@style/Theme.WidgetAuth"
|
||||
android:excludeFromRecents="true"
|
||||
android:noHistory="true"
|
||||
android:launchMode="singleInstance" />
|
||||
|
||||
<!-- Home Screen Widget -->
|
||||
<receiver
|
||||
android:name=".widget.ServerWidgetProvider"
|
||||
|
||||
@@ -38,6 +38,8 @@ import com.expapp.trigger.ui.screens.MainScreen
|
||||
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
|
||||
|
||||
@@ -61,6 +63,7 @@ class MainActivity : FragmentActivity() {
|
||||
NotificationHelper.createNotificationChannel(this)
|
||||
if (appSettings.isBackgroundMonitoringEnabled) {
|
||||
ServerMonitorWorker.schedule(this)
|
||||
AppUpdateWorker.schedule(this)
|
||||
}
|
||||
onNotificationPermissionGrantedCallback?.invoke()
|
||||
} else {
|
||||
@@ -126,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)
|
||||
@@ -194,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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -265,26 +271,9 @@ class MainActivity : FragmentActivity() {
|
||||
val onAuthorized = {
|
||||
vibrateFeedback(true)
|
||||
Toast.makeText(this, "Sending $actionName signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
||||
triggerClient.sendTrigger(device, action) { response ->
|
||||
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)
|
||||
ActionTriggerWorker.enqueue(this, device.id, action, source)
|
||||
if (source == "Widget") {
|
||||
finish()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -296,8 +285,13 @@ class MainActivity : FragmentActivity() {
|
||||
) { success, errorMsg ->
|
||||
if (success) {
|
||||
onAuthorized()
|
||||
} else if (errorMsg != null) {
|
||||
Toast.makeText(this, "Authentication cancelled", Toast.LENGTH_SHORT).show()
|
||||
} else {
|
||||
if (errorMsg != null) {
|
||||
Toast.makeText(this, "Authentication cancelled", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
if (source == "Widget") {
|
||||
finish()
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -8,14 +8,27 @@ class AppSettings(private val storage: KeyValueStorage) {
|
||||
|
||||
companion object {
|
||||
private const val KEY_BIOMETRIC_ENABLED = "key_biometric_enabled"
|
||||
private const val KEY_WIDGET_BIOMETRIC_ENABLED = "key_widget_biometric_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_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
|
||||
get() = storage.getBoolean(KEY_BIOMETRIC_ENABLED, true)
|
||||
set(value) = storage.putBoolean(KEY_BIOMETRIC_ENABLED, value)
|
||||
|
||||
var isWidgetBiometricEnabled: Boolean
|
||||
get() = storage.getBoolean(KEY_WIDGET_BIOMETRIC_ENABLED, false)
|
||||
set(value) = storage.putBoolean(KEY_WIDGET_BIOMETRIC_ENABLED, value)
|
||||
|
||||
var isBackgroundMonitoringEnabled: Boolean
|
||||
get() = storage.getBoolean(KEY_BG_MONITOR_ENABLED, true)
|
||||
set(value) = storage.putBoolean(KEY_BG_MONITOR_ENABLED, value)
|
||||
|
||||
@@ -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
|
||||
}
|
||||
@@ -198,14 +198,14 @@ class TriggerClient(
|
||||
client.newCall(request).enqueue(object : Callback {
|
||||
override fun onFailure(call: Call, e: IOException) {
|
||||
runOnMain {
|
||||
callback(NodeStatus(isOnline = false, statusText = "OFFLINE"))
|
||||
callback(NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false))
|
||||
}
|
||||
}
|
||||
|
||||
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) }
|
||||
}
|
||||
@@ -215,7 +215,7 @@ class TriggerClient(
|
||||
fun checkStatusSync(device: DeviceConfig): NodeStatus {
|
||||
val baseStatusUrl = device.statusUrl.trim()
|
||||
if (baseStatusUrl.isBlank()) {
|
||||
return NodeStatus(isOnline = false, statusText = "NO STATUS URL")
|
||||
return NodeStatus(isOnline = false, statusText = "NO STATUS URL", isReachable = false)
|
||||
}
|
||||
|
||||
return try {
|
||||
@@ -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")
|
||||
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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,5 +20,6 @@ data class NodeStatus(
|
||||
val onSinceIst: String? = null,
|
||||
val lastActiveAgo: String? = null,
|
||||
val lastActiveIst: String? = null,
|
||||
val timestamp: Long = System.currentTimeMillis()
|
||||
val timestamp: Long = System.currentTimeMillis(),
|
||||
val isReachable: Boolean = true
|
||||
)
|
||||
|
||||
@@ -60,6 +60,8 @@ import com.expapp.trigger.ui.theme.TextSecondary
|
||||
fun SettingsDialog(
|
||||
isBiometricEnabled: Boolean,
|
||||
onBiometricToggled: (Boolean) -> Unit,
|
||||
isWidgetBiometricEnabled: Boolean = false,
|
||||
onWidgetBiometricToggled: (Boolean) -> Unit = {},
|
||||
isBgMonitorEnabled: Boolean,
|
||||
onBgMonitorToggled: (Boolean) -> Unit,
|
||||
isBiometricAvailable: Boolean,
|
||||
@@ -165,6 +167,59 @@ fun SettingsDialog(
|
||||
}
|
||||
}
|
||||
|
||||
// Widget Biometric Setting (Optional)
|
||||
if (isBiometricEnabled && isBiometricAvailable) {
|
||||
Spacer(modifier = Modifier.height(10.dp))
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(14.dp))
|
||||
.background(BgCard)
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(14.dp))
|
||||
.padding(14.dp)
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Fingerprint,
|
||||
contentDescription = null,
|
||||
tint = if (isWidgetBiometricEnabled) GreenVibrant else TextMuted,
|
||||
modifier = Modifier.size(28.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(12.dp))
|
||||
Column(modifier = Modifier.weight(1f)) {
|
||||
Text(
|
||||
"Widget Biometric Prompt",
|
||||
color = TextPrimary,
|
||||
fontSize = 14.sp,
|
||||
fontWeight = FontWeight.SemiBold
|
||||
)
|
||||
Spacer(modifier = Modifier.height(2.dp))
|
||||
Text(
|
||||
if (isWidgetBiometricEnabled)
|
||||
"Fingerprint overlay required before widget actions"
|
||||
else
|
||||
"1-tap instant action from home screen (no prompt)",
|
||||
color = TextMuted,
|
||||
fontSize = 11.sp
|
||||
)
|
||||
}
|
||||
Switch(
|
||||
checked = isWidgetBiometricEnabled,
|
||||
onCheckedChange = { onWidgetBiometricToggled(it) },
|
||||
colors = SwitchDefaults.colors(
|
||||
checkedThumbColor = GreenVibrant,
|
||||
checkedTrackColor = GreenVibrant.copy(alpha = 0.3f),
|
||||
uncheckedThumbColor = TextMuted,
|
||||
uncheckedTrackColor = BgElevated
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(12.dp))
|
||||
|
||||
// Background Monitor Setting Card
|
||||
|
||||
@@ -208,7 +208,7 @@ fun UpdateDialog(
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Text(
|
||||
text = "Downloading update…",
|
||||
text = if (downloadState.bytesDownloaded == 0L) "Connecting to server…" else "Downloading update…",
|
||||
fontSize = 12.sp,
|
||||
color = TextSecondary
|
||||
)
|
||||
@@ -220,15 +220,26 @@ fun UpdateDialog(
|
||||
)
|
||||
}
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
LinearProgressIndicator(
|
||||
progress = { downloadState.progressPercent / 100f },
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(8.dp)
|
||||
.clip(RoundedCornerShape(4.dp)),
|
||||
color = GreenVibrant,
|
||||
trackColor = GreenVibrant.copy(alpha = 0.15f)
|
||||
)
|
||||
if (downloadState.bytesDownloaded == 0L && downloadState.progressPercent == 0) {
|
||||
LinearProgressIndicator(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(8.dp)
|
||||
.clip(RoundedCornerShape(4.dp)),
|
||||
color = GreenVibrant,
|
||||
trackColor = GreenVibrant.copy(alpha = 0.15f)
|
||||
)
|
||||
} else {
|
||||
LinearProgressIndicator(
|
||||
progress = { (downloadState.progressPercent / 100f).coerceIn(0f, 1f) },
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(8.dp)
|
||||
.clip(RoundedCornerShape(4.dp)),
|
||||
color = GreenVibrant,
|
||||
trackColor = GreenVibrant.copy(alpha = 0.15f)
|
||||
)
|
||||
}
|
||||
if (downloadState.totalBytes > 0) {
|
||||
Spacer(modifier = Modifier.height(6.dp))
|
||||
val downloadedMb = String.format("%.1f", downloadState.bytesDownloaded / (1024.0 * 1024.0))
|
||||
@@ -238,6 +249,14 @@ fun UpdateDialog(
|
||||
fontSize = 11.sp,
|
||||
color = TextMuted
|
||||
)
|
||||
} else if (downloadState.bytesDownloaded > 0) {
|
||||
Spacer(modifier = Modifier.height(6.dp))
|
||||
val downloadedMb = String.format("%.1f MB", downloadState.bytesDownloaded / (1024.0 * 1024.0))
|
||||
Text(
|
||||
text = "$downloadedMb downloaded",
|
||||
fontSize = 11.sp,
|
||||
color = TextMuted
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,12 +31,13 @@ import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
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.Edit
|
||||
import androidx.compose.material.icons.filled.PowerOff
|
||||
import androidx.compose.material.icons.filled.PowerSettingsNew
|
||||
import androidx.compose.material.icons.filled.Refresh
|
||||
import androidx.compose.material.icons.filled.RestartAlt
|
||||
import androidx.compose.material.icons.filled.Schedule
|
||||
import androidx.compose.material.icons.filled.Terminal
|
||||
@@ -119,6 +120,7 @@ fun DevicePage(
|
||||
var pendingAction by remember { mutableStateOf<TriggerAction?>(null) }
|
||||
var showDeleteConfirm by remember { mutableStateOf(false) }
|
||||
var showEditDialog by remember { mutableStateOf(false) }
|
||||
var showMenu by remember { mutableStateOf(false) }
|
||||
|
||||
if (showEditDialog) {
|
||||
var editName by remember { mutableStateOf(device.name) }
|
||||
@@ -259,15 +261,8 @@ fun DevicePage(
|
||||
)
|
||||
}
|
||||
|
||||
// Spin animation for refresh icon
|
||||
val infiniteTransition = rememberInfiniteTransition(label = "refresh_spin")
|
||||
val spinAngle by infiniteTransition.animateFloat(
|
||||
initialValue = 0f, targetValue = 360f,
|
||||
animationSpec = infiniteRepeatable(tween(900, easing = LinearEasing)),
|
||||
label = "spin"
|
||||
)
|
||||
|
||||
// Pulse for online dot
|
||||
val infiniteTransition = rememberInfiniteTransition(label = "pulse_transition")
|
||||
val pulseScale by infiniteTransition.animateFloat(
|
||||
initialValue = 0.8f, targetValue = 1.5f,
|
||||
animationSpec = infiniteRepeatable(
|
||||
@@ -318,16 +313,16 @@ fun DevicePage(
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 18.dp, vertical = 16.dp)
|
||||
.padding(horizontal = 16.dp, vertical = 14.dp)
|
||||
) {
|
||||
// Title row
|
||||
// Top row: Server Icon + Name / Node (flexible) + Header Actions
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(44.dp)
|
||||
.size(42.dp)
|
||||
.clip(RoundedCornerShape(12.dp))
|
||||
.background(
|
||||
Brush.radialGradient(
|
||||
@@ -368,12 +363,12 @@ fun DevicePage(
|
||||
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.weight(1f)
|
||||
.padding(end = 6.dp)
|
||||
.weight(1f, fill = true)
|
||||
.padding(end = 8.dp)
|
||||
) {
|
||||
Text(
|
||||
text = device.name,
|
||||
fontSize = 18.sp,
|
||||
fontSize = 17.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary,
|
||||
maxLines = 1,
|
||||
@@ -391,92 +386,66 @@ fun DevicePage(
|
||||
)
|
||||
}
|
||||
|
||||
// Action buttons in a fixed non-shrinking Row
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(4.dp)
|
||||
) {
|
||||
// Re-fetch R2 JSON config button
|
||||
// Device options menu (Edit / Delete)
|
||||
Box {
|
||||
IconButton(
|
||||
onClick = onSyncConfig,
|
||||
onClick = { showMenu = true },
|
||||
modifier = Modifier
|
||||
.size(34.dp)
|
||||
.clip(RoundedCornerShape(9.dp))
|
||||
.background(AmberVibrant.copy(alpha = 0.08f))
|
||||
.border(1.dp, AmberVibrant.copy(alpha = 0.2f), RoundedCornerShape(9.dp))
|
||||
) {
|
||||
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))
|
||||
.background(BorderSubtle.copy(alpha = 0.25f))
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Edit,
|
||||
contentDescription = "Edit device",
|
||||
imageVector = Icons.Default.MoreVert,
|
||||
contentDescription = "Device options",
|
||||
tint = TextSecondary,
|
||||
modifier = Modifier.size(17.dp)
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
}
|
||||
|
||||
// Refresh button (spins while checking)
|
||||
IconButton(
|
||||
onClick = { if (!isCheckingStatus) onRefreshStatus() },
|
||||
DropdownMenu(
|
||||
expanded = showMenu,
|
||||
onDismissRequest = { showMenu = false },
|
||||
modifier = Modifier
|
||||
.size(34.dp)
|
||||
.clip(RoundedCornerShape(9.dp))
|
||||
.background(
|
||||
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.12f)
|
||||
else BorderSubtle.copy(alpha = 0.3f)
|
||||
)
|
||||
.border(
|
||||
1.dp,
|
||||
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.3f)
|
||||
else BorderSubtle,
|
||||
RoundedCornerShape(9.dp)
|
||||
)
|
||||
.background(BgElevated)
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(12.dp))
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Refresh,
|
||||
contentDescription = "Refresh status",
|
||||
tint = if (isCheckingStatus) GreenVibrant else TextMuted,
|
||||
modifier = Modifier
|
||||
.size(17.dp)
|
||||
.rotate(if (isCheckingStatus) spinAngle else 0f)
|
||||
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
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
// Delete button
|
||||
IconButton(
|
||||
onClick = { showDeleteConfirm = true },
|
||||
modifier = Modifier
|
||||
.size(34.dp)
|
||||
.clip(RoundedCornerShape(9.dp))
|
||||
.background(RedVibrant.copy(alpha = 0.08f))
|
||||
.border(1.dp, RedVibrant.copy(alpha = 0.15f), RoundedCornerShape(9.dp))
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.DeleteOutline,
|
||||
contentDescription = "Remove device",
|
||||
tint = RedVibrant.copy(alpha = 0.7f),
|
||||
modifier = Modifier.size(17.dp)
|
||||
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 ────────────────────────────────────────────
|
||||
Row(
|
||||
|
||||
@@ -92,6 +92,8 @@ import com.expapp.trigger.update.ReleaseInfo
|
||||
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
|
||||
@@ -149,6 +151,7 @@ fun MainScreen(
|
||||
var showNfcWriteDialog by remember { mutableStateOf(false) }
|
||||
var historyLogs by remember { mutableStateOf(historyRepository.getLogs()) }
|
||||
var isBiometricEnabled by remember { mutableStateOf(appSettings.isBiometricEnabled) }
|
||||
var isWidgetBiometricEnabled by remember { mutableStateOf(appSettings.isWidgetBiometricEnabled) }
|
||||
var isBgMonitorEnabled by remember { mutableStateOf(appSettings.isBackgroundMonitoringEnabled) }
|
||||
|
||||
val loadingStates = remember { mutableStateMapOf<String, Boolean>() }
|
||||
@@ -165,8 +168,10 @@ fun MainScreen(
|
||||
triggerClient.checkStatus(device) { status ->
|
||||
checkingStatusMap[device.id] = false
|
||||
nodeStatuses[device.id] = status
|
||||
// Keep background monitoring synced with the latest live status
|
||||
appSettings.setLastStatus(device.id, status.isOnline)
|
||||
// Only update stored status when server is actually reached
|
||||
if (status.isReachable) {
|
||||
appSettings.setLastStatus(device.id, status.isOnline)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -199,25 +204,38 @@ fun MainScreen(
|
||||
}
|
||||
}
|
||||
|
||||
fun checkAppUpdate(showToast: Boolean = false) {
|
||||
fun checkAppUpdate(isManual: Boolean = false) {
|
||||
isCheckingUpdate = true
|
||||
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
|
||||
isCheckingUpdate = false
|
||||
when (result) {
|
||||
is UpdateCheckResult.UpdateAvailable -> {
|
||||
availableUpdate = result.info
|
||||
if (showToast || dismissedVersion != result.info.versionName) {
|
||||
showUpdateDialog = true
|
||||
showUpdateDialog = true
|
||||
val newVer = result.info.versionName
|
||||
if (appSettings.lastNotifiedUpdateVersion != 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()
|
||||
}
|
||||
}
|
||||
is UpdateCheckResult.UpToDate -> {
|
||||
if (showToast) {
|
||||
Toast.makeText(context, "App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
||||
availableUpdate = null
|
||||
if (isManual) {
|
||||
Toast.makeText(context, "Page refreshed • App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
is UpdateCheckResult.Error -> {
|
||||
if (showToast) {
|
||||
Toast.makeText(context, "Update check failed: ${result.message}", Toast.LENGTH_SHORT).show()
|
||||
if (isManual) {
|
||||
Toast.makeText(context, "Page refreshed • Update check failed", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -227,6 +245,7 @@ fun MainScreen(
|
||||
// Pull-to-refresh entire page handler
|
||||
fun refreshWholePage() {
|
||||
isPullRefreshing = true
|
||||
dismissedVersion = null
|
||||
coroutineScope.launch {
|
||||
// 1. Sync R2 endpoints
|
||||
syncEndpoints(showToast = false)
|
||||
@@ -236,15 +255,14 @@ fun MainScreen(
|
||||
refreshStatus(dev, showIndicator = true)
|
||||
}
|
||||
|
||||
// 3. Check for app updates
|
||||
checkAppUpdate(showToast = false)
|
||||
// 3. Explicitly check for app updates with user feedback
|
||||
checkAppUpdate(isManual = true)
|
||||
|
||||
// 4. Update home screen widgets
|
||||
ServerWidgetProvider.updateAllWidgets(context)
|
||||
|
||||
delay(750)
|
||||
isPullRefreshing = false
|
||||
Toast.makeText(context, "Page refreshed", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -281,45 +299,22 @@ fun MainScreen(
|
||||
val performDispatch = {
|
||||
loadingStates[device.id] = true
|
||||
statusStates.remove(device.id)
|
||||
triggerClient.sendTrigger(device, action) { response ->
|
||||
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()
|
||||
Toast.makeText(context, "Sending $actionTitle signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
||||
|
||||
// Save to history log
|
||||
historyRepository.addLog(
|
||||
TriggerLog(
|
||||
deviceId = device.id,
|
||||
deviceName = device.name,
|
||||
node = device.node,
|
||||
action = action,
|
||||
isSuccess = response.isSuccess,
|
||||
statusCode = response.statusCode,
|
||||
message = msg,
|
||||
source = "App"
|
||||
)
|
||||
)
|
||||
// Enqueue guaranteed background worker: executes HTTP request, sends notifications, updates widgets & monitors transition
|
||||
ActionTriggerWorker.enqueue(context, device.id, action, "App")
|
||||
|
||||
// In foreground, refresh UI smoothly after short intervals if user stays in the app
|
||||
coroutineScope.launch {
|
||||
delay(2000)
|
||||
refreshStatus(device, showIndicator = true)
|
||||
historyLogs = historyRepository.getLogs()
|
||||
|
||||
// Update home screen widgets
|
||||
ServerWidgetProvider.updateAllWidgets(context)
|
||||
|
||||
coroutineScope.launch {
|
||||
delay(1500); refreshStatus(device, showIndicator = true)
|
||||
delay(4000); refreshStatus(device)
|
||||
delay(5000); refreshStatus(device)
|
||||
}
|
||||
loadingStates[device.id] = false
|
||||
delay(3000)
|
||||
refreshStatus(device, showIndicator = false)
|
||||
historyLogs = historyRepository.getLogs()
|
||||
delay(4000)
|
||||
refreshStatus(device, showIndicator = false)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -340,13 +335,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(
|
||||
modifier = modifier.fillMaxSize(),
|
||||
containerColor = BgBase,
|
||||
@@ -354,52 +342,50 @@ fun MainScreen(
|
||||
TopAppBar(
|
||||
title = {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
modifier = Modifier.padding(start = 2.dp)
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Terminal,
|
||||
contentDescription = null,
|
||||
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 = "DEVICE TRIGGER",
|
||||
text = "TRIGGER",
|
||||
fontSize = 12.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
letterSpacing = 1.2.sp,
|
||||
letterSpacing = 1.sp,
|
||||
color = TextPrimary,
|
||||
fontFamily = FontFamily.Monospace,
|
||||
maxLines = 1
|
||||
)
|
||||
val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true }
|
||||
if (devices.isNotEmpty() && onlineCount > 0) {
|
||||
Spacer(modifier = Modifier.width(6.dp))
|
||||
Spacer(modifier = Modifier.width(4.dp))
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.clip(CircleShape)
|
||||
.background(OnlineBg)
|
||||
.border(1.dp, OnlineBorder, CircleShape)
|
||||
.padding(horizontal = 6.dp, vertical = 2.dp)
|
||||
.padding(horizontal = 5.dp, vertical = 1.dp)
|
||||
) {
|
||||
Text(
|
||||
"$onlineCount on",
|
||||
"$onlineCount",
|
||||
fontSize = 9.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = OnlineText,
|
||||
letterSpacing = 0.5.sp
|
||||
color = OnlineText
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
actions = {
|
||||
// Update Button
|
||||
// Update Button (only when update is ready)
|
||||
if (availableUpdate != null) {
|
||||
IconButton(
|
||||
onClick = { showUpdateDialog = true },
|
||||
modifier = Modifier.size(36.dp)
|
||||
modifier = Modifier.size(30.dp)
|
||||
) {
|
||||
Box(contentAlignment = Alignment.TopEnd) {
|
||||
Icon(
|
||||
@@ -424,55 +410,39 @@ fun MainScreen(
|
||||
historyLogs = historyRepository.getLogs()
|
||||
showHistoryDialog = true
|
||||
},
|
||||
modifier = Modifier.size(36.dp)
|
||||
modifier = Modifier.size(30.dp)
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.History,
|
||||
contentDescription = "Trigger History",
|
||||
tint = TextSecondary,
|
||||
modifier = Modifier.size(20.dp)
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
}
|
||||
|
||||
// Settings Button
|
||||
IconButton(
|
||||
onClick = { showSettingsDialog = true },
|
||||
modifier = Modifier.size(36.dp)
|
||||
modifier = Modifier.size(30.dp)
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Settings,
|
||||
contentDescription = "Settings",
|
||||
tint = TextSecondary,
|
||||
modifier = Modifier.size(20.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)
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
}
|
||||
|
||||
// Add Device Button
|
||||
IconButton(
|
||||
onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } },
|
||||
modifier = Modifier.size(36.dp)
|
||||
modifier = Modifier.size(30.dp)
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Add,
|
||||
"Add Device",
|
||||
tint = GreenVibrant,
|
||||
modifier = Modifier.size(22.dp)
|
||||
modifier = Modifier.size(19.dp)
|
||||
)
|
||||
}
|
||||
},
|
||||
@@ -601,14 +571,21 @@ fun MainScreen(
|
||||
isBiometricEnabled = enabled
|
||||
appSettings.isBiometricEnabled = enabled
|
||||
},
|
||||
isWidgetBiometricEnabled = isWidgetBiometricEnabled,
|
||||
onWidgetBiometricToggled = { enabled ->
|
||||
isWidgetBiometricEnabled = enabled
|
||||
appSettings.isWidgetBiometricEnabled = enabled
|
||||
},
|
||||
isBgMonitorEnabled = isBgMonitorEnabled,
|
||||
onBgMonitorToggled = { enabled ->
|
||||
isBgMonitorEnabled = enabled
|
||||
appSettings.isBackgroundMonitoringEnabled = enabled
|
||||
if (enabled) {
|
||||
ServerMonitorWorker.schedule(context)
|
||||
AppUpdateWorker.schedule(context)
|
||||
} else {
|
||||
ServerMonitorWorker.cancel(context)
|
||||
AppUpdateWorker.cancel(context)
|
||||
}
|
||||
},
|
||||
isBiometricAvailable = BiometricHelper.isBiometricAvailable(context),
|
||||
@@ -651,23 +628,23 @@ fun MainScreen(
|
||||
val info = availableUpdate!!
|
||||
// If retrying from failure, re-check to get fresh release asset URLs
|
||||
if (downloadState is DownloadState.Failed) {
|
||||
downloadState = DownloadState.Downloading(0, 0, 0)
|
||||
downloadState = DownloadState.Downloading(0, 0, info.sizeBytes)
|
||||
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { checkResult ->
|
||||
if (checkResult is UpdateCheckResult.UpdateAvailable) {
|
||||
availableUpdate = checkResult.info
|
||||
val fresh = checkResult.info
|
||||
updateManager.downloadApk(fresh.downloadUrl, fresh.assetApiUrl) { state ->
|
||||
updateManager.downloadApk(fresh.downloadUrl, fresh.assetApiUrl, fresh.sizeBytes) { state ->
|
||||
downloadState = state
|
||||
}
|
||||
} else {
|
||||
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl) { state ->
|
||||
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl, info.sizeBytes) { state ->
|
||||
downloadState = state
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
downloadState = DownloadState.Downloading(0, 0, info.sizeBytes)
|
||||
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl) { state ->
|
||||
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl, info.sizeBytes) { state ->
|
||||
downloadState = state
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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,15 +45,93 @@ class UpdateManager(
|
||||
}
|
||||
|
||||
/**
|
||||
* 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 {
|
||||
// Query both primary (forge) and fallback (GitHub) and pick the highest available release
|
||||
val primaryResult = queryReleasesSync(primaryReleasesUrl, currentVersionName)
|
||||
val fallbackResult = queryReleasesSync(fallbackReleasesUrl, currentVersionName)
|
||||
|
||||
val primaryUpdate = if (primaryResult is UpdateCheckResult.UpdateAvailable) primaryResult.info else null
|
||||
val fallbackUpdate = if (fallbackResult is UpdateCheckResult.UpdateAvailable) fallbackResult.info else null
|
||||
|
||||
return when {
|
||||
primaryUpdate != null && fallbackUpdate != null -> {
|
||||
if (isNewerVersion(primaryUpdate.versionName, fallbackUpdate.versionName)) {
|
||||
UpdateCheckResult.UpdateAvailable(primaryUpdate)
|
||||
} else {
|
||||
UpdateCheckResult.UpdateAvailable(fallbackUpdate)
|
||||
}
|
||||
}
|
||||
primaryUpdate != null -> UpdateCheckResult.UpdateAvailable(primaryUpdate)
|
||||
fallbackUpdate != null -> UpdateCheckResult.UpdateAvailable(fallbackUpdate)
|
||||
primaryResult is UpdateCheckResult.UpToDate || fallbackResult is UpdateCheckResult.UpToDate -> UpdateCheckResult.UpToDate
|
||||
else -> primaryResult
|
||||
}
|
||||
}
|
||||
|
||||
private fun queryReleasesSync(url: String, currentVersionName: String): UpdateCheckResult {
|
||||
val request = Request.Builder()
|
||||
.url(url)
|
||||
.addHeader("Accept", "application/vnd.github.v3+json")
|
||||
.addHeader("User-Agent", "ServerControlApp")
|
||||
.get()
|
||||
.build()
|
||||
|
||||
return try {
|
||||
val response = okHttpClient.newCall(request).execute()
|
||||
response.use { res ->
|
||||
if (res.code == 404) {
|
||||
return UpdateCheckResult.UpToDate
|
||||
}
|
||||
if (!res.isSuccessful) {
|
||||
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 ($url): ${e.localizedMessage}")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Asynchronously checks for updates with primary (self-hosted) -> fallback (GitHub) strategy.
|
||||
*/
|
||||
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"
|
||||
queryReleasesAsync(primaryReleasesUrl, currentVersionName) { primaryResult ->
|
||||
queryReleasesAsync(fallbackReleasesUrl, currentVersionName) { fallbackResult ->
|
||||
val primaryUpdate = if (primaryResult is UpdateCheckResult.UpdateAvailable) primaryResult.info else null
|
||||
val fallbackUpdate = if (fallbackResult is UpdateCheckResult.UpdateAvailable) fallbackResult.info else null
|
||||
|
||||
val finalResult = when {
|
||||
primaryUpdate != null && fallbackUpdate != null -> {
|
||||
if (isNewerVersion(primaryUpdate.versionName, fallbackUpdate.versionName)) {
|
||||
UpdateCheckResult.UpdateAvailable(primaryUpdate)
|
||||
} else {
|
||||
UpdateCheckResult.UpdateAvailable(fallbackUpdate)
|
||||
}
|
||||
}
|
||||
primaryUpdate != null -> UpdateCheckResult.UpdateAvailable(primaryUpdate)
|
||||
fallbackUpdate != null -> UpdateCheckResult.UpdateAvailable(fallbackUpdate)
|
||||
primaryResult is UpdateCheckResult.UpToDate || fallbackResult is UpdateCheckResult.UpToDate -> UpdateCheckResult.UpToDate
|
||||
else -> if (primaryResult is UpdateCheckResult.Error) primaryResult else fallbackResult
|
||||
}
|
||||
runOnMain { callback(finalResult) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun queryReleasesAsync(
|
||||
url: String,
|
||||
currentVersionName: String,
|
||||
onComplete: (UpdateCheckResult) -> Unit
|
||||
) {
|
||||
val request = Request.Builder()
|
||||
.url(url)
|
||||
.addHeader("Accept", "application/vnd.github.v3+json")
|
||||
@@ -62,110 +141,107 @@ class UpdateManager(
|
||||
|
||||
okHttpClient.newCall(request).enqueue(object : Callback {
|
||||
override fun onFailure(call: Call, e: IOException) {
|
||||
runOnMain {
|
||||
callback(UpdateCheckResult.Error("Network error: ${e.localizedMessage}"))
|
||||
}
|
||||
onComplete(UpdateCheckResult.Error("Network error: ${e.localizedMessage}"))
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call, response: Response) {
|
||||
response.use { res ->
|
||||
if (res.code == 404) {
|
||||
runOnMain { callback(UpdateCheckResult.UpToDate) }
|
||||
onComplete(UpdateCheckResult.UpToDate)
|
||||
return
|
||||
}
|
||||
if (!res.isSuccessful) {
|
||||
runOnMain {
|
||||
callback(UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates"))
|
||||
}
|
||||
onComplete(UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates"))
|
||||
return
|
||||
}
|
||||
|
||||
val body = res.body?.string().orEmpty()
|
||||
try {
|
||||
val jsonElement = JsonParser.parseString(body)
|
||||
val releasesArray = if (jsonElement.isJsonArray) {
|
||||
jsonElement.asJsonArray
|
||||
} else {
|
||||
// In case a single release object was returned
|
||||
val arr = com.google.gson.JsonArray()
|
||||
if (jsonElement.isJsonObject) arr.add(jsonElement.asJsonObject)
|
||||
arr
|
||||
}
|
||||
|
||||
var highestRelease: ReleaseInfo? = null
|
||||
|
||||
for (item in releasesArray) {
|
||||
if (!item.isJsonObject) continue
|
||||
val json = item.asJsonObject
|
||||
if (json.has("draft") && json.get("draft").asBoolean) continue
|
||||
|
||||
val tagName = json.get("tag_name")?.asString.orEmpty()
|
||||
val cleanVer = tagName.removePrefix("v").removePrefix("V").trim()
|
||||
val title = json.get("name")?.asString?.ifBlank { tagName } ?: tagName
|
||||
val changelog = json.get("body")?.asString.orEmpty()
|
||||
|
||||
val assets = json.getAsJsonArray("assets")
|
||||
var apkUrl: String? = null
|
||||
var apkApiUrl: String? = null
|
||||
var apkName = "app-release.apk"
|
||||
var apkSize = 0L
|
||||
|
||||
if (assets != null) {
|
||||
for (element in assets) {
|
||||
val assetObj = element.asJsonObject
|
||||
val name = assetObj.get("name")?.asString.orEmpty()
|
||||
if (name.endsWith(".apk", ignoreCase = true)) {
|
||||
apkUrl = assetObj.get("browser_download_url")?.asString
|
||||
apkApiUrl = assetObj.get("url")?.asString
|
||||
apkName = name
|
||||
apkSize = assetObj.get("size")?.asLong ?: 0L
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!apkUrl.isNullOrBlank()) {
|
||||
val releaseInfo = ReleaseInfo(
|
||||
tagName = tagName,
|
||||
versionName = cleanVer,
|
||||
title = title,
|
||||
changelog = changelog,
|
||||
downloadUrl = apkUrl,
|
||||
assetApiUrl = apkApiUrl,
|
||||
apkFileName = apkName,
|
||||
sizeBytes = apkSize
|
||||
)
|
||||
|
||||
if (highestRelease == null || isNewerVersion(cleanVer, highestRelease.versionName)) {
|
||||
highestRelease = releaseInfo
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (highestRelease == null) {
|
||||
runOnMain { callback(UpdateCheckResult.UpToDate) }
|
||||
return
|
||||
}
|
||||
|
||||
val cleanLocalVersion = currentVersionName.removePrefix("v").removePrefix("V").trim()
|
||||
|
||||
if (isNewerVersion(highestRelease.versionName, cleanLocalVersion)) {
|
||||
runOnMain {
|
||||
callback(UpdateCheckResult.UpdateAvailable(highestRelease))
|
||||
}
|
||||
} else {
|
||||
runOnMain { callback(UpdateCheckResult.UpToDate) }
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
runOnMain {
|
||||
callback(UpdateCheckResult.Error("Failed to parse update info: ${e.message}"))
|
||||
}
|
||||
}
|
||||
val result = parseReleases(body, currentVersionName)
|
||||
onComplete(result)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
private fun parseReleases(body: String, currentVersionName: String): UpdateCheckResult {
|
||||
return try {
|
||||
val jsonElement = JsonParser.parseString(body)
|
||||
val releasesArray = if (jsonElement.isJsonArray) {
|
||||
jsonElement.asJsonArray
|
||||
} else {
|
||||
val arr = com.google.gson.JsonArray()
|
||||
if (jsonElement.isJsonObject) arr.add(jsonElement.asJsonObject)
|
||||
arr
|
||||
}
|
||||
|
||||
var highestRelease: ReleaseInfo? = null
|
||||
|
||||
for (item in releasesArray) {
|
||||
if (!item.isJsonObject) continue
|
||||
val json = item.asJsonObject
|
||||
if (json.has("draft") && json.get("draft").asBoolean) continue
|
||||
|
||||
val tagName = json.get("tag_name")?.asString.orEmpty()
|
||||
val cleanVer = tagName.removePrefix("v").removePrefix("V").trim()
|
||||
val title = json.get("name")?.asString?.ifBlank { tagName } ?: tagName
|
||||
val changelog = json.get("body")?.asString.orEmpty()
|
||||
|
||||
val assets = json.getAsJsonArray("assets")
|
||||
var apkUrl: String? = null
|
||||
var apkApiUrl: String? = null
|
||||
var apkName = "app-release.apk"
|
||||
var apkSize = 0L
|
||||
|
||||
if (assets != null) {
|
||||
for (element in assets) {
|
||||
val assetObj = element.asJsonObject
|
||||
val name = assetObj.get("name")?.asString.orEmpty()
|
||||
if (name.endsWith(".apk", ignoreCase = true)) {
|
||||
apkUrl = assetObj.get("browser_download_url")?.asString
|
||||
apkApiUrl = assetObj.get("url")?.asString
|
||||
apkName = name
|
||||
apkSize = assetObj.get("size")?.asLong ?: 0L
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!apkUrl.isNullOrBlank()) {
|
||||
val releaseInfo = ReleaseInfo(
|
||||
tagName = tagName,
|
||||
versionName = cleanVer,
|
||||
title = title,
|
||||
changelog = changelog,
|
||||
downloadUrl = apkUrl,
|
||||
assetApiUrl = apkApiUrl,
|
||||
apkFileName = apkName,
|
||||
sizeBytes = apkSize
|
||||
)
|
||||
|
||||
if (highestRelease == null || isNewerVersion(cleanVer, highestRelease.versionName)) {
|
||||
highestRelease = releaseInfo
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (highestRelease == null) {
|
||||
return UpdateCheckResult.UpToDate
|
||||
}
|
||||
|
||||
val cleanLocalVersion = currentVersionName.removePrefix("v").removePrefix("V").trim()
|
||||
|
||||
if (isNewerVersion(highestRelease.versionName, cleanLocalVersion)) {
|
||||
UpdateCheckResult.UpdateAvailable(highestRelease)
|
||||
} else {
|
||||
UpdateCheckResult.UpToDate
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
UpdateCheckResult.Error("Failed to parse update info: ${e.message}")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Downloads the APK file to the app's cache directory and streams progress updates.
|
||||
* If the browser download URL fails or returns 404, automatically attempts fallback to the API asset URL.
|
||||
@@ -173,20 +249,34 @@ class UpdateManager(
|
||||
fun downloadApk(
|
||||
downloadUrl: String,
|
||||
assetApiUrl: String? = null,
|
||||
expectedSizeBytes: Long = 0L,
|
||||
onProgress: (DownloadState) -> Unit
|
||||
): Call {
|
||||
return startDownloadCall(downloadUrl, assetApiUrl, isFallback = false, onProgress)
|
||||
return startDownloadCall(downloadUrl, assetApiUrl, expectedSizeBytes, isFallback = false, onProgress)
|
||||
}
|
||||
|
||||
private fun startDownloadCall(
|
||||
url: String,
|
||||
fallbackUrl: String?,
|
||||
expectedSizeBytes: Long,
|
||||
isFallback: Boolean,
|
||||
onProgress: (DownloadState) -> Unit
|
||||
): Call {
|
||||
// Instantly notify UI that connection/download is initializing so user gets immediate visual feedback
|
||||
runOnMain {
|
||||
onProgress(
|
||||
DownloadState.Downloading(
|
||||
progressPercent = 0,
|
||||
bytesDownloaded = 0L,
|
||||
totalBytes = expectedSizeBytes
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
val requestBuilder = Request.Builder()
|
||||
.url(url)
|
||||
.addHeader("User-Agent", "ServerControlApp")
|
||||
.addHeader("Accept-Encoding", "identity") // Disables gzip recompression to stream raw binary immediately with exact Content-Length
|
||||
|
||||
if (isFallback) {
|
||||
requestBuilder.addHeader("Accept", "application/octet-stream")
|
||||
@@ -199,7 +289,7 @@ class UpdateManager(
|
||||
override fun onFailure(call: Call, e: IOException) {
|
||||
if (call.isCanceled()) return
|
||||
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
|
||||
startDownloadCall(fallbackUrl, null, isFallback = true, onProgress)
|
||||
startDownloadCall(fallbackUrl, null, expectedSizeBytes, isFallback = true, onProgress)
|
||||
} else {
|
||||
runOnMain {
|
||||
onProgress(DownloadState.Failed("Download failed: ${e.localizedMessage}"))
|
||||
@@ -214,7 +304,7 @@ class UpdateManager(
|
||||
response.close()
|
||||
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
|
||||
// Fallback to direct asset API
|
||||
startDownloadCall(fallbackUrl, null, isFallback = true, onProgress)
|
||||
startDownloadCall(fallbackUrl, null, expectedSizeBytes, isFallback = true, onProgress)
|
||||
} else {
|
||||
runOnMain {
|
||||
onProgress(DownloadState.Failed("Server returned HTTP ${response.code}"))
|
||||
@@ -242,14 +332,16 @@ class UpdateManager(
|
||||
}
|
||||
|
||||
try {
|
||||
val totalBytes = responseBody.contentLength()
|
||||
val rawLength = responseBody.contentLength()
|
||||
val totalBytes = if (rawLength > 0L) rawLength else expectedSizeBytes
|
||||
var bytesDownloaded = 0L
|
||||
|
||||
responseBody.byteStream().use { input ->
|
||||
FileOutputStream(apkFile).use { output ->
|
||||
val buffer = ByteArray(8192)
|
||||
responseBody.byteStream().buffered(65536).use { input ->
|
||||
FileOutputStream(apkFile).buffered(65536).use { output ->
|
||||
val buffer = ByteArray(65536)
|
||||
var read: Int
|
||||
var lastPercent = -1
|
||||
var lastUpdateTime = 0L
|
||||
|
||||
while (input.read(buffer).also { read = it } != -1) {
|
||||
if (call.isCanceled()) return
|
||||
@@ -257,12 +349,14 @@ class UpdateManager(
|
||||
output.write(buffer, 0, read)
|
||||
bytesDownloaded += read
|
||||
|
||||
val percent = if (totalBytes > 0) {
|
||||
((bytesDownloaded * 100) / totalBytes).toInt()
|
||||
val percent = if (totalBytes > 0L) {
|
||||
((bytesDownloaded * 100) / totalBytes).toInt().coerceIn(0, 100)
|
||||
} else 0
|
||||
|
||||
if (percent != lastPercent) {
|
||||
val now = System.currentTimeMillis()
|
||||
if (percent != lastPercent || (now - lastUpdateTime >= 100)) {
|
||||
lastPercent = percent
|
||||
lastUpdateTime = now
|
||||
runOnMain {
|
||||
onProgress(
|
||||
DownloadState.Downloading(
|
||||
|
||||
@@ -9,21 +9,31 @@ import android.content.Intent
|
||||
import android.os.Build
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import android.os.VibrationEffect
|
||||
import android.os.Vibrator
|
||||
import android.os.VibratorManager
|
||||
import android.widget.RemoteViews
|
||||
import android.widget.Toast
|
||||
import com.expapp.trigger.MainActivity
|
||||
import com.expapp.trigger.R
|
||||
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.NodeStatus
|
||||
import com.expapp.trigger.network.TriggerAction
|
||||
import com.expapp.trigger.network.TriggerClient
|
||||
import com.expapp.trigger.worker.ActionTriggerWorker
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.Date
|
||||
import java.util.Locale
|
||||
import java.util.concurrent.Executors
|
||||
|
||||
/**
|
||||
* Self-contained Home Screen Widget for server control and monitoring.
|
||||
* Executes server triggers and status refreshes completely in the background
|
||||
* without opening the main application.
|
||||
*/
|
||||
class ServerWidgetProvider : AppWidgetProvider() {
|
||||
|
||||
companion object {
|
||||
@@ -49,6 +59,31 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
||||
context.sendBroadcast(intent)
|
||||
}
|
||||
}
|
||||
|
||||
fun updateStatus(context: Context, statusText: String, footerText: String? = null) {
|
||||
try {
|
||||
val appWidgetManager = AppWidgetManager.getInstance(context)
|
||||
val thisWidget = ComponentName(context, ServerWidgetProvider::class.java)
|
||||
val appWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
|
||||
if (appWidgetIds != null && appWidgetIds.isNotEmpty()) {
|
||||
for (id in appWidgetIds) {
|
||||
val views = RemoteViews(context.packageName, R.layout.widget_server_control)
|
||||
views.setTextViewText(R.id.widget_status_text, statusText)
|
||||
if (statusText == "SENDING..." || statusText == "CHECKING...") {
|
||||
views.setTextColor(R.id.widget_status_text, 0xFFF59E0B.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_gray)
|
||||
views.setInt(R.id.widget_status_chip, "setBackgroundResource", R.drawable.widget_chip_checking)
|
||||
}
|
||||
if (footerText != null) {
|
||||
views.setTextViewText(R.id.widget_footer_text, footerText)
|
||||
}
|
||||
appWidgetManager.partiallyUpdateAppWidget(id, views)
|
||||
}
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onUpdate(
|
||||
@@ -56,22 +91,36 @@ 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 in background
|
||||
if (device != null && device.statusUrl.isNotBlank()) {
|
||||
executor.execute {
|
||||
try {
|
||||
val status = TriggerClient().checkStatusSync(device)
|
||||
val appSettings = AppSettings(context)
|
||||
appSettings.setLastStatus(device.id, status.isOnline)
|
||||
mainHandler.post {
|
||||
try {
|
||||
renderWidget(context, appWidgetManager, appWidgetId, device, status)
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,71 +131,66 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
||||
ACTION_TRIGGER -> {
|
||||
val deviceId = intent.getStringExtra(EXTRA_DEVICE_ID) ?: return
|
||||
val actionName = intent.getStringExtra(EXTRA_ACTION) ?: return
|
||||
val action = try { TriggerAction.valueOf(actionName) } catch (e: Exception) { return }
|
||||
val action = try { TriggerAction.valueOf(actionName) } catch (_: Exception) { return }
|
||||
|
||||
val appSettings = AppSettings(context)
|
||||
if (appSettings.isBiometricEnabled) {
|
||||
// Biometric is enabled: open MainActivity with Trigger intent
|
||||
val launchIntent = Intent(context, MainActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
this.action = ACTION_TRIGGER
|
||||
if (appSettings.isWidgetBiometricEnabled && appSettings.isBiometricEnabled) {
|
||||
// Biometric is explicitly required for widget: launch transparent prompt over home screen
|
||||
val launchIntent = Intent(context, WidgetAuthActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_NO_ANIMATION
|
||||
putExtra(EXTRA_DEVICE_ID, deviceId)
|
||||
putExtra(EXTRA_ACTION, actionName)
|
||||
}
|
||||
context.startActivity(launchIntent)
|
||||
} else {
|
||||
// Biometric disabled: execute directly in background
|
||||
executor.execute {
|
||||
val repository = DeviceRepository(SharedPrefsStorage(context))
|
||||
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)
|
||||
}
|
||||
// Frictionless 1-tap trigger directly from home screen without opening the app
|
||||
val repository = DeviceRepository(SharedPrefsStorage(context))
|
||||
val device = repository.getDevices().find { it.id == deviceId }
|
||||
val deviceName = device?.name ?: "Server"
|
||||
val actionTitle = when (action) {
|
||||
TriggerAction.POWER_ON -> "Power On"
|
||||
TriggerAction.REBOOT -> "Reboot"
|
||||
TriggerAction.POWER_OFF -> "Shutdown"
|
||||
}
|
||||
|
||||
vibrate(context)
|
||||
Toast.makeText(context, "⚡ Sending $actionTitle signal to $deviceName...", Toast.LENGTH_SHORT).show()
|
||||
updateStatus(context, "SENDING...", "⚡ Dispatched $actionTitle • Verifying...")
|
||||
ActionTriggerWorker.enqueue(context, deviceId, action, "Widget")
|
||||
}
|
||||
}
|
||||
|
||||
ACTION_REFRESH -> {
|
||||
// Immediate visual feedback on home screen
|
||||
updateStatus(context, "CHECKING...", "🔄 Refreshing server status...")
|
||||
Toast.makeText(context, "Checking server status...", Toast.LENGTH_SHORT).show()
|
||||
vibrate(context)
|
||||
|
||||
executor.execute {
|
||||
val repository = DeviceRepository(SharedPrefsStorage(context))
|
||||
val device = repository.getDevices().firstOrNull()
|
||||
if (device != null) {
|
||||
val status = TriggerClient().checkStatusSync(device)
|
||||
val appSettings = AppSettings(context)
|
||||
appSettings.setLastStatus(device.id, status.isOnline)
|
||||
|
||||
val timeStr = SimpleDateFormat("HH:mm", Locale.getDefault()).format(Date())
|
||||
val footer = if (status.isOnline) {
|
||||
if (!status.uptime.isNullOrBlank()) "🟢 Up: ${status.uptime} • Checked $timeStr"
|
||||
else "🟢 Online • Checked $timeStr"
|
||||
} else {
|
||||
"🛑 Server is offline • Checked $timeStr"
|
||||
}
|
||||
|
||||
mainHandler.post {
|
||||
val appWidgetManager = AppWidgetManager.getInstance(context)
|
||||
val thisWidget = ComponentName(context, ServerWidgetProvider::class.java)
|
||||
val ids = appWidgetManager.getAppWidgetIds(thisWidget)
|
||||
for (id in ids) {
|
||||
renderWidget(context, appWidgetManager, id, device, status, "Updated just now")
|
||||
renderWidget(context, appWidgetManager, id, device, status, footer)
|
||||
}
|
||||
Toast.makeText(context, "Widget refreshed", Toast.LENGTH_SHORT).show()
|
||||
val toastMsg = if (status.isOnline) "🟢 ${device.name} is online" else "🛑 ${device.name} is offline"
|
||||
Toast.makeText(context, toastMsg, Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -162,92 +206,111 @@ 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.setTextColor(R.id.widget_status_text, 0xFFEF4444.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_red)
|
||||
views.setInt(R.id.widget_status_chip, "setBackgroundResource", R.drawable.widget_chip_offline)
|
||||
views.setTextViewText(R.id.widget_footer_text, "Tap icon to open app & add server")
|
||||
|
||||
val appIntent = Intent(context, MainActivity::class.java)
|
||||
val pendingApp = PendingIntent.getActivity(
|
||||
context, 0, appIntent,
|
||||
// Only icon opens app when no device configured
|
||||
val appIntent = Intent(context, MainActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
}
|
||||
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_app_icon_badge, pendingApp)
|
||||
appWidgetManager.updateAppWidget(appWidgetId, views)
|
||||
return
|
||||
}
|
||||
|
||||
views.setTextViewText(R.id.widget_device_name, device.name)
|
||||
views.setTextViewText(R.id.widget_node_name, "${device.node} • Server Control")
|
||||
|
||||
// Status chip display
|
||||
val timeStr = SimpleDateFormat("HH:mm", Locale.getDefault()).format(Date())
|
||||
if (status == null) {
|
||||
views.setTextViewText(R.id.widget_status_text, "CHECKING")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFF9CA3AF.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_gray)
|
||||
views.setInt(R.id.widget_status_chip, "setBackgroundResource", R.drawable.widget_chip_checking)
|
||||
} 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)
|
||||
views.setInt(R.id.widget_status_chip, "setBackgroundResource", R.drawable.widget_chip_online)
|
||||
} 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.setInt(R.id.widget_status_chip, "setBackgroundResource", R.drawable.widget_chip_offline)
|
||||
}
|
||||
|
||||
// Contextual Footer Text
|
||||
val defaultFooter = when {
|
||||
status == null -> "Checking server status..."
|
||||
status.isOnline -> if (!status.uptime.isNullOrBlank()) "🟢 Up: ${status.uptime} • Checked $timeStr" else "🟢 Online • Checked $timeStr"
|
||||
else -> "🛑 Offline • Tap Refresh to check"
|
||||
}
|
||||
views.setTextViewText(R.id.widget_footer_text, footerOverride ?: defaultFooter)
|
||||
|
||||
// Dedicated Refresh Broadcast Intent
|
||||
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_header_clickable, pendingApp)
|
||||
views.setOnClickPendingIntent(R.id.widget_root, pendingApp)
|
||||
|
||||
// Refresh button & Info row triggers Refresh (NOT app launch)
|
||||
views.setOnClickPendingIntent(R.id.widget_btn_refresh, pendingRefresh)
|
||||
views.setOnClickPendingIntent(R.id.widget_header_info, pendingRefresh)
|
||||
views.setOnClickPendingIntent(R.id.widget_footer_text, pendingRefresh)
|
||||
|
||||
// Explicit App Icon Badge Intent (Only this small terminal icon opens MainActivity if desired)
|
||||
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_app_icon_badge, pendingOpenApp)
|
||||
|
||||
// Power On click (1-tap background action)
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_power_on,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 2, device.id, TriggerAction.POWER_ON)
|
||||
)
|
||||
|
||||
// Reboot click (1-tap background action)
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_reboot,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 3, device.id, TriggerAction.REBOOT)
|
||||
)
|
||||
|
||||
// Power Off click (1-tap background action)
|
||||
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(
|
||||
@@ -268,4 +331,19 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||
)
|
||||
}
|
||||
|
||||
private fun vibrate(context: Context) {
|
||||
try {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||
val vibratorManager = context.getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as? VibratorManager
|
||||
vibratorManager?.defaultVibrator?.vibrate(
|
||||
VibrationEffect.createOneShot(40, VibrationEffect.DEFAULT_AMPLITUDE)
|
||||
)
|
||||
} else {
|
||||
@Suppress("DEPRECATION")
|
||||
val vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator
|
||||
vibrator?.vibrate(40)
|
||||
}
|
||||
} catch (_: Exception) {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,118 @@
|
||||
package com.expapp.trigger.widget
|
||||
|
||||
import android.graphics.Color
|
||||
import android.graphics.drawable.ColorDrawable
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import android.os.VibrationEffect
|
||||
import android.os.Vibrator
|
||||
import android.os.VibratorManager
|
||||
import android.widget.Toast
|
||||
import androidx.fragment.app.FragmentActivity
|
||||
import com.expapp.trigger.data.repository.DeviceRepository
|
||||
import com.expapp.trigger.data.repository.SharedPrefsStorage
|
||||
import com.expapp.trigger.network.TriggerAction
|
||||
import com.expapp.trigger.security.BiometricHelper
|
||||
import com.expapp.trigger.worker.ActionTriggerWorker
|
||||
|
||||
/**
|
||||
* Completely translucent activity that prompts for biometric verification directly
|
||||
* on top of the home screen / launcher without ever loading or revealing the main application.
|
||||
* Dismisses instantly and executes the action via guaranteed background worker.
|
||||
*/
|
||||
class WidgetAuthActivity : FragmentActivity() {
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
// Make window completely transparent & borderless
|
||||
window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
|
||||
window.setDimAmount(0f)
|
||||
|
||||
val deviceId = intent.getStringExtra(ServerWidgetProvider.EXTRA_DEVICE_ID)
|
||||
val actionName = intent.getStringExtra(ServerWidgetProvider.EXTRA_ACTION)
|
||||
|
||||
if (deviceId.isNullOrBlank() || actionName.isNullOrBlank()) {
|
||||
finishWithoutAnimation()
|
||||
return
|
||||
}
|
||||
|
||||
val action = try {
|
||||
TriggerAction.valueOf(actionName)
|
||||
} catch (_: Exception) {
|
||||
finishWithoutAnimation()
|
||||
return
|
||||
}
|
||||
|
||||
val repository = DeviceRepository(SharedPrefsStorage(applicationContext))
|
||||
val device = repository.getDevices().find { it.id == deviceId }
|
||||
if (device == null) {
|
||||
finishWithoutAnimation()
|
||||
return
|
||||
}
|
||||
|
||||
val actionTitle = when (action) {
|
||||
TriggerAction.POWER_ON -> "Power On"
|
||||
TriggerAction.REBOOT -> "Reboot"
|
||||
TriggerAction.POWER_OFF -> "Shutdown"
|
||||
}
|
||||
|
||||
if (BiometricHelper.isBiometricAvailable(this)) {
|
||||
BiometricHelper.authenticate(
|
||||
this,
|
||||
title = "Confirm $actionTitle",
|
||||
subtitle = "Authenticate to trigger ${device.name}"
|
||||
) { success, errorMsg ->
|
||||
if (success) {
|
||||
vibrateFeedback()
|
||||
Toast.makeText(this, "⚡ Sending $actionTitle signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
||||
ServerWidgetProvider.updateStatus(
|
||||
applicationContext,
|
||||
"SENDING...",
|
||||
"⚡ Dispatched $actionTitle • Verifying..."
|
||||
)
|
||||
ActionTriggerWorker.enqueue(applicationContext, device.id, action, "Widget")
|
||||
} else if (errorMsg != null) {
|
||||
Toast.makeText(this, "Trigger cancelled", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
finishWithoutAnimation()
|
||||
}
|
||||
} else {
|
||||
// Biometric hardware unavailable; dispatch directly
|
||||
vibrateFeedback()
|
||||
Toast.makeText(this, "⚡ Sending $actionTitle signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
||||
ServerWidgetProvider.updateStatus(
|
||||
applicationContext,
|
||||
"SENDING...",
|
||||
"⚡ Dispatched $actionTitle • Verifying..."
|
||||
)
|
||||
ActionTriggerWorker.enqueue(applicationContext, device.id, action, "Widget")
|
||||
finishWithoutAnimation()
|
||||
}
|
||||
}
|
||||
|
||||
private fun finishWithoutAnimation() {
|
||||
finish()
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
||||
overrideActivityTransition(OVERRIDE_TRANSITION_CLOSE, 0, 0)
|
||||
} else {
|
||||
@Suppress("DEPRECATION")
|
||||
overridePendingTransition(0, 0)
|
||||
}
|
||||
}
|
||||
|
||||
private fun vibrateFeedback() {
|
||||
try {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||
val vibratorManager = getSystemService(VIBRATOR_MANAGER_SERVICE) as? VibratorManager
|
||||
vibratorManager?.defaultVibrator?.vibrate(
|
||||
VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE)
|
||||
)
|
||||
} else {
|
||||
@Suppress("DEPRECATION")
|
||||
val vibrator = getSystemService(VIBRATOR_SERVICE) as? Vibrator
|
||||
vibrator?.vibrate(50)
|
||||
}
|
||||
} catch (_: Exception) {}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,210 @@
|
||||
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 = 30 // Up to 60 seconds (30 attempts * 2s) for instant notification
|
||||
var attempts = 0
|
||||
var consecutiveTargetMatches = 0
|
||||
|
||||
// Brief delay before first check to allow server to receive trigger
|
||||
delay(1500L)
|
||||
|
||||
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(2000L)
|
||||
continue
|
||||
}
|
||||
|
||||
when (action) {
|
||||
TriggerAction.POWER_ON -> {
|
||||
if (status.isOnline) {
|
||||
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) {
|
||||
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 -> {
|
||||
// No notification for reboot per user instructions
|
||||
if (attempts >= 4 && status.isOnline) {
|
||||
appSettings.setLastStatus(device.id, true)
|
||||
ServerWidgetProvider.updateAllWidgets(appContext)
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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()
|
||||
}
|
||||
}
|
||||
@@ -45,12 +45,16 @@ object NotificationHelper {
|
||||
id: Int,
|
||||
title: String,
|
||||
message: String,
|
||||
isSuccess: Boolean = true
|
||||
isSuccess: Boolean = true,
|
||||
extraAction: String? = null
|
||||
): Boolean {
|
||||
createNotificationChannel(context)
|
||||
|
||||
val intent = Intent(context, MainActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
if (extraAction != null) {
|
||||
putExtra("action_trigger", extraAction)
|
||||
}
|
||||
}
|
||||
val pendingIntent = PendingIntent.getActivity(
|
||||
context,
|
||||
@@ -81,6 +85,26 @@ object NotificationHelper {
|
||||
}
|
||||
}
|
||||
|
||||
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 = title,
|
||||
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 {
|
||||
return sendNotification(
|
||||
context = context,
|
||||
|
||||
@@ -91,37 +91,71 @@ 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.
|
||||
if (!status.isReachable) {
|
||||
continue
|
||||
}
|
||||
|
||||
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
|
||||
// Determine if notification is needed only when server actually transitions
|
||||
if (previousStatus != null && previousStatus != status.isOnline) {
|
||||
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 {
|
||||
"${device.name} is unreachable or offline."
|
||||
"${device.name} has powered off or is offline."
|
||||
},
|
||||
isSuccess = status.isOnline
|
||||
)
|
||||
} else if (previousStatus == null && !status.isOnline) {
|
||||
// Initial check revealed server is offline
|
||||
NotificationHelper.sendNotification(
|
||||
context = appContext,
|
||||
id = device.id.hashCode(),
|
||||
title = "⚠️ Server Offline",
|
||||
message = "${device.name} is currently unreachable or offline.",
|
||||
isSuccess = false
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Check for app updates in the background synchronously 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
|
||||
val result = updateManager.checkForUpdateSync(currentVersion)
|
||||
if (result is com.expapp.trigger.update.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 background check failure
|
||||
}
|
||||
|
||||
return Result.success()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#161619" />
|
||||
<solid android:color="#101013" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:color="#2b2b30" />
|
||||
<corners android:radius="18dp" />
|
||||
android:color="#24242a" />
|
||||
<corners android:radius="20dp" />
|
||||
</shape>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#2c1e0f" />
|
||||
<solid android:color="#281909" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:width="1.2dp"
|
||||
android:color="#f59e0b" />
|
||||
<corners android:radius="10dp" />
|
||||
<corners android:radius="11dp" />
|
||||
</shape>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#14291e" />
|
||||
<solid android:color="#0e261a" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:width="1.2dp"
|
||||
android:color="#22c55e" />
|
||||
<corners android:radius="10dp" />
|
||||
<corners android:radius="11dp" />
|
||||
</shape>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#2c1214" />
|
||||
<solid android:color="#2a1013" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:width="1.2dp"
|
||||
android:color="#ef4444" />
|
||||
<corners android:radius="10dp" />
|
||||
<corners android:radius="11dp" />
|
||||
</shape>
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#18181e" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:color="#2c2c36" />
|
||||
<corners android:radius="9dp" />
|
||||
</shape>
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#1a1a20" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:color="#363640" />
|
||||
<corners android:radius="12dp" />
|
||||
</shape>
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#2b1114" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:color="#ef4444" />
|
||||
<corners android:radius="12dp" />
|
||||
</shape>
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#122a1c" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:color="#22c55e" />
|
||||
<corners android:radius="12dp" />
|
||||
</shape>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 324 B |
Binary file not shown.
|
After Width: | Height: | Size: 314 B |
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#18181e" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:color="#282832" />
|
||||
<corners android:radius="8dp" />
|
||||
</shape>
|
||||
@@ -5,7 +5,7 @@
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/widget_bg"
|
||||
android:orientation="vertical"
|
||||
android:padding="12dp">
|
||||
android:padding="13dp">
|
||||
|
||||
<!-- Header Row -->
|
||||
<LinearLayout
|
||||
@@ -14,17 +14,27 @@
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="18dp"
|
||||
android:layout_height="18dp"
|
||||
android:src="@drawable/ic_terminal"
|
||||
android:contentDescription="Server" />
|
||||
<!-- App Launcher Icon Badge (Explicit App Launch only if user taps this badge) -->
|
||||
<FrameLayout
|
||||
android:id="@+id/widget_app_icon_badge"
|
||||
android:layout_width="32dp"
|
||||
android:layout_height="32dp"
|
||||
android:background="@drawable/widget_icon_badge">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/widget_ic_terminal"
|
||||
android:contentDescription="Server App" />
|
||||
</FrameLayout>
|
||||
|
||||
<!-- Device & Node Info (Tapping this refreshes status, does NOT open app) -->
|
||||
<LinearLayout
|
||||
android:id="@+id/widget_header_clickable"
|
||||
android:id="@+id/widget_header_info"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginStart="9dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical">
|
||||
@@ -47,59 +57,70 @@
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:text="debian"
|
||||
android:textColor="#71717a"
|
||||
android:textColor="#9ca3af"
|
||||
android:textSize="11sp" />
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Status Dot + Text -->
|
||||
<!-- Status Chip Badge -->
|
||||
<LinearLayout
|
||||
android:id="@+id/widget_status_chip"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/widget_chip_checking"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:paddingEnd="6dp">
|
||||
android:paddingStart="7dp"
|
||||
android:paddingTop="3dp"
|
||||
android:paddingEnd="7dp"
|
||||
android:paddingBottom="3dp">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/widget_status_dot"
|
||||
android:layout_width="8dp"
|
||||
android:layout_height="8dp"
|
||||
android:layout_width="6dp"
|
||||
android:layout_height="6dp"
|
||||
android:src="@drawable/widget_dot_gray"
|
||||
android:contentDescription="Status" />
|
||||
android:contentDescription="Status Dot" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/widget_status_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_marginStart="4dp"
|
||||
android:text="CHECKING"
|
||||
android:textColor="#71717a"
|
||||
android:textSize="11sp"
|
||||
android:textColor="#9ca3af"
|
||||
android:textSize="10sp"
|
||||
android:textStyle="bold" />
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Refresh Button -->
|
||||
<ImageView
|
||||
<!-- Refresh Button Container (Large 32x32dp touch target) -->
|
||||
<FrameLayout
|
||||
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:layout_width="32dp"
|
||||
android:layout_height="32dp"
|
||||
android:layout_marginStart="6dp"
|
||||
android:background="@drawable/widget_btn_refresh_bg">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/widget_ic_refresh"
|
||||
android:contentDescription="Refresh" />
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Spacer / Divider -->
|
||||
<View
|
||||
<!-- Sleek Horizontal Divider -->
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:background="#27272a" />
|
||||
android:layout_marginTop="9dp"
|
||||
android:layout_marginBottom="9dp"
|
||||
android:background="#222228" />
|
||||
|
||||
<!-- Action Buttons Row -->
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="38dp"
|
||||
android:layout_height="40dp"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
@@ -107,12 +128,12 @@
|
||||
android:id="@+id/widget_btn_power_on"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:layout_marginEnd="3dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/widget_btn_green"
|
||||
android:gravity="center"
|
||||
android:text="POWER ON"
|
||||
android:textColor="#22c55e"
|
||||
android:text="⚡ POWER ON"
|
||||
android:textColor="#4ade80"
|
||||
android:textSize="11sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
@@ -125,8 +146,8 @@
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/widget_btn_amber"
|
||||
android:gravity="center"
|
||||
android:text="REBOOT"
|
||||
android:textColor="#f59e0b"
|
||||
android:text="🔄 REBOOT"
|
||||
android:textColor="#fbbf24"
|
||||
android:textSize="11sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
@@ -134,12 +155,12 @@
|
||||
android:id="@+id/widget_btn_power_off"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginStart="3dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/widget_btn_red"
|
||||
android:gravity="center"
|
||||
android:text="OFF"
|
||||
android:textColor="#ef4444"
|
||||
android:text="🛑 OFF"
|
||||
android:textColor="#f87171"
|
||||
android:textSize="11sp"
|
||||
android:textStyle="bold" />
|
||||
</LinearLayout>
|
||||
@@ -149,9 +170,11 @@
|
||||
android:id="@+id/widget_footer_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="6dp"
|
||||
android:layout_marginTop="7dp"
|
||||
android:ellipsize="end"
|
||||
android:gravity="center"
|
||||
android:text="Tap header to open app • Tap action to trigger"
|
||||
android:textColor="#52525b"
|
||||
android:maxLines="1"
|
||||
android:text="Checking server status..."
|
||||
android:textColor="#71717a"
|
||||
android:textSize="10sp" />
|
||||
</LinearLayout>
|
||||
|
||||
@@ -3,4 +3,16 @@
|
||||
<item name="android:statusBarColor">#121212</item>
|
||||
<item name="android:navigationBarColor">#121212</item>
|
||||
</style>
|
||||
|
||||
<!-- Translucent invisible theme for widget biometric authentication dialog -->
|
||||
<style name="Theme.WidgetAuth" parent="android:Theme.Material.NoActionBar">
|
||||
<item name="android:windowIsTranslucent">true</item>
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
<item name="android:windowIsFloating">false</item>
|
||||
<item name="android:backgroundDimEnabled">false</item>
|
||||
<item name="android:colorBackgroundCacheHint">@null</item>
|
||||
<item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -37,6 +37,7 @@ class AppSettingsTest {
|
||||
fun defaultValues_areTrue() {
|
||||
assertTrue(settings.isBiometricEnabled)
|
||||
assertTrue(settings.isBackgroundMonitoringEnabled)
|
||||
assertFalse(settings.isWidgetBiometricEnabled)
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -46,6 +47,9 @@ class AppSettingsTest {
|
||||
|
||||
settings.isBackgroundMonitoringEnabled = false
|
||||
assertFalse(settings.isBackgroundMonitoringEnabled)
|
||||
|
||||
settings.isWidgetBiometricEnabled = true
|
||||
assertTrue(settings.isWidgetBiometricEnabled)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user