Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
61e2b2445b | ||
|
|
2f38ea7dcc | ||
|
|
bba5caf79d | ||
|
|
d8eaceb314 | ||
|
|
256cc6cfc8 | ||
|
|
e1bcfa21f8 | ||
|
|
d16b87143d | ||
|
|
27b632bcaa | ||
|
|
0bcca1fbf4 | ||
|
|
898b2468c5 |
@@ -11,8 +11,8 @@ android {
|
|||||||
applicationId = "com.expapp.trigger"
|
applicationId = "com.expapp.trigger"
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 5
|
versionCode = 15
|
||||||
versionName = "1.1.1"
|
versionName = "1.2.1"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables {
|
vectorDrawables {
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ import com.expapp.trigger.ui.screens.MainScreen
|
|||||||
import com.expapp.trigger.ui.theme.DarkBackground
|
import com.expapp.trigger.ui.theme.DarkBackground
|
||||||
import com.expapp.trigger.ui.theme.ExpAppTheme
|
import com.expapp.trigger.ui.theme.ExpAppTheme
|
||||||
import com.expapp.trigger.widget.ServerWidgetProvider
|
import com.expapp.trigger.widget.ServerWidgetProvider
|
||||||
|
import com.expapp.trigger.worker.ActionTriggerWorker
|
||||||
import com.expapp.trigger.worker.NotificationHelper
|
import com.expapp.trigger.worker.NotificationHelper
|
||||||
import com.expapp.trigger.worker.ServerMonitorWorker
|
import com.expapp.trigger.worker.ServerMonitorWorker
|
||||||
|
|
||||||
@@ -91,6 +92,25 @@ class MainActivity : FragmentActivity() {
|
|||||||
enableEdgeToEdge()
|
enableEdgeToEdge()
|
||||||
|
|
||||||
repository = DeviceRepository(SharedPrefsStorage(applicationContext))
|
repository = DeviceRepository(SharedPrefsStorage(applicationContext))
|
||||||
|
val settingsPrefs = getSharedPreferences("app_settings_prefs", Context.MODE_PRIVATE)
|
||||||
|
val hasSeeded = settingsPrefs.getBoolean("has_seeded_default_device", false)
|
||||||
|
if (!hasSeeded) {
|
||||||
|
settingsPrefs.edit().putBoolean("has_seeded_default_device", true).apply()
|
||||||
|
if (repository.getDevices().isEmpty()) {
|
||||||
|
val defaultDevice = DeviceConfig(
|
||||||
|
id = "2dc98ae9-9f71-4f29-95a6-a59ac94d7bf6",
|
||||||
|
name = "Server",
|
||||||
|
node = "debian",
|
||||||
|
powerOffUrl = "https://cosmos.linuxguy.space/poweroff?node=debian",
|
||||||
|
powerOnUrl = "https://trigger.macrodroid.com/87f2f62c-09ee-43cb-8796-fd1a6465754b/wakeserver",
|
||||||
|
r2Url = "https://bucket.linuxguy.space/home-server-app/endpoints.json",
|
||||||
|
rebootUrl = "https://cosmos.linuxguy.space/reboot?node=debian",
|
||||||
|
secretKey = "Carbon@12",
|
||||||
|
statusUrl = "https://cosmos.linuxguy.space/status?node=debian"
|
||||||
|
)
|
||||||
|
repository.addDevice(defaultDevice)
|
||||||
|
}
|
||||||
|
}
|
||||||
triggerClient = TriggerClient()
|
triggerClient = TriggerClient()
|
||||||
appSettings = AppSettings(applicationContext)
|
appSettings = AppSettings(applicationContext)
|
||||||
historyRepository = TriggerHistoryRepository(applicationContext)
|
historyRepository = TriggerHistoryRepository(applicationContext)
|
||||||
@@ -246,27 +266,7 @@ class MainActivity : FragmentActivity() {
|
|||||||
val onAuthorized = {
|
val onAuthorized = {
|
||||||
vibrateFeedback(true)
|
vibrateFeedback(true)
|
||||||
Toast.makeText(this, "Sending $actionName signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
Toast.makeText(this, "Sending $actionName signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
||||||
triggerClient.sendTrigger(device, action) { response ->
|
ActionTriggerWorker.enqueue(this, device.id, action, source)
|
||||||
val msg = if (response.isSuccess) {
|
|
||||||
"$actionName signal sent successfully"
|
|
||||||
} else {
|
|
||||||
"Failed: ${response.message.take(50)}"
|
|
||||||
}
|
|
||||||
Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
|
|
||||||
historyRepository.addLog(
|
|
||||||
TriggerLog(
|
|
||||||
deviceId = device.id,
|
|
||||||
deviceName = device.name,
|
|
||||||
node = device.node,
|
|
||||||
action = action,
|
|
||||||
isSuccess = response.isSuccess,
|
|
||||||
statusCode = response.statusCode,
|
|
||||||
message = response.message,
|
|
||||||
source = source
|
|
||||||
)
|
|
||||||
)
|
|
||||||
ServerWidgetProvider.updateAllWidgets(this)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(this)) {
|
if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(this)) {
|
||||||
|
|||||||
@@ -10,8 +10,16 @@ class AppSettings(private val storage: KeyValueStorage) {
|
|||||||
private const val KEY_BIOMETRIC_ENABLED = "key_biometric_enabled"
|
private const val KEY_BIOMETRIC_ENABLED = "key_biometric_enabled"
|
||||||
private const val KEY_BG_MONITOR_ENABLED = "key_bg_monitor_enabled"
|
private const val KEY_BG_MONITOR_ENABLED = "key_bg_monitor_enabled"
|
||||||
private const val KEY_LAST_STATUS_PREFIX = "last_status_"
|
private const val KEY_LAST_STATUS_PREFIX = "last_status_"
|
||||||
|
private const val KEY_LAST_NOTIFIED_VERSION = "key_last_notified_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var lastNotifiedUpdateVersion: String?
|
||||||
|
get() = storage.getString(KEY_LAST_NOTIFIED_VERSION, null)
|
||||||
|
set(value) {
|
||||||
|
if (value != null) storage.putString(KEY_LAST_NOTIFIED_VERSION, value)
|
||||||
|
else storage.remove(KEY_LAST_NOTIFIED_VERSION)
|
||||||
|
}
|
||||||
|
|
||||||
var isBiometricEnabled: Boolean
|
var isBiometricEnabled: Boolean
|
||||||
get() = storage.getBoolean(KEY_BIOMETRIC_ENABLED, true)
|
get() = storage.getBoolean(KEY_BIOMETRIC_ENABLED, true)
|
||||||
set(value) = storage.putBoolean(KEY_BIOMETRIC_ENABLED, value)
|
set(value) = storage.putBoolean(KEY_BIOMETRIC_ENABLED, value)
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ class TriggerClient(
|
|||||||
val baseStatusUrl = device.statusUrl.trim()
|
val baseStatusUrl = device.statusUrl.trim()
|
||||||
if (baseStatusUrl.isBlank()) {
|
if (baseStatusUrl.isBlank()) {
|
||||||
runOnMain {
|
runOnMain {
|
||||||
callback(NodeStatus(isOnline = false, statusText = "NO STATUS URL"))
|
callback(NodeStatus(isOnline = false, statusText = "NO STATUS URL", isReachable = false))
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -190,7 +190,7 @@ class TriggerClient(
|
|||||||
Request.Builder().url(baseStatusUrl).get().build()
|
Request.Builder().url(baseStatusUrl).get().build()
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
runOnMain {
|
runOnMain {
|
||||||
callback(NodeStatus(isOnline = false, statusText = "INVALID URL"))
|
callback(NodeStatus(isOnline = false, statusText = "INVALID URL", isReachable = false))
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -198,14 +198,14 @@ class TriggerClient(
|
|||||||
client.newCall(request).enqueue(object : Callback {
|
client.newCall(request).enqueue(object : Callback {
|
||||||
override fun onFailure(call: Call, e: IOException) {
|
override fun onFailure(call: Call, e: IOException) {
|
||||||
runOnMain {
|
runOnMain {
|
||||||
callback(NodeStatus(isOnline = false, statusText = "OFFLINE"))
|
callback(NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onResponse(call: Call, response: Response) {
|
override fun onResponse(call: Call, response: Response) {
|
||||||
val nodeStatus = response.use {
|
val nodeStatus = response.use {
|
||||||
val body = it.body?.string().orEmpty().trim()
|
val body = it.body?.string().orEmpty().trim()
|
||||||
parseNodeStatus(body, it.isSuccessful)
|
parseNodeStatus(body, it.isSuccessful, device.node)
|
||||||
}
|
}
|
||||||
runOnMain { callback(nodeStatus) }
|
runOnMain { callback(nodeStatus) }
|
||||||
}
|
}
|
||||||
@@ -215,7 +215,7 @@ class TriggerClient(
|
|||||||
fun checkStatusSync(device: DeviceConfig): NodeStatus {
|
fun checkStatusSync(device: DeviceConfig): NodeStatus {
|
||||||
val baseStatusUrl = device.statusUrl.trim()
|
val baseStatusUrl = device.statusUrl.trim()
|
||||||
if (baseStatusUrl.isBlank()) {
|
if (baseStatusUrl.isBlank()) {
|
||||||
return NodeStatus(isOnline = false, statusText = "NO STATUS URL")
|
return NodeStatus(isOnline = false, statusText = "NO STATUS URL", isReachable = false)
|
||||||
}
|
}
|
||||||
|
|
||||||
return try {
|
return try {
|
||||||
@@ -223,22 +223,50 @@ class TriggerClient(
|
|||||||
val response = client.newCall(request).execute()
|
val response = client.newCall(request).execute()
|
||||||
response.use {
|
response.use {
|
||||||
val body = it.body?.string().orEmpty().trim()
|
val body = it.body?.string().orEmpty().trim()
|
||||||
parseNodeStatus(body, it.isSuccessful)
|
parseNodeStatus(body, it.isSuccessful, device.node)
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
NodeStatus(isOnline = false, statusText = "OFFLINE")
|
NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun parseNodeStatus(body: String, isHttpSuccess: Boolean): NodeStatus {
|
private fun parseNodeStatus(body: String, isHttpSuccess: Boolean, targetNode: String = ""): NodeStatus {
|
||||||
if (body.startsWith("{")) {
|
if (body.startsWith("{")) {
|
||||||
return try {
|
return try {
|
||||||
val json = com.google.gson.JsonParser.parseString(body).asJsonObject
|
val rootJson = com.google.gson.JsonParser.parseString(body).asJsonObject
|
||||||
|
|
||||||
|
// Support both single-node JSON ({"node":"debian", "online":true, ...})
|
||||||
|
// and multi-node dashboard JSON ({"service":"Tailscale Sentinel", "nodes":{"debian":{...}, ...}})
|
||||||
|
val json = if (rootJson.has("nodes") && rootJson.get("nodes").isJsonObject) {
|
||||||
|
val nodesObj = rootJson.getAsJsonObject("nodes")
|
||||||
|
var matchedObj: com.google.gson.JsonObject? = null
|
||||||
|
if (targetNode.isNotBlank()) {
|
||||||
|
for (key in nodesObj.keySet()) {
|
||||||
|
if (key.equals(targetNode, ignoreCase = true)) {
|
||||||
|
matchedObj = nodesObj.getAsJsonObject(key)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (matchedObj != null) {
|
||||||
|
matchedObj
|
||||||
|
} else if (targetNode.isNotBlank()) {
|
||||||
|
// Node explicitly configured but missing from sentinel nodes map
|
||||||
|
return NodeStatus(isOnline = false, statusText = "UNKNOWN NODE", isReachable = true)
|
||||||
|
} else if (nodesObj.size() > 0) {
|
||||||
|
nodesObj.entrySet().first().value.asJsonObject
|
||||||
|
} else {
|
||||||
|
rootJson
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
rootJson
|
||||||
|
}
|
||||||
|
|
||||||
val online = when {
|
val online = when {
|
||||||
json.has("online") && json.get("online").isJsonPrimitive && json.get("online").asJsonPrimitive.isBoolean ->
|
json.has("online") && json.get("online").isJsonPrimitive && json.get("online").asJsonPrimitive.isBoolean ->
|
||||||
json.get("online").asBoolean
|
json.get("online").asBoolean
|
||||||
json.has("status") && json.get("status").isJsonPrimitive ->
|
json.has("status") && json.get("status").isJsonPrimitive ->
|
||||||
json.get("status").asString.equals("online", ignoreCase = true)
|
json.get("status").asString.trim().equals("online", ignoreCase = true)
|
||||||
else -> false
|
else -> false
|
||||||
}
|
}
|
||||||
val ip = if (json.has("ip") && !json.get("ip").isJsonNull) json.get("ip").asString else null
|
val ip = if (json.has("ip") && !json.get("ip").isJsonNull) json.get("ip").asString else null
|
||||||
@@ -264,16 +292,17 @@ class TriggerClient(
|
|||||||
uptime = uptime,
|
uptime = uptime,
|
||||||
onSinceIst = onSinceIst,
|
onSinceIst = onSinceIst,
|
||||||
lastActiveAgo = lastActiveAgo,
|
lastActiveAgo = lastActiveAgo,
|
||||||
lastActiveIst = lastActiveIst
|
lastActiveIst = lastActiveIst,
|
||||||
|
isReachable = true
|
||||||
)
|
)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
NodeStatus(isOnline = false, statusText = "ERROR")
|
NodeStatus(isOnline = false, statusText = "ERROR", isReachable = isHttpSuccess)
|
||||||
}
|
}
|
||||||
} else if (isHttpSuccess) {
|
} else if (isHttpSuccess) {
|
||||||
val isOnline = body.equals("ONLINE", ignoreCase = true)
|
val isOnline = body.trim().equals("ONLINE", ignoreCase = true)
|
||||||
return NodeStatus(isOnline = isOnline, statusText = if (isOnline) "ONLINE" else "OFFLINE")
|
return NodeStatus(isOnline = isOnline, statusText = if (isOnline) "ONLINE" else "OFFLINE", isReachable = true)
|
||||||
} else {
|
} else {
|
||||||
return NodeStatus(isOnline = false, statusText = "OFFLINE")
|
return NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,5 +20,6 @@ data class NodeStatus(
|
|||||||
val onSinceIst: String? = null,
|
val onSinceIst: String? = null,
|
||||||
val lastActiveAgo: String? = null,
|
val lastActiveAgo: String? = null,
|
||||||
val lastActiveIst: String? = null,
|
val lastActiveIst: String? = null,
|
||||||
val timestamp: Long = System.currentTimeMillis()
|
val timestamp: Long = System.currentTimeMillis(),
|
||||||
|
val isReachable: Boolean = true
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ fun UpdateDialog(
|
|||||||
horizontalArrangement = Arrangement.SpaceBetween
|
horizontalArrangement = Arrangement.SpaceBetween
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = "Downloading update…",
|
text = if (downloadState.bytesDownloaded == 0L) "Connecting to server…" else "Downloading update…",
|
||||||
fontSize = 12.sp,
|
fontSize = 12.sp,
|
||||||
color = TextSecondary
|
color = TextSecondary
|
||||||
)
|
)
|
||||||
@@ -220,15 +220,26 @@ fun UpdateDialog(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
Spacer(modifier = Modifier.height(8.dp))
|
Spacer(modifier = Modifier.height(8.dp))
|
||||||
LinearProgressIndicator(
|
if (downloadState.bytesDownloaded == 0L && downloadState.progressPercent == 0) {
|
||||||
progress = { downloadState.progressPercent / 100f },
|
LinearProgressIndicator(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.height(8.dp)
|
.height(8.dp)
|
||||||
.clip(RoundedCornerShape(4.dp)),
|
.clip(RoundedCornerShape(4.dp)),
|
||||||
color = GreenVibrant,
|
color = GreenVibrant,
|
||||||
trackColor = GreenVibrant.copy(alpha = 0.15f)
|
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) {
|
if (downloadState.totalBytes > 0) {
|
||||||
Spacer(modifier = Modifier.height(6.dp))
|
Spacer(modifier = Modifier.height(6.dp))
|
||||||
val downloadedMb = String.format("%.1f", downloadState.bytesDownloaded / (1024.0 * 1024.0))
|
val downloadedMb = String.format("%.1f", downloadState.bytesDownloaded / (1024.0 * 1024.0))
|
||||||
@@ -238,6 +249,14 @@ fun UpdateDialog(
|
|||||||
fontSize = 11.sp,
|
fontSize = 11.sp,
|
||||||
color = TextMuted
|
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.CircleShape
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.CloudSync
|
import androidx.compose.material.icons.filled.MoreVert
|
||||||
|
import androidx.compose.material3.DropdownMenu
|
||||||
|
import androidx.compose.material3.DropdownMenuItem
|
||||||
import androidx.compose.material.icons.filled.DeleteOutline
|
import androidx.compose.material.icons.filled.DeleteOutline
|
||||||
import androidx.compose.material.icons.filled.Edit
|
import androidx.compose.material.icons.filled.Edit
|
||||||
import androidx.compose.material.icons.filled.PowerOff
|
import androidx.compose.material.icons.filled.PowerOff
|
||||||
import androidx.compose.material.icons.filled.PowerSettingsNew
|
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.RestartAlt
|
||||||
import androidx.compose.material.icons.filled.Schedule
|
import androidx.compose.material.icons.filled.Schedule
|
||||||
import androidx.compose.material.icons.filled.Terminal
|
import androidx.compose.material.icons.filled.Terminal
|
||||||
@@ -68,6 +69,7 @@ import androidx.compose.ui.text.font.FontFamily
|
|||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
||||||
import androidx.compose.ui.text.input.VisualTransformation
|
import androidx.compose.ui.text.input.VisualTransformation
|
||||||
|
import androidx.compose.ui.text.style.TextOverflow
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
import com.expapp.trigger.data.model.DeviceConfig
|
import com.expapp.trigger.data.model.DeviceConfig
|
||||||
@@ -118,6 +120,7 @@ fun DevicePage(
|
|||||||
var pendingAction by remember { mutableStateOf<TriggerAction?>(null) }
|
var pendingAction by remember { mutableStateOf<TriggerAction?>(null) }
|
||||||
var showDeleteConfirm by remember { mutableStateOf(false) }
|
var showDeleteConfirm by remember { mutableStateOf(false) }
|
||||||
var showEditDialog by remember { mutableStateOf(false) }
|
var showEditDialog by remember { mutableStateOf(false) }
|
||||||
|
var showMenu by remember { mutableStateOf(false) }
|
||||||
|
|
||||||
if (showEditDialog) {
|
if (showEditDialog) {
|
||||||
var editName by remember { mutableStateOf(device.name) }
|
var editName by remember { mutableStateOf(device.name) }
|
||||||
@@ -258,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
|
// Pulse for online dot
|
||||||
|
val infiniteTransition = rememberInfiniteTransition(label = "pulse_transition")
|
||||||
val pulseScale by infiniteTransition.animateFloat(
|
val pulseScale by infiniteTransition.animateFloat(
|
||||||
initialValue = 0.8f, targetValue = 1.5f,
|
initialValue = 0.8f, targetValue = 1.5f,
|
||||||
animationSpec = infiniteRepeatable(
|
animationSpec = infiniteRepeatable(
|
||||||
@@ -317,163 +313,139 @@ fun DevicePage(
|
|||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.padding(horizontal = 20.dp, vertical = 18.dp)
|
.padding(horizontal = 16.dp, vertical = 14.dp)
|
||||||
) {
|
) {
|
||||||
// Title row
|
// Top row: Server Icon + Name / Node (flexible) + Header Actions
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier.fillMaxWidth(),
|
modifier = Modifier.fillMaxWidth(),
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically
|
||||||
horizontalArrangement = Arrangement.SpaceBetween
|
|
||||||
) {
|
) {
|
||||||
Row(
|
Box(
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
modifier = Modifier
|
||||||
modifier = Modifier.weight(1f)
|
.size(42.dp)
|
||||||
) {
|
.clip(RoundedCornerShape(12.dp))
|
||||||
Box(
|
.background(
|
||||||
modifier = Modifier
|
Brush.radialGradient(
|
||||||
.size(48.dp)
|
listOf(
|
||||||
.clip(RoundedCornerShape(14.dp))
|
when (isOnline) {
|
||||||
.background(
|
true -> GreenVibrant.copy(alpha = 0.18f)
|
||||||
Brush.radialGradient(
|
false -> RedVibrant.copy(alpha = 0.12f)
|
||||||
listOf(
|
null -> BorderDefault.copy(alpha = 0.1f)
|
||||||
when (isOnline) {
|
},
|
||||||
true -> GreenVibrant.copy(alpha = 0.18f)
|
Color.Transparent
|
||||||
false -> RedVibrant.copy(alpha = 0.12f)
|
|
||||||
null -> BorderDefault.copy(alpha = 0.1f)
|
|
||||||
},
|
|
||||||
Color.Transparent
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.border(
|
|
||||||
1.dp,
|
|
||||||
when (isOnline) {
|
|
||||||
true -> GreenVibrant.copy(alpha = 0.35f)
|
|
||||||
false -> RedVibrant.copy(alpha = 0.25f)
|
|
||||||
null -> BorderSubtle
|
|
||||||
},
|
|
||||||
RoundedCornerShape(14.dp)
|
|
||||||
),
|
|
||||||
contentAlignment = Alignment.Center
|
|
||||||
) {
|
|
||||||
Icon(
|
|
||||||
imageVector = Icons.Default.Terminal,
|
|
||||||
contentDescription = null,
|
|
||||||
tint = when (isOnline) {
|
|
||||||
true -> GreenVibrant
|
|
||||||
false -> RedVibrant.copy(alpha = 0.6f)
|
|
||||||
null -> TextSecondary
|
|
||||||
},
|
|
||||||
modifier = Modifier.size(22.dp)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Spacer(modifier = Modifier.width(14.dp))
|
|
||||||
|
|
||||||
Column {
|
|
||||||
Text(
|
|
||||||
text = device.name,
|
|
||||||
fontSize = 20.sp,
|
|
||||||
fontWeight = FontWeight.Bold,
|
|
||||||
color = TextPrimary,
|
|
||||||
maxLines = 1
|
|
||||||
)
|
|
||||||
Text(
|
|
||||||
text = device.node,
|
|
||||||
fontSize = 11.sp,
|
|
||||||
color = TextMuted,
|
|
||||||
fontFamily = FontFamily.Monospace,
|
|
||||||
letterSpacing = 0.5.sp
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Re-fetch R2 JSON config button
|
|
||||||
IconButton(
|
|
||||||
onClick = onSyncConfig,
|
|
||||||
modifier = Modifier
|
|
||||||
.size(36.dp)
|
|
||||||
.clip(RoundedCornerShape(10.dp))
|
|
||||||
.background(AmberVibrant.copy(alpha = 0.08f))
|
|
||||||
.border(1.dp, AmberVibrant.copy(alpha = 0.2f), RoundedCornerShape(10.dp))
|
|
||||||
) {
|
|
||||||
Icon(
|
|
||||||
imageVector = Icons.Default.CloudSync,
|
|
||||||
contentDescription = "Re-fetch R2 JSON",
|
|
||||||
tint = AmberVibrant,
|
|
||||||
modifier = Modifier.size(18.dp)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Spacer(modifier = Modifier.width(6.dp))
|
|
||||||
|
|
||||||
// Edit device button
|
|
||||||
IconButton(
|
|
||||||
onClick = { showEditDialog = true },
|
|
||||||
modifier = Modifier
|
|
||||||
.size(36.dp)
|
|
||||||
.clip(RoundedCornerShape(10.dp))
|
|
||||||
.background(BorderSubtle.copy(alpha = 0.3f))
|
|
||||||
.border(1.dp, BorderSubtle, RoundedCornerShape(10.dp))
|
|
||||||
) {
|
|
||||||
Icon(
|
|
||||||
imageVector = Icons.Default.Edit,
|
|
||||||
contentDescription = "Edit device",
|
|
||||||
tint = TextSecondary,
|
|
||||||
modifier = Modifier.size(18.dp)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Spacer(modifier = Modifier.width(6.dp))
|
|
||||||
|
|
||||||
// Refresh button (spins while checking)
|
|
||||||
IconButton(
|
|
||||||
onClick = { if (!isCheckingStatus) onRefreshStatus() },
|
|
||||||
modifier = Modifier
|
|
||||||
.size(36.dp)
|
|
||||||
.clip(RoundedCornerShape(10.dp))
|
|
||||||
.background(
|
|
||||||
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.12f)
|
|
||||||
else BorderSubtle.copy(alpha = 0.3f)
|
|
||||||
)
|
)
|
||||||
.border(
|
.border(
|
||||||
1.dp,
|
1.dp,
|
||||||
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.3f)
|
when (isOnline) {
|
||||||
else BorderSubtle,
|
true -> GreenVibrant.copy(alpha = 0.35f)
|
||||||
RoundedCornerShape(10.dp)
|
false -> RedVibrant.copy(alpha = 0.25f)
|
||||||
)
|
null -> BorderSubtle
|
||||||
|
},
|
||||||
|
RoundedCornerShape(12.dp)
|
||||||
|
),
|
||||||
|
contentAlignment = Alignment.Center
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = Icons.Default.Refresh,
|
imageVector = Icons.Default.Terminal,
|
||||||
contentDescription = "Refresh status",
|
contentDescription = null,
|
||||||
tint = if (isCheckingStatus) GreenVibrant else TextMuted,
|
tint = when (isOnline) {
|
||||||
modifier = Modifier
|
true -> GreenVibrant
|
||||||
.size(18.dp)
|
false -> RedVibrant.copy(alpha = 0.6f)
|
||||||
.rotate(if (isCheckingStatus) spinAngle else 0f)
|
null -> TextSecondary
|
||||||
|
},
|
||||||
|
modifier = Modifier.size(20.dp)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
Spacer(modifier = Modifier.width(8.dp))
|
Spacer(modifier = Modifier.width(10.dp))
|
||||||
|
|
||||||
// Delete button
|
Column(
|
||||||
IconButton(
|
|
||||||
onClick = { showDeleteConfirm = true },
|
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.size(36.dp)
|
.weight(1f, fill = true)
|
||||||
.clip(RoundedCornerShape(10.dp))
|
.padding(end = 8.dp)
|
||||||
.background(RedVibrant.copy(alpha = 0.08f))
|
|
||||||
.border(1.dp, RedVibrant.copy(alpha = 0.15f), RoundedCornerShape(10.dp))
|
|
||||||
) {
|
) {
|
||||||
Icon(
|
Text(
|
||||||
imageVector = Icons.Default.DeleteOutline,
|
text = device.name,
|
||||||
contentDescription = "Remove device",
|
fontSize = 17.sp,
|
||||||
tint = RedVibrant.copy(alpha = 0.7f),
|
fontWeight = FontWeight.Bold,
|
||||||
modifier = Modifier.size(18.dp)
|
color = TextPrimary,
|
||||||
|
maxLines = 1,
|
||||||
|
overflow = TextOverflow.Ellipsis
|
||||||
)
|
)
|
||||||
|
Spacer(modifier = Modifier.height(2.dp))
|
||||||
|
Text(
|
||||||
|
text = device.node,
|
||||||
|
fontSize = 11.sp,
|
||||||
|
color = TextMuted,
|
||||||
|
fontFamily = FontFamily.Monospace,
|
||||||
|
letterSpacing = 0.5.sp,
|
||||||
|
maxLines = 1,
|
||||||
|
overflow = TextOverflow.Ellipsis
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Device options menu (Edit / Delete)
|
||||||
|
Box {
|
||||||
|
IconButton(
|
||||||
|
onClick = { showMenu = true },
|
||||||
|
modifier = Modifier
|
||||||
|
.size(34.dp)
|
||||||
|
.clip(RoundedCornerShape(9.dp))
|
||||||
|
.background(BorderSubtle.copy(alpha = 0.25f))
|
||||||
|
.border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
imageVector = Icons.Default.MoreVert,
|
||||||
|
contentDescription = "Device options",
|
||||||
|
tint = TextSecondary,
|
||||||
|
modifier = Modifier.size(18.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
DropdownMenu(
|
||||||
|
expanded = showMenu,
|
||||||
|
onDismissRequest = { showMenu = false },
|
||||||
|
modifier = Modifier
|
||||||
|
.background(BgElevated)
|
||||||
|
.border(1.dp, BorderSubtle, RoundedCornerShape(12.dp))
|
||||||
|
) {
|
||||||
|
DropdownMenuItem(
|
||||||
|
text = { Text("Edit Device", color = TextPrimary) },
|
||||||
|
leadingIcon = {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.Edit,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = TextSecondary,
|
||||||
|
modifier = Modifier.size(18.dp)
|
||||||
|
)
|
||||||
|
},
|
||||||
|
onClick = {
|
||||||
|
showMenu = false
|
||||||
|
showEditDialog = true
|
||||||
|
}
|
||||||
|
)
|
||||||
|
DropdownMenuItem(
|
||||||
|
text = { Text("Remove Device", color = RedVibrant) },
|
||||||
|
leadingIcon = {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.DeleteOutline,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = RedVibrant,
|
||||||
|
modifier = Modifier.size(18.dp)
|
||||||
|
)
|
||||||
|
},
|
||||||
|
onClick = {
|
||||||
|
showMenu = false
|
||||||
|
showDeleteConfirm = true
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Spacer(modifier = Modifier.height(16.dp))
|
Spacer(modifier = Modifier.height(14.dp))
|
||||||
|
|
||||||
// ── STATUS ROW ────────────────────────────────────────────
|
// ── STATUS ROW ────────────────────────────────────────────
|
||||||
Row(
|
Row(
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ import com.expapp.trigger.update.ReleaseInfo
|
|||||||
import com.expapp.trigger.update.UpdateCheckResult
|
import com.expapp.trigger.update.UpdateCheckResult
|
||||||
import com.expapp.trigger.update.UpdateManager
|
import com.expapp.trigger.update.UpdateManager
|
||||||
import com.expapp.trigger.widget.ServerWidgetProvider
|
import com.expapp.trigger.widget.ServerWidgetProvider
|
||||||
|
import com.expapp.trigger.worker.ActionTriggerWorker
|
||||||
import com.expapp.trigger.worker.ServerMonitorWorker
|
import com.expapp.trigger.worker.ServerMonitorWorker
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.isActive
|
import kotlinx.coroutines.isActive
|
||||||
@@ -165,8 +166,10 @@ fun MainScreen(
|
|||||||
triggerClient.checkStatus(device) { status ->
|
triggerClient.checkStatus(device) { status ->
|
||||||
checkingStatusMap[device.id] = false
|
checkingStatusMap[device.id] = false
|
||||||
nodeStatuses[device.id] = status
|
nodeStatuses[device.id] = status
|
||||||
// Keep background monitoring synced with the latest live status
|
// Only update stored status when server is actually reached
|
||||||
appSettings.setLastStatus(device.id, status.isOnline)
|
if (status.isReachable) {
|
||||||
|
appSettings.setLastStatus(device.id, status.isOnline)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -199,25 +202,32 @@ fun MainScreen(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun checkAppUpdate(showToast: Boolean = false) {
|
fun checkAppUpdate(isManual: Boolean = false) {
|
||||||
isCheckingUpdate = true
|
isCheckingUpdate = true
|
||||||
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
|
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
|
||||||
isCheckingUpdate = false
|
isCheckingUpdate = false
|
||||||
when (result) {
|
when (result) {
|
||||||
is UpdateCheckResult.UpdateAvailable -> {
|
is UpdateCheckResult.UpdateAvailable -> {
|
||||||
availableUpdate = result.info
|
availableUpdate = result.info
|
||||||
if (showToast || dismissedVersion != result.info.versionName) {
|
showUpdateDialog = true
|
||||||
showUpdateDialog = true
|
val newVer = result.info.versionName
|
||||||
|
if (appSettings.lastNotifiedUpdateVersion != newVer) {
|
||||||
|
appSettings.lastNotifiedUpdateVersion = newVer
|
||||||
|
com.expapp.trigger.worker.NotificationHelper.sendUpdateAvailableNotification(context, newVer)
|
||||||
|
}
|
||||||
|
if (isManual) {
|
||||||
|
Toast.makeText(context, "New update available: v${result.info.versionName}!", Toast.LENGTH_SHORT).show()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
is UpdateCheckResult.UpToDate -> {
|
is UpdateCheckResult.UpToDate -> {
|
||||||
if (showToast) {
|
availableUpdate = null
|
||||||
Toast.makeText(context, "App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
if (isManual) {
|
||||||
|
Toast.makeText(context, "Page refreshed • App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
is UpdateCheckResult.Error -> {
|
is UpdateCheckResult.Error -> {
|
||||||
if (showToast) {
|
if (isManual) {
|
||||||
Toast.makeText(context, "Update check failed: ${result.message}", Toast.LENGTH_SHORT).show()
|
Toast.makeText(context, "Page refreshed • Update check failed", Toast.LENGTH_SHORT).show()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -227,6 +237,7 @@ fun MainScreen(
|
|||||||
// Pull-to-refresh entire page handler
|
// Pull-to-refresh entire page handler
|
||||||
fun refreshWholePage() {
|
fun refreshWholePage() {
|
||||||
isPullRefreshing = true
|
isPullRefreshing = true
|
||||||
|
dismissedVersion = null
|
||||||
coroutineScope.launch {
|
coroutineScope.launch {
|
||||||
// 1. Sync R2 endpoints
|
// 1. Sync R2 endpoints
|
||||||
syncEndpoints(showToast = false)
|
syncEndpoints(showToast = false)
|
||||||
@@ -236,15 +247,14 @@ fun MainScreen(
|
|||||||
refreshStatus(dev, showIndicator = true)
|
refreshStatus(dev, showIndicator = true)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. Check for app updates
|
// 3. Explicitly check for app updates with user feedback
|
||||||
checkAppUpdate(showToast = false)
|
checkAppUpdate(isManual = true)
|
||||||
|
|
||||||
// 4. Update home screen widgets
|
// 4. Update home screen widgets
|
||||||
ServerWidgetProvider.updateAllWidgets(context)
|
ServerWidgetProvider.updateAllWidgets(context)
|
||||||
|
|
||||||
delay(750)
|
delay(750)
|
||||||
isPullRefreshing = false
|
isPullRefreshing = false
|
||||||
Toast.makeText(context, "Page refreshed", Toast.LENGTH_SHORT).show()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -281,45 +291,22 @@ fun MainScreen(
|
|||||||
val performDispatch = {
|
val performDispatch = {
|
||||||
loadingStates[device.id] = true
|
loadingStates[device.id] = true
|
||||||
statusStates.remove(device.id)
|
statusStates.remove(device.id)
|
||||||
triggerClient.sendTrigger(device, action) { response ->
|
Toast.makeText(context, "Sending $actionTitle signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
||||||
loadingStates[device.id] = false
|
|
||||||
val msg = if (response.isSuccess) {
|
|
||||||
when (action) {
|
|
||||||
TriggerAction.POWER_ON -> "Power on signal sent"
|
|
||||||
TriggerAction.POWER_OFF -> "Shutdown signal sent"
|
|
||||||
TriggerAction.REBOOT -> "Restart signal sent"
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
val raw = response.message.trim()
|
|
||||||
val clean = if (raw.startsWith("<")) "Request failed (HTTP ${response.statusCode})" else raw.take(60)
|
|
||||||
"Failed — $clean"
|
|
||||||
}
|
|
||||||
statusStates[device.id] = msg to response.isSuccess
|
|
||||||
Toast.makeText(context, msg, Toast.LENGTH_SHORT).show()
|
|
||||||
|
|
||||||
// Save to history log
|
// Enqueue guaranteed background worker: executes HTTP request, sends notifications, updates widgets & monitors transition
|
||||||
historyRepository.addLog(
|
ActionTriggerWorker.enqueue(context, device.id, action, "App")
|
||||||
TriggerLog(
|
|
||||||
deviceId = device.id,
|
// In foreground, refresh UI smoothly after short intervals if user stays in the app
|
||||||
deviceName = device.name,
|
coroutineScope.launch {
|
||||||
node = device.node,
|
delay(2000)
|
||||||
action = action,
|
refreshStatus(device, showIndicator = true)
|
||||||
isSuccess = response.isSuccess,
|
|
||||||
statusCode = response.statusCode,
|
|
||||||
message = msg,
|
|
||||||
source = "App"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
historyLogs = historyRepository.getLogs()
|
historyLogs = historyRepository.getLogs()
|
||||||
|
loadingStates[device.id] = false
|
||||||
// Update home screen widgets
|
delay(3000)
|
||||||
ServerWidgetProvider.updateAllWidgets(context)
|
refreshStatus(device, showIndicator = false)
|
||||||
|
historyLogs = historyRepository.getLogs()
|
||||||
coroutineScope.launch {
|
delay(4000)
|
||||||
delay(1500); refreshStatus(device, showIndicator = true)
|
refreshStatus(device, showIndicator = false)
|
||||||
delay(4000); refreshStatus(device)
|
|
||||||
delay(5000); refreshStatus(device)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -340,13 +327,6 @@ fun MainScreen(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Spin animation for sync button
|
|
||||||
val rotationAngle by animateFloatAsState(
|
|
||||||
targetValue = if (isSyncing) 360f else 0f,
|
|
||||||
animationSpec = if (isSyncing) tween(900, easing = FastOutSlowInEasing) else tween(0),
|
|
||||||
label = "sync_rotate"
|
|
||||||
)
|
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
modifier = modifier.fillMaxSize(),
|
modifier = modifier.fillMaxSize(),
|
||||||
containerColor = BgBase,
|
containerColor = BgBase,
|
||||||
@@ -354,52 +334,50 @@ fun MainScreen(
|
|||||||
TopAppBar(
|
TopAppBar(
|
||||||
title = {
|
title = {
|
||||||
Row(
|
Row(
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically
|
||||||
modifier = Modifier.padding(start = 2.dp)
|
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
Icons.Default.Terminal,
|
Icons.Default.Terminal,
|
||||||
contentDescription = null,
|
contentDescription = null,
|
||||||
tint = GreenVibrant,
|
tint = GreenVibrant,
|
||||||
modifier = Modifier.size(18.dp)
|
modifier = Modifier.size(16.dp)
|
||||||
)
|
)
|
||||||
Spacer(modifier = Modifier.width(6.dp))
|
Spacer(modifier = Modifier.width(4.dp))
|
||||||
Text(
|
Text(
|
||||||
text = "DEVICE TRIGGER",
|
text = "TRIGGER",
|
||||||
fontSize = 12.sp,
|
fontSize = 12.sp,
|
||||||
fontWeight = FontWeight.Bold,
|
fontWeight = FontWeight.Bold,
|
||||||
letterSpacing = 1.2.sp,
|
letterSpacing = 1.sp,
|
||||||
color = TextPrimary,
|
color = TextPrimary,
|
||||||
fontFamily = FontFamily.Monospace,
|
fontFamily = FontFamily.Monospace,
|
||||||
maxLines = 1
|
maxLines = 1
|
||||||
)
|
)
|
||||||
val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true }
|
val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true }
|
||||||
if (devices.isNotEmpty() && onlineCount > 0) {
|
if (devices.isNotEmpty() && onlineCount > 0) {
|
||||||
Spacer(modifier = Modifier.width(6.dp))
|
Spacer(modifier = Modifier.width(4.dp))
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.clip(CircleShape)
|
.clip(CircleShape)
|
||||||
.background(OnlineBg)
|
.background(OnlineBg)
|
||||||
.border(1.dp, OnlineBorder, CircleShape)
|
.border(1.dp, OnlineBorder, CircleShape)
|
||||||
.padding(horizontal = 6.dp, vertical = 2.dp)
|
.padding(horizontal = 5.dp, vertical = 1.dp)
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
"$onlineCount on",
|
"$onlineCount",
|
||||||
fontSize = 9.sp,
|
fontSize = 9.sp,
|
||||||
fontWeight = FontWeight.Bold,
|
fontWeight = FontWeight.Bold,
|
||||||
color = OnlineText,
|
color = OnlineText
|
||||||
letterSpacing = 0.5.sp
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
actions = {
|
actions = {
|
||||||
// Update Button
|
// Update Button (only when update is ready)
|
||||||
if (availableUpdate != null) {
|
if (availableUpdate != null) {
|
||||||
IconButton(
|
IconButton(
|
||||||
onClick = { showUpdateDialog = true },
|
onClick = { showUpdateDialog = true },
|
||||||
modifier = Modifier.size(36.dp)
|
modifier = Modifier.size(30.dp)
|
||||||
) {
|
) {
|
||||||
Box(contentAlignment = Alignment.TopEnd) {
|
Box(contentAlignment = Alignment.TopEnd) {
|
||||||
Icon(
|
Icon(
|
||||||
@@ -424,55 +402,39 @@ fun MainScreen(
|
|||||||
historyLogs = historyRepository.getLogs()
|
historyLogs = historyRepository.getLogs()
|
||||||
showHistoryDialog = true
|
showHistoryDialog = true
|
||||||
},
|
},
|
||||||
modifier = Modifier.size(36.dp)
|
modifier = Modifier.size(30.dp)
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
Icons.Default.History,
|
Icons.Default.History,
|
||||||
contentDescription = "Trigger History",
|
contentDescription = "Trigger History",
|
||||||
tint = TextSecondary,
|
tint = TextSecondary,
|
||||||
modifier = Modifier.size(20.dp)
|
modifier = Modifier.size(18.dp)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Settings Button
|
// Settings Button
|
||||||
IconButton(
|
IconButton(
|
||||||
onClick = { showSettingsDialog = true },
|
onClick = { showSettingsDialog = true },
|
||||||
modifier = Modifier.size(36.dp)
|
modifier = Modifier.size(30.dp)
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
Icons.Default.Settings,
|
Icons.Default.Settings,
|
||||||
contentDescription = "Settings",
|
contentDescription = "Settings",
|
||||||
tint = TextSecondary,
|
tint = TextSecondary,
|
||||||
modifier = Modifier.size(20.dp)
|
modifier = Modifier.size(18.dp)
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// R2 Sync Button
|
|
||||||
IconButton(
|
|
||||||
onClick = { syncEndpoints(true) },
|
|
||||||
enabled = !isSyncing,
|
|
||||||
modifier = Modifier.size(36.dp)
|
|
||||||
) {
|
|
||||||
Icon(
|
|
||||||
Icons.Default.Refresh,
|
|
||||||
"Sync",
|
|
||||||
tint = if (isSyncing) TextMuted else GreenVibrant,
|
|
||||||
modifier = Modifier
|
|
||||||
.size(20.dp)
|
|
||||||
.rotate(rotationAngle)
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add Device Button
|
// Add Device Button
|
||||||
IconButton(
|
IconButton(
|
||||||
onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } },
|
onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } },
|
||||||
modifier = Modifier.size(36.dp)
|
modifier = Modifier.size(30.dp)
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
Icons.Default.Add,
|
Icons.Default.Add,
|
||||||
"Add Device",
|
"Add Device",
|
||||||
tint = GreenVibrant,
|
tint = GreenVibrant,
|
||||||
modifier = Modifier.size(22.dp)
|
modifier = Modifier.size(19.dp)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -648,9 +610,28 @@ fun MainScreen(
|
|||||||
currentVersion = BuildConfig.VERSION_NAME,
|
currentVersion = BuildConfig.VERSION_NAME,
|
||||||
downloadState = downloadState,
|
downloadState = downloadState,
|
||||||
onDownload = {
|
onDownload = {
|
||||||
downloadState = DownloadState.Downloading(0, 0, availableUpdate!!.sizeBytes)
|
val info = availableUpdate!!
|
||||||
updateManager.downloadApk(availableUpdate!!.downloadUrl) { state ->
|
// If retrying from failure, re-check to get fresh release asset URLs
|
||||||
downloadState = state
|
if (downloadState is DownloadState.Failed) {
|
||||||
|
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, fresh.sizeBytes) { state ->
|
||||||
|
downloadState = state
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
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, info.sizeBytes) { state ->
|
||||||
|
downloadState = state
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onInstall = { file ->
|
onInstall = { file ->
|
||||||
|
|||||||
@@ -24,10 +24,14 @@ import java.util.concurrent.TimeUnit
|
|||||||
class UpdateManager(
|
class UpdateManager(
|
||||||
private val context: Context,
|
private val context: Context,
|
||||||
private val okHttpClient: OkHttpClient = OkHttpClient.Builder()
|
private val okHttpClient: OkHttpClient = OkHttpClient.Builder()
|
||||||
|
.followRedirects(true)
|
||||||
|
.followSslRedirects(true)
|
||||||
|
.retryOnConnectionFailure(true)
|
||||||
.connectTimeout(30, TimeUnit.SECONDS)
|
.connectTimeout(30, TimeUnit.SECONDS)
|
||||||
.readTimeout(60, TimeUnit.SECONDS)
|
.readTimeout(60, TimeUnit.SECONDS)
|
||||||
.build(),
|
.build(),
|
||||||
val githubRepo: String = "vaishnosingh/server-control-app"
|
val primaryReleasesUrl: String = "https://forge.linuxguy.space/api/v1/repos/vaishnosingh/server-control-app/releases",
|
||||||
|
val fallbackReleasesUrl: String = "https://api.github.com/repos/vaishnosingh/server-control-app/releases"
|
||||||
) {
|
) {
|
||||||
private val mainHandler = try {
|
private val mainHandler = try {
|
||||||
val looper = Looper.getMainLooper()
|
val looper = Looper.getMainLooper()
|
||||||
@@ -41,15 +45,80 @@ 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 {
|
||||||
|
// 1. Try Primary: Self-hosted Git server (forge.linuxguy.space)
|
||||||
|
val primaryResult = queryReleasesSync(primaryReleasesUrl, currentVersionName)
|
||||||
|
if (primaryResult is UpdateCheckResult.UpdateAvailable || primaryResult is UpdateCheckResult.UpToDate) {
|
||||||
|
return primaryResult
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Fallback: GitHub releases API
|
||||||
|
val fallbackResult = queryReleasesSync(fallbackReleasesUrl, currentVersionName)
|
||||||
|
if (fallbackResult is UpdateCheckResult.UpdateAvailable || fallbackResult is UpdateCheckResult.UpToDate) {
|
||||||
|
return fallbackResult
|
||||||
|
}
|
||||||
|
|
||||||
|
return primaryResult // Return original error if both failed
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun queryReleasesSync(url: String, currentVersionName: String): UpdateCheckResult {
|
||||||
|
val request = Request.Builder()
|
||||||
|
.url(url)
|
||||||
|
.addHeader("Accept", "application/vnd.github.v3+json")
|
||||||
|
.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(
|
fun checkForUpdate(
|
||||||
currentVersionName: String,
|
currentVersionName: String,
|
||||||
callback: (UpdateCheckResult) -> Unit
|
callback: (UpdateCheckResult) -> Unit
|
||||||
) {
|
) {
|
||||||
// Query releases list so we always inspect the highest semantic version
|
// Try Primary first
|
||||||
val url = "https://api.github.com/repos/$githubRepo/releases"
|
queryReleasesAsync(primaryReleasesUrl, currentVersionName) { primaryResult ->
|
||||||
|
if (primaryResult is UpdateCheckResult.UpdateAvailable || primaryResult is UpdateCheckResult.UpToDate) {
|
||||||
|
runOnMain { callback(primaryResult) }
|
||||||
|
} else {
|
||||||
|
// Primary failed, query GitHub fallback
|
||||||
|
queryReleasesAsync(fallbackReleasesUrl, currentVersionName) { fallbackResult ->
|
||||||
|
if (fallbackResult is UpdateCheckResult.UpdateAvailable || fallbackResult is UpdateCheckResult.UpToDate) {
|
||||||
|
runOnMain { callback(fallbackResult) }
|
||||||
|
} else {
|
||||||
|
runOnMain { callback(primaryResult) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun queryReleasesAsync(
|
||||||
|
url: String,
|
||||||
|
currentVersionName: String,
|
||||||
|
onComplete: (UpdateCheckResult) -> Unit
|
||||||
|
) {
|
||||||
val request = Request.Builder()
|
val request = Request.Builder()
|
||||||
.url(url)
|
.url(url)
|
||||||
.addHeader("Accept", "application/vnd.github.v3+json")
|
.addHeader("Accept", "application/vnd.github.v3+json")
|
||||||
@@ -59,124 +128,156 @@ class UpdateManager(
|
|||||||
|
|
||||||
okHttpClient.newCall(request).enqueue(object : Callback {
|
okHttpClient.newCall(request).enqueue(object : Callback {
|
||||||
override fun onFailure(call: Call, e: IOException) {
|
override fun onFailure(call: Call, e: IOException) {
|
||||||
runOnMain {
|
onComplete(UpdateCheckResult.Error("Network error: ${e.localizedMessage}"))
|
||||||
callback(UpdateCheckResult.Error("Network error: ${e.localizedMessage}"))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onResponse(call: Call, response: Response) {
|
override fun onResponse(call: Call, response: Response) {
|
||||||
response.use { res ->
|
response.use { res ->
|
||||||
if (res.code == 404) {
|
if (res.code == 404) {
|
||||||
runOnMain { callback(UpdateCheckResult.UpToDate) }
|
onComplete(UpdateCheckResult.UpToDate)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (!res.isSuccessful) {
|
if (!res.isSuccessful) {
|
||||||
runOnMain {
|
onComplete(UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates"))
|
||||||
callback(UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates"))
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
val body = res.body?.string().orEmpty()
|
val body = res.body?.string().orEmpty()
|
||||||
try {
|
val result = parseReleases(body, currentVersionName)
|
||||||
val jsonElement = JsonParser.parseString(body)
|
onComplete(result)
|
||||||
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 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
|
|
||||||
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,
|
|
||||||
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}"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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.
|
* 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.
|
||||||
*/
|
*/
|
||||||
fun downloadApk(
|
fun downloadApk(
|
||||||
downloadUrl: String,
|
downloadUrl: String,
|
||||||
|
assetApiUrl: String? = null,
|
||||||
|
expectedSizeBytes: Long = 0L,
|
||||||
onProgress: (DownloadState) -> Unit
|
onProgress: (DownloadState) -> Unit
|
||||||
): Call {
|
): Call {
|
||||||
val request = Request.Builder()
|
return startDownloadCall(downloadUrl, assetApiUrl, expectedSizeBytes, isFallback = false, onProgress)
|
||||||
.url(downloadUrl)
|
}
|
||||||
.addHeader("User-Agent", "ServerControlApp")
|
|
||||||
.get()
|
|
||||||
.build()
|
|
||||||
|
|
||||||
|
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")
|
||||||
|
}
|
||||||
|
|
||||||
|
val request = requestBuilder.get().build()
|
||||||
val call = okHttpClient.newCall(request)
|
val call = okHttpClient.newCall(request)
|
||||||
|
|
||||||
call.enqueue(object : Callback {
|
call.enqueue(object : Callback {
|
||||||
override fun onFailure(call: Call, e: IOException) {
|
override fun onFailure(call: Call, e: IOException) {
|
||||||
if (!call.isCanceled()) {
|
if (call.isCanceled()) return
|
||||||
|
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
|
||||||
|
startDownloadCall(fallbackUrl, null, expectedSizeBytes, isFallback = true, onProgress)
|
||||||
|
} else {
|
||||||
runOnMain {
|
runOnMain {
|
||||||
onProgress(DownloadState.Failed("Download failed: ${e.localizedMessage}"))
|
onProgress(DownloadState.Failed("Download failed: ${e.localizedMessage}"))
|
||||||
}
|
}
|
||||||
@@ -184,15 +285,24 @@ class UpdateManager(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onResponse(call: Call, response: Response) {
|
override fun onResponse(call: Call, response: Response) {
|
||||||
|
if (call.isCanceled()) return
|
||||||
|
|
||||||
if (!response.isSuccessful) {
|
if (!response.isSuccessful) {
|
||||||
runOnMain {
|
response.close()
|
||||||
onProgress(DownloadState.Failed("Server returned HTTP ${response.code}"))
|
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
|
||||||
|
// Fallback to direct asset API
|
||||||
|
startDownloadCall(fallbackUrl, null, expectedSizeBytes, isFallback = true, onProgress)
|
||||||
|
} else {
|
||||||
|
runOnMain {
|
||||||
|
onProgress(DownloadState.Failed("Server returned HTTP ${response.code}"))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
val responseBody = response.body
|
val responseBody = response.body
|
||||||
if (responseBody == null) {
|
if (responseBody == null) {
|
||||||
|
response.close()
|
||||||
runOnMain {
|
runOnMain {
|
||||||
onProgress(DownloadState.Failed("Response body was empty"))
|
onProgress(DownloadState.Failed("Response body was empty"))
|
||||||
}
|
}
|
||||||
@@ -209,14 +319,16 @@ class UpdateManager(
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
val totalBytes = responseBody.contentLength()
|
val rawLength = responseBody.contentLength()
|
||||||
|
val totalBytes = if (rawLength > 0L) rawLength else expectedSizeBytes
|
||||||
var bytesDownloaded = 0L
|
var bytesDownloaded = 0L
|
||||||
|
|
||||||
responseBody.byteStream().use { input ->
|
responseBody.byteStream().buffered(65536).use { input ->
|
||||||
FileOutputStream(apkFile).use { output ->
|
FileOutputStream(apkFile).buffered(65536).use { output ->
|
||||||
val buffer = ByteArray(8192)
|
val buffer = ByteArray(65536)
|
||||||
var read: Int
|
var read: Int
|
||||||
var lastPercent = -1
|
var lastPercent = -1
|
||||||
|
var lastUpdateTime = 0L
|
||||||
|
|
||||||
while (input.read(buffer).also { read = it } != -1) {
|
while (input.read(buffer).also { read = it } != -1) {
|
||||||
if (call.isCanceled()) return
|
if (call.isCanceled()) return
|
||||||
@@ -224,12 +336,14 @@ class UpdateManager(
|
|||||||
output.write(buffer, 0, read)
|
output.write(buffer, 0, read)
|
||||||
bytesDownloaded += read
|
bytesDownloaded += read
|
||||||
|
|
||||||
val percent = if (totalBytes > 0) {
|
val percent = if (totalBytes > 0L) {
|
||||||
((bytesDownloaded * 100) / totalBytes).toInt()
|
((bytesDownloaded * 100) / totalBytes).toInt().coerceIn(0, 100)
|
||||||
} else 0
|
} else 0
|
||||||
|
|
||||||
if (percent != lastPercent) {
|
val now = System.currentTimeMillis()
|
||||||
|
if (percent != lastPercent || (now - lastUpdateTime >= 100)) {
|
||||||
lastPercent = percent
|
lastPercent = percent
|
||||||
|
lastUpdateTime = now
|
||||||
runOnMain {
|
runOnMain {
|
||||||
onProgress(
|
onProgress(
|
||||||
DownloadState.Downloading(
|
DownloadState.Downloading(
|
||||||
@@ -245,8 +359,14 @@ class UpdateManager(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
runOnMain {
|
if (apkFile.exists() && apkFile.length() > 0) {
|
||||||
onProgress(DownloadState.ReadyToInstall(apkFile))
|
runOnMain {
|
||||||
|
onProgress(DownloadState.ReadyToInstall(apkFile))
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
runOnMain {
|
||||||
|
onProgress(DownloadState.Failed("Downloaded file was empty"))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
if (!call.isCanceled()) {
|
if (!call.isCanceled()) {
|
||||||
@@ -254,6 +374,8 @@ class UpdateManager(
|
|||||||
onProgress(DownloadState.Failed("File write failed: ${e.localizedMessage}"))
|
onProgress(DownloadState.Failed("File write failed: ${e.localizedMessage}"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} finally {
|
||||||
|
response.close()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -8,8 +8,9 @@ data class ReleaseInfo(
|
|||||||
val title: String,
|
val title: String,
|
||||||
val changelog: String,
|
val changelog: String,
|
||||||
val downloadUrl: String,
|
val downloadUrl: String,
|
||||||
val apkFileName: String,
|
val assetApiUrl: String? = null,
|
||||||
val sizeBytes: Long
|
val apkFileName: String = "app-release.apk",
|
||||||
|
val sizeBytes: Long = 0L
|
||||||
)
|
)
|
||||||
|
|
||||||
sealed class UpdateCheckResult {
|
sealed class UpdateCheckResult {
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import com.expapp.trigger.data.repository.TriggerHistoryRepository
|
|||||||
import com.expapp.trigger.network.NodeStatus
|
import com.expapp.trigger.network.NodeStatus
|
||||||
import com.expapp.trigger.network.TriggerAction
|
import com.expapp.trigger.network.TriggerAction
|
||||||
import com.expapp.trigger.network.TriggerClient
|
import com.expapp.trigger.network.TriggerClient
|
||||||
|
import com.expapp.trigger.worker.ActionTriggerWorker
|
||||||
import java.util.concurrent.Executors
|
import java.util.concurrent.Executors
|
||||||
|
|
||||||
class ServerWidgetProvider : AppWidgetProvider() {
|
class ServerWidgetProvider : AppWidgetProvider() {
|
||||||
@@ -95,41 +96,9 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
|||||||
}
|
}
|
||||||
context.startActivity(launchIntent)
|
context.startActivity(launchIntent)
|
||||||
} else {
|
} else {
|
||||||
// Biometric disabled: execute directly in background
|
// Biometric disabled: execute via guaranteed background worker
|
||||||
executor.execute {
|
Toast.makeText(context, "Sending ${action.name} signal...", Toast.LENGTH_SHORT).show()
|
||||||
val repository = DeviceRepository(SharedPrefsStorage(context))
|
ActionTriggerWorker.enqueue(context, deviceId, action, "Widget")
|
||||||
val device = repository.getDevices().find { it.id == deviceId } ?: return@execute
|
|
||||||
val client = TriggerClient()
|
|
||||||
|
|
||||||
val response = client.sendTriggerSync(device, action)
|
|
||||||
val historyRepo = TriggerHistoryRepository(context)
|
|
||||||
historyRepo.addLog(
|
|
||||||
TriggerLog(
|
|
||||||
deviceId = device.id,
|
|
||||||
deviceName = device.name,
|
|
||||||
node = device.node,
|
|
||||||
action = action,
|
|
||||||
isSuccess = response.isSuccess,
|
|
||||||
statusCode = response.statusCode,
|
|
||||||
message = response.message,
|
|
||||||
source = "Widget"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
mainHandler.post {
|
|
||||||
val msg = if (response.isSuccess) {
|
|
||||||
when (action) {
|
|
||||||
TriggerAction.POWER_ON -> "Power on sent to ${device.name}"
|
|
||||||
TriggerAction.REBOOT -> "Restart sent to ${device.name}"
|
|
||||||
TriggerAction.POWER_OFF -> "Shutdown sent to ${device.name}"
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
"Failed: ${response.message.take(40)}"
|
|
||||||
}
|
|
||||||
Toast.makeText(context, msg, Toast.LENGTH_SHORT).show()
|
|
||||||
updateAllWidgets(context)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -45,12 +45,16 @@ object NotificationHelper {
|
|||||||
id: Int,
|
id: Int,
|
||||||
title: String,
|
title: String,
|
||||||
message: String,
|
message: String,
|
||||||
isSuccess: Boolean = true
|
isSuccess: Boolean = true,
|
||||||
|
extraAction: String? = null
|
||||||
): Boolean {
|
): Boolean {
|
||||||
createNotificationChannel(context)
|
createNotificationChannel(context)
|
||||||
|
|
||||||
val intent = Intent(context, MainActivity::class.java).apply {
|
val intent = Intent(context, MainActivity::class.java).apply {
|
||||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||||
|
if (extraAction != null) {
|
||||||
|
putExtra("action_trigger", extraAction)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
val pendingIntent = PendingIntent.getActivity(
|
val pendingIntent = PendingIntent.getActivity(
|
||||||
context,
|
context,
|
||||||
@@ -81,6 +85,17 @@ object NotificationHelper {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun sendUpdateAvailableNotification(context: Context, newVersion: String): Boolean {
|
||||||
|
return sendNotification(
|
||||||
|
context = context,
|
||||||
|
id = 8888,
|
||||||
|
title = "🚀 Update Available: v$newVersion",
|
||||||
|
message = "A new version (v$newVersion) of Device Trigger is ready to install. Tap to update!",
|
||||||
|
isSuccess = true,
|
||||||
|
extraAction = "open_update"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
fun sendTestNotification(context: Context): Boolean {
|
fun sendTestNotification(context: Context): Boolean {
|
||||||
return sendNotification(
|
return sendNotification(
|
||||||
context = context,
|
context = context,
|
||||||
|
|||||||
@@ -91,37 +91,65 @@ class ServerMonitorWorker(
|
|||||||
for (device in devices) {
|
for (device in devices) {
|
||||||
if (device.statusUrl.isBlank()) continue
|
if (device.statusUrl.isBlank()) continue
|
||||||
|
|
||||||
val status = triggerClient.checkStatusSync(device)
|
var status = triggerClient.checkStatusSync(device)
|
||||||
|
|
||||||
|
// If the endpoint could not be reached (e.g. phone has no internet / network failure),
|
||||||
|
// do NOT treat this as the server going offline. Maintain the last known state.
|
||||||
|
if (!status.isReachable) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
val previousStatus = appSettings.getLastStatus(device.id)
|
val previousStatus = appSettings.getLastStatus(device.id)
|
||||||
|
|
||||||
// Save new status
|
// If a transition is detected (especially online -> offline or offline -> online),
|
||||||
|
// double-check with an immediate secondary request after 2 seconds to eliminate false positives
|
||||||
|
if (previousStatus != null && previousStatus != status.isOnline) {
|
||||||
|
kotlinx.coroutines.delay(2000L)
|
||||||
|
val verificationStatus = triggerClient.checkStatusSync(device)
|
||||||
|
if (verificationStatus.isReachable && verificationStatus.isOnline == status.isOnline) {
|
||||||
|
status = verificationStatus
|
||||||
|
} else {
|
||||||
|
// False positive or transient state; do not change status or trigger false alert
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Save new verified status
|
||||||
appSettings.setLastStatus(device.id, status.isOnline)
|
appSettings.setLastStatus(device.id, status.isOnline)
|
||||||
|
|
||||||
// Determine if notification is needed
|
// Determine if notification is needed only when server actually transitions
|
||||||
if (previousStatus != null && previousStatus != status.isOnline) {
|
if (previousStatus != null && previousStatus != status.isOnline) {
|
||||||
NotificationHelper.sendNotification(
|
NotificationHelper.sendNotification(
|
||||||
context = appContext,
|
context = appContext,
|
||||||
id = device.id.hashCode(),
|
id = device.id.hashCode(),
|
||||||
title = if (status.isOnline) "✅ Server Back Online" else "⚠️ Server Offline",
|
title = if (status.isOnline) "✅ Server Online" else "⚠️ Server Offline",
|
||||||
message = if (status.isOnline) {
|
message = if (status.isOnline) {
|
||||||
"${device.name} is now online and reachable."
|
"${device.name} is now online and reachable."
|
||||||
} else {
|
} else {
|
||||||
"${device.name} is unreachable or offline."
|
"${device.name} has powered off or is offline."
|
||||||
},
|
},
|
||||||
isSuccess = status.isOnline
|
isSuccess = status.isOnline
|
||||||
)
|
)
|
||||||
} else if (previousStatus == null && !status.isOnline) {
|
|
||||||
// Initial check revealed server is offline
|
|
||||||
NotificationHelper.sendNotification(
|
|
||||||
context = appContext,
|
|
||||||
id = device.id.hashCode(),
|
|
||||||
title = "⚠️ Server Offline",
|
|
||||||
message = "${device.name} is currently unreachable or offline.",
|
|
||||||
isSuccess = false
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check for app updates in the background 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) {
|
||||||
|
appSettings.lastNotifiedUpdateVersion = newVer
|
||||||
|
NotificationHelper.sendUpdateAvailableNotification(appContext, newVer)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (_: Exception) {
|
||||||
|
// Ignore background check failure
|
||||||
|
}
|
||||||
|
|
||||||
return Result.success()
|
return Result.success()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="108dp"
|
||||||
|
android:height="108dp"
|
||||||
|
android:viewportWidth="108"
|
||||||
|
android:viewportHeight="108">
|
||||||
|
<group
|
||||||
|
android:translateX="27.6"
|
||||||
|
android:translateY="27.6"
|
||||||
|
android:scaleX="2.2"
|
||||||
|
android:scaleY="2.2">
|
||||||
|
<path
|
||||||
|
android:fillColor="#22C55E"
|
||||||
|
android:pathData="M20,4H4C2.89,4 2,4.9 2,6v12c0,1.1 0.89,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18H4V8h16V18zM6.5,16.5l3.5,-3.5L6.5,9.5L7.91,8.09L12.83,13l-4.92,4.91L6.5,16.5zM12,15h5v2h-5V15z"/>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="108dp"
|
||||||
|
android:height="108dp"
|
||||||
|
android:viewportWidth="108"
|
||||||
|
android:viewportHeight="108">
|
||||||
|
<group
|
||||||
|
android:translateX="27.6"
|
||||||
|
android:translateY="27.6"
|
||||||
|
android:scaleX="2.2"
|
||||||
|
android:scaleY="2.2">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFFFF"
|
||||||
|
android:pathData="M20,4H4C2.89,4 2,4.9 2,6v12c0,1.1 0.89,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18H4V8h16V18zM6.5,16.5l3.5,-3.5L6.5,9.5L7.91,8.09L12.83,13l-4.92,4.91L6.5,16.5zM12,15h5v2h-5V15z"/>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
@@ -25,12 +25,13 @@
|
|||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="8dp"
|
android:layout_marginStart="8dp"
|
||||||
|
android:layout_marginEnd="6dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/widget_device_name"
|
android:id="@+id/widget_device_name"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
@@ -41,7 +42,7 @@
|
|||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/widget_node_name"
|
android:id="@+id/widget_node_name"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background android:drawable="@color/ic_launcher_background" />
|
||||||
|
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||||
|
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
|
||||||
|
</adaptive-icon>
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background android:drawable="@color/ic_launcher_background" />
|
||||||
|
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||||
|
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
|
||||||
|
</adaptive-icon>
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="ic_launcher_background">#0B0F19</color>
|
||||||
|
</resources>
|
||||||
Reference in New Issue
Block a user