Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bba5caf79d | ||
|
|
d8eaceb314 | ||
|
|
256cc6cfc8 | ||
|
|
e1bcfa21f8 |
@@ -11,8 +11,8 @@ android {
|
||||
applicationId = "com.expapp.trigger"
|
||||
minSdk = 24
|
||||
targetSdk = 34
|
||||
versionCode = 9
|
||||
versionName = "1.1.5"
|
||||
versionCode = 13
|
||||
versionName = "1.1.9"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables {
|
||||
|
||||
@@ -10,8 +10,16 @@ class AppSettings(private val storage: KeyValueStorage) {
|
||||
private const val KEY_BIOMETRIC_ENABLED = "key_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)
|
||||
|
||||
@@ -198,7 +198,7 @@ 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))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
@@ -226,7 +226,7 @@ class TriggerClient(
|
||||
parseNodeStatus(body, it.isSuccessful)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
NodeStatus(isOnline = false, statusText = "OFFLINE")
|
||||
NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -20,5 +20,6 @@ data class NodeStatus(
|
||||
val onSinceIst: String? = null,
|
||||
val lastActiveAgo: String? = null,
|
||||
val lastActiveIst: String? = null,
|
||||
val timestamp: Long = System.currentTimeMillis()
|
||||
val timestamp: Long = System.currentTimeMillis(),
|
||||
val isReachable: Boolean = true
|
||||
)
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -166,8 +166,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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -208,6 +210,11 @@ fun MainScreen(
|
||||
is UpdateCheckResult.UpdateAvailable -> {
|
||||
availableUpdate = result.info
|
||||
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()
|
||||
}
|
||||
@@ -320,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(
|
||||
modifier = modifier.fillMaxSize(),
|
||||
containerColor = BgBase,
|
||||
@@ -334,52 +334,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(
|
||||
@@ -404,55 +402,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)
|
||||
)
|
||||
}
|
||||
},
|
||||
|
||||
@@ -43,6 +43,113 @@ class UpdateManager(
|
||||
mainHandler?.post(block) ?: block()
|
||||
}
|
||||
|
||||
/**
|
||||
* Synchronously checks GitHub Releases API for the latest published release.
|
||||
* Suitable for use inside background workers (e.g. WorkManager CoroutineWorker).
|
||||
*/
|
||||
fun checkForUpdateSync(currentVersionName: String): UpdateCheckResult {
|
||||
val url = "https://api.github.com/repos/$githubRepo/releases"
|
||||
val request = Request.Builder()
|
||||
.url(url)
|
||||
.addHeader("Accept", "application/vnd.github.v3+json")
|
||||
.addHeader("User-Agent", "ServerControlApp")
|
||||
.get()
|
||||
.build()
|
||||
|
||||
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")
|
||||
}
|
||||
val body = res.body?.string().orEmpty()
|
||||
parseReleases(body, currentVersionName)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
UpdateCheckResult.Error("Network error: ${e.localizedMessage}")
|
||||
}
|
||||
}
|
||||
|
||||
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}")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks GitHub Releases API for the latest published release.
|
||||
*/
|
||||
@@ -81,86 +188,8 @@ class UpdateManager(
|
||||
}
|
||||
|
||||
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)
|
||||
runOnMain { callback(result) }
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
@@ -105,27 +105,6 @@ class ActionTriggerWorker(
|
||||
"Failed to send $actionTitle: $clean"
|
||||
}
|
||||
|
||||
val actionIcon = when (action) {
|
||||
TriggerAction.POWER_ON -> "⚡"
|
||||
TriggerAction.POWER_OFF -> "🛑"
|
||||
TriggerAction.REBOOT -> "🔄"
|
||||
}
|
||||
|
||||
val notifTitle = if (response.isSuccess) {
|
||||
"$actionIcon $actionTitle: ${device.name}"
|
||||
} else {
|
||||
"❌ $actionTitle Failed: ${device.name}"
|
||||
}
|
||||
|
||||
// Send system notification to drawer
|
||||
NotificationHelper.sendNotification(
|
||||
context = appContext,
|
||||
id = (device.id.hashCode() * 31) + action.ordinal,
|
||||
title = notifTitle,
|
||||
message = signalMsg,
|
||||
isSuccess = response.isSuccess
|
||||
)
|
||||
|
||||
// 3. Save to history log
|
||||
historyRepo.addLog(
|
||||
TriggerLog(
|
||||
@@ -167,6 +146,12 @@ class ActionTriggerWorker(
|
||||
attempts++
|
||||
val status = triggerClient.checkStatusSync(device)
|
||||
|
||||
// If phone network is unavailable, do not misinterpret as server going offline
|
||||
if (!status.isReachable) {
|
||||
delay(4000L)
|
||||
continue
|
||||
}
|
||||
|
||||
when (action) {
|
||||
TriggerAction.POWER_ON -> {
|
||||
if (status.isOnline) {
|
||||
|
||||
@@ -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,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 {
|
||||
return sendNotification(
|
||||
context = context,
|
||||
|
||||
@@ -92,12 +92,19 @@ class ServerMonitorWorker(
|
||||
if (device.statusUrl.isBlank()) continue
|
||||
|
||||
val status = triggerClient.checkStatusSync(device)
|
||||
|
||||
// If the endpoint could not be reached (e.g. phone has no internet / network failure),
|
||||
// do NOT treat this as the server going offline. Maintain the last known state.
|
||||
if (!status.isReachable) {
|
||||
continue
|
||||
}
|
||||
|
||||
val previousStatus = appSettings.getLastStatus(device.id)
|
||||
|
||||
// Save new 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,
|
||||
@@ -106,22 +113,30 @@ class ServerMonitorWorker(
|
||||
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) {
|
||||
appSettings.lastNotifiedUpdateVersion = newVer
|
||||
NotificationHelper.sendUpdateAvailableNotification(appContext, newVer)
|
||||
}
|
||||
}
|
||||
} catch (_: Exception) {
|
||||
// Ignore background check failure
|
||||
}
|
||||
|
||||
return Result.success()
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user