8 Commits
Author SHA1 Message Date
Vaishno Singh d8eaceb314 fix(ui): eliminate button overlapping with overflow menu & clean top bar (v1.1.8)
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
2026-11-19 10:35:50 +05:30
Vaishno Singh 256cc6cfc8 feat: send notification when new app update is available (v1.1.7)
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
2026-11-19 10:24:51 +05:30
Vaishno Singh e1bcfa21f8 fix: maintain server state on network loss, suppress command sent notifications & unify refresh button (v1.1.6)
Build & Release Android APK / Build & Publish Release APK (push) Canceled after 0s
2026-11-19 10:21:37 +05:30
Vaishno Singh d16b87143d feat: guaranteed background action execution & notifications via ActionTriggerWorker (v1.1.5)
Build & Release Android APK / Build & Publish Release APK (push) Canceled after 0s
2026-11-19 01:27:52 +05:30
Vaishno Singh 27b632bcaa feat: check for updates on pull-to-refresh & accelerate download with streaming (v1.1.4)
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
2026-11-19 01:14:25 +05:30
Vaishno Singh 0bcca1fbf4 feat: add Nothing Phone compatible monochrome themed icon & default server seed (v1.1.3)
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
2026-11-19 01:05:42 +05:30
Vaishno Singh 898b2468c5 fix(update): add direct API asset fallback for 404s & layout ellipsis for long device names (v1.1.2)
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
2026-11-19 00:59:46 +05:30
Vaishno Singh ff989afcc1 fix(notifications): add monochrome icon, permission prompt, test notification & pull-to-refresh
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
2026-11-19 00:43:16 +05:30
22 changed files with 1105 additions and 474 deletions
+2 -2
View File
@@ -11,8 +11,8 @@ android {
applicationId = "com.expapp.trigger" applicationId = "com.expapp.trigger"
minSdk = 24 minSdk = 24
targetSdk = 34 targetSdk = 34
versionCode = 4 versionCode = 12
versionName = "1.1.0" versionName = "1.1.8"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
@@ -38,6 +38,8 @@ 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.ServerMonitorWorker import com.expapp.trigger.worker.ServerMonitorWorker
class MainActivity : FragmentActivity() { class MainActivity : FragmentActivity() {
@@ -50,22 +52,72 @@ class MainActivity : FragmentActivity() {
private var activeNfcWritePayload by mutableStateOf<NfcTriggerPayload?>(null) private var activeNfcWritePayload by mutableStateOf<NfcTriggerPayload?>(null)
private var nfcWriteResult by mutableStateOf<Result<Unit>?>(null) private var nfcWriteResult by mutableStateOf<Result<Unit>?>(null)
private var isNotificationPermissionGranted by mutableStateOf(false)
private var onNotificationPermissionGrantedCallback: (() -> Unit)? = null
private val notificationPermissionLauncher = private val notificationPermissionLauncher =
registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted -> registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
if (isGranted && appSettings.isBackgroundMonitoringEnabled) { isNotificationPermissionGranted = isGranted || NotificationHelper.areNotificationsEnabled(this)
ServerMonitorWorker.schedule(this) if (isGranted) {
NotificationHelper.createNotificationChannel(this)
if (appSettings.isBackgroundMonitoringEnabled) {
ServerMonitorWorker.schedule(this)
}
onNotificationPermissionGrantedCallback?.invoke()
} else {
Toast.makeText(this, "Notification permission is required for alerts", Toast.LENGTH_SHORT).show()
} }
onNotificationPermissionGrantedCallback = null
} }
fun requestNotificationPermission(onGranted: () -> Unit = {}) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
== PackageManager.PERMISSION_GRANTED
) {
isNotificationPermissionGranted = true
onGranted()
} else {
onNotificationPermissionGrantedCallback = onGranted
notificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
}
} else {
isNotificationPermissionGranted = NotificationHelper.areNotificationsEnabled(this)
onGranted()
}
}
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
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)
NotificationHelper.createNotificationChannel(this)
isNotificationPermissionGranted = NotificationHelper.areNotificationsEnabled(this)
// Request notification permission on Android 13+ // Request notification permission on Android 13+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
@@ -77,7 +129,6 @@ class MainActivity : FragmentActivity() {
// Initialize background server monitoring // Initialize background server monitoring
if (appSettings.isBackgroundMonitoringEnabled) { if (appSettings.isBackgroundMonitoringEnabled) {
ServerMonitorWorker.createNotificationChannel(this)
ServerMonitorWorker.schedule(this) ServerMonitorWorker.schedule(this)
} }
@@ -100,6 +151,18 @@ class MainActivity : FragmentActivity() {
onResult(success) onResult(success)
} }
}, },
isNotificationPermissionGranted = isNotificationPermissionGranted,
onRequestNotificationPermission = {
requestNotificationPermission()
},
onSendTestNotification = {
val ok = NotificationHelper.sendTestNotification(this)
if (ok) {
Toast.makeText(this, "Test notification sent!", Toast.LENGTH_SHORT).show()
} else {
Toast.makeText(this, "Notification failed to send. Check system permissions.", Toast.LENGTH_LONG).show()
}
},
nfcWriteResult = nfcWriteResult, nfcWriteResult = nfcWriteResult,
onStartNfcWriting = { payload -> onStartNfcWriting = { payload ->
nfcWriteResult = null nfcWriteResult = null
@@ -117,6 +180,7 @@ class MainActivity : FragmentActivity() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
isNotificationPermissionGranted = NotificationHelper.areNotificationsEnabled(this)
if (NfcHelper.isNfcSupported(this)) { if (NfcHelper.isNfcSupported(this)) {
NfcHelper.enableForegroundDispatch(this) NfcHelper.enableForegroundDispatch(this)
} }
@@ -129,6 +193,15 @@ class MainActivity : FragmentActivity() {
} }
} }
override fun onStop() {
super.onStop()
// When leaving the app, trigger an immediate one-time check & ensure worker is scheduled
if (appSettings.isBackgroundMonitoringEnabled) {
ServerMonitorWorker.runOnce(this)
ServerMonitorWorker.schedule(this)
}
}
override fun onNewIntent(intent: Intent) { override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent) super.onNewIntent(intent)
setIntent(intent) setIntent(intent)
@@ -193,27 +266,7 @@ class MainActivity : FragmentActivity() {
val onAuthorized = { val onAuthorized = {
vibrateFeedback(true) vibrateFeedback(true)
Toast.makeText(this, "Sending $actionName signal to ${device.name}...", Toast.LENGTH_SHORT).show() Toast.makeText(this, "Sending $actionName signal to ${device.name}...", Toast.LENGTH_SHORT).show()
triggerClient.sendTrigger(device, action) { response -> ActionTriggerWorker.enqueue(this, device.id, action, source)
val msg = if (response.isSuccess) {
"$actionName signal sent successfully"
} else {
"Failed: ${response.message.take(50)}"
}
Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
historyRepository.addLog(
TriggerLog(
deviceId = device.id,
deviceName = device.name,
node = device.node,
action = action,
isSuccess = response.isSuccess,
statusCode = response.statusCode,
message = response.message,
source = source
)
)
ServerWidgetProvider.updateAllWidgets(this)
}
} }
if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(this)) { if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(this)) {
@@ -10,8 +10,16 @@ class AppSettings(private val storage: KeyValueStorage) {
private const val KEY_BIOMETRIC_ENABLED = "key_biometric_enabled" private const val KEY_BIOMETRIC_ENABLED = "key_biometric_enabled"
private const val KEY_BG_MONITOR_ENABLED = "key_bg_monitor_enabled" private const val KEY_BG_MONITOR_ENABLED = "key_bg_monitor_enabled"
private const val KEY_LAST_STATUS_PREFIX = "last_status_" private const val KEY_LAST_STATUS_PREFIX = "last_status_"
private const val KEY_LAST_NOTIFIED_VERSION = "key_last_notified_version"
} }
var lastNotifiedUpdateVersion: String?
get() = storage.getString(KEY_LAST_NOTIFIED_VERSION, null)
set(value) {
if (value != null) storage.putString(KEY_LAST_NOTIFIED_VERSION, value)
else storage.remove(KEY_LAST_NOTIFIED_VERSION)
}
var isBiometricEnabled: Boolean var isBiometricEnabled: Boolean
get() = storage.getBoolean(KEY_BIOMETRIC_ENABLED, true) get() = storage.getBoolean(KEY_BIOMETRIC_ENABLED, true)
set(value) = storage.putBoolean(KEY_BIOMETRIC_ENABLED, value) set(value) = storage.putBoolean(KEY_BIOMETRIC_ENABLED, value)
@@ -198,7 +198,7 @@ class TriggerClient(
client.newCall(request).enqueue(object : Callback { client.newCall(request).enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) { override fun onFailure(call: Call, e: IOException) {
runOnMain { runOnMain {
callback(NodeStatus(isOnline = false, statusText = "OFFLINE")) callback(NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false))
} }
} }
@@ -215,7 +215,7 @@ class TriggerClient(
fun checkStatusSync(device: DeviceConfig): NodeStatus { fun checkStatusSync(device: DeviceConfig): NodeStatus {
val baseStatusUrl = device.statusUrl.trim() val baseStatusUrl = device.statusUrl.trim()
if (baseStatusUrl.isBlank()) { if (baseStatusUrl.isBlank()) {
return NodeStatus(isOnline = false, statusText = "NO STATUS URL") return NodeStatus(isOnline = false, statusText = "NO STATUS URL", isReachable = false)
} }
return try { return try {
@@ -226,7 +226,7 @@ class TriggerClient(
parseNodeStatus(body, it.isSuccessful) parseNodeStatus(body, it.isSuccessful)
} }
} catch (e: Exception) { } catch (e: Exception) {
NodeStatus(isOnline = false, statusText = "OFFLINE") NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false)
} }
} }
@@ -20,5 +20,6 @@ data class NodeStatus(
val onSinceIst: String? = null, val onSinceIst: String? = null,
val lastActiveAgo: String? = null, val lastActiveAgo: String? = null,
val lastActiveIst: String? = null, val lastActiveIst: String? = null,
val timestamp: Long = System.currentTimeMillis() val timestamp: Long = System.currentTimeMillis(),
val isReachable: Boolean = true
) )
@@ -1,5 +1,9 @@
package com.expapp.trigger.ui.components package com.expapp.trigger.ui.components
import android.content.Intent
import android.net.Uri
import android.os.Build
import android.provider.Settings
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.border import androidx.compose.foundation.border
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
@@ -19,7 +23,11 @@ import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Fingerprint import androidx.compose.material.icons.filled.Fingerprint
import androidx.compose.material.icons.filled.Nfc import androidx.compose.material.icons.filled.Nfc
import androidx.compose.material.icons.filled.Notifications import androidx.compose.material.icons.filled.Notifications
import androidx.compose.material.icons.filled.NotificationsActive
import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.filled.Warning
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
@@ -30,17 +38,20 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.font.FontFamily 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.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.Dialog
import com.expapp.trigger.BuildConfig import com.expapp.trigger.BuildConfig
import com.expapp.trigger.ui.theme.AmberVibrant
import com.expapp.trigger.ui.theme.BgCard import com.expapp.trigger.ui.theme.BgCard
import com.expapp.trigger.ui.theme.BgElevated import com.expapp.trigger.ui.theme.BgElevated
import com.expapp.trigger.ui.theme.BgSurface import com.expapp.trigger.ui.theme.BgSurface
import com.expapp.trigger.ui.theme.BorderSubtle import com.expapp.trigger.ui.theme.BorderSubtle
import com.expapp.trigger.ui.theme.GreenVibrant import com.expapp.trigger.ui.theme.GreenVibrant
import com.expapp.trigger.ui.theme.RedVibrant
import com.expapp.trigger.ui.theme.TextMuted import com.expapp.trigger.ui.theme.TextMuted
import com.expapp.trigger.ui.theme.TextPrimary import com.expapp.trigger.ui.theme.TextPrimary
import com.expapp.trigger.ui.theme.TextSecondary import com.expapp.trigger.ui.theme.TextSecondary
@@ -53,9 +64,14 @@ fun SettingsDialog(
onBgMonitorToggled: (Boolean) -> Unit, onBgMonitorToggled: (Boolean) -> Unit,
isBiometricAvailable: Boolean, isBiometricAvailable: Boolean,
isNfcAvailable: Boolean, isNfcAvailable: Boolean,
isNotificationPermissionGranted: Boolean,
onRequestNotificationPermission: () -> Unit,
onSendTestNotification: () -> Unit,
onOpenNfcWriter: () -> Unit, onOpenNfcWriter: () -> Unit,
onDismiss: () -> Unit onDismiss: () -> Unit
) { ) {
val context = LocalContext.current
Dialog(onDismissRequest = onDismiss) { Dialog(onDismissRequest = onDismiss) {
Surface( Surface(
modifier = Modifier.fillMaxWidth(0.95f), modifier = Modifier.fillMaxWidth(0.95f),
@@ -151,7 +167,7 @@ fun SettingsDialog(
Spacer(modifier = Modifier.height(12.dp)) Spacer(modifier = Modifier.height(12.dp))
// Background Monitor Setting // Background Monitor Setting Card
Box( Box(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
@@ -160,41 +176,118 @@ fun SettingsDialog(
.border(1.dp, BorderSubtle, RoundedCornerShape(14.dp)) .border(1.dp, BorderSubtle, RoundedCornerShape(14.dp))
.padding(14.dp) .padding(14.dp)
) { ) {
Row( Column {
modifier = Modifier.fillMaxWidth(), Row(
verticalAlignment = Alignment.CenterVertically modifier = Modifier.fillMaxWidth(),
) { verticalAlignment = Alignment.CenterVertically
Icon( ) {
Icons.Default.Notifications, Icon(
contentDescription = null, Icons.Default.Notifications,
tint = if (isBgMonitorEnabled) GreenVibrant else TextMuted, contentDescription = null,
modifier = Modifier.size(28.dp) tint = if (isBgMonitorEnabled && isNotificationPermissionGranted) GreenVibrant else TextMuted,
) modifier = Modifier.size(28.dp)
Spacer(modifier = Modifier.width(12.dp))
Column(modifier = Modifier.weight(1f)) {
Text(
"Server Status Alerts",
color = TextPrimary,
fontSize = 14.sp,
fontWeight = FontWeight.SemiBold
) )
Spacer(modifier = Modifier.height(2.dp)) Spacer(modifier = Modifier.width(12.dp))
Text( Column(modifier = Modifier.weight(1f)) {
"Notify outside app if servers go offline or online", Text(
color = TextMuted, "Server Status Alerts",
fontSize = 11.sp color = TextPrimary,
fontSize = 14.sp,
fontWeight = FontWeight.SemiBold
)
Spacer(modifier = Modifier.height(2.dp))
Text(
"Alert outside app when servers go offline or online",
color = TextMuted,
fontSize = 11.sp
)
}
Switch(
checked = isBgMonitorEnabled,
onCheckedChange = { enabled ->
if (enabled && !isNotificationPermissionGranted) {
onRequestNotificationPermission()
}
onBgMonitorToggled(enabled)
},
colors = SwitchDefaults.colors(
checkedThumbColor = GreenVibrant,
checkedTrackColor = GreenVibrant.copy(alpha = 0.3f),
uncheckedThumbColor = TextMuted,
uncheckedTrackColor = BgElevated
)
) )
} }
Switch(
checked = isBgMonitorEnabled, // Warning banner if notification permission is blocked
onCheckedChange = { onBgMonitorToggled(it) }, if (isBgMonitorEnabled && !isNotificationPermissionGranted) {
colors = SwitchDefaults.colors( Spacer(modifier = Modifier.height(10.dp))
checkedThumbColor = GreenVibrant, Box(
checkedTrackColor = GreenVibrant.copy(alpha = 0.3f), modifier = Modifier
uncheckedThumbColor = TextMuted, .fillMaxWidth()
uncheckedTrackColor = BgElevated .clip(RoundedCornerShape(8.dp))
.background(AmberVibrant.copy(alpha = 0.12f))
.border(1.dp, AmberVibrant.copy(alpha = 0.3f), RoundedCornerShape(8.dp))
.clickable {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
onRequestNotificationPermission()
} else {
val intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS).apply {
putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
}
context.startActivity(intent)
}
}
.padding(8.dp)
) {
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(
Icons.Default.Warning,
contentDescription = null,
tint = AmberVibrant,
modifier = Modifier.size(16.dp)
)
Spacer(modifier = Modifier.width(6.dp))
Text(
"Notification permission missing. Tap to enable.",
color = AmberVibrant,
fontSize = 11.sp,
fontWeight = FontWeight.Medium
)
}
}
}
// Send Test Notification button
Spacer(modifier = Modifier.height(10.dp))
Button(
onClick = {
if (!isNotificationPermissionGranted) {
onRequestNotificationPermission()
} else {
onSendTestNotification()
}
},
colors = ButtonDefaults.buttonColors(
containerColor = if (isNotificationPermissionGranted) GreenVibrant.copy(alpha = 0.15f) else AmberVibrant.copy(alpha = 0.15f)
),
shape = RoundedCornerShape(8.dp),
modifier = Modifier.fillMaxWidth()
) {
Icon(
Icons.Default.NotificationsActive,
contentDescription = null,
tint = if (isNotificationPermissionGranted) GreenVibrant else AmberVibrant,
modifier = Modifier.size(16.dp)
) )
) Spacer(modifier = Modifier.width(8.dp))
Text(
text = if (isNotificationPermissionGranted) "Send Test Notification" else "Grant Permission & Test",
color = if (isNotificationPermissionGranted) GreenVibrant else AmberVibrant,
fontSize = 12.sp,
fontWeight = FontWeight.SemiBold
)
}
} }
} }
@@ -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
)
} }
} }
} }
@@ -15,6 +15,8 @@ import androidx.compose.animation.fadeOut
import androidx.compose.animation.togetherWith import androidx.compose.animation.togetherWith
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.border import androidx.compose.foundation.border
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
@@ -29,7 +31,9 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.CloudSync import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material.icons.filled.DeleteOutline import androidx.compose.material.icons.filled.DeleteOutline
import androidx.compose.material.icons.filled.Edit import androidx.compose.material.icons.filled.Edit
import androidx.compose.material.icons.filled.PowerOff import androidx.compose.material.icons.filled.PowerOff
@@ -66,6 +70,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
@@ -116,6 +121,7 @@ fun DevicePage(
var pendingAction by remember { mutableStateOf<TriggerAction?>(null) } var pendingAction by remember { mutableStateOf<TriggerAction?>(null) }
var showDeleteConfirm by remember { mutableStateOf(false) } var showDeleteConfirm by remember { mutableStateOf(false) }
var showEditDialog by remember { mutableStateOf(false) } var showEditDialog by remember { mutableStateOf(false) }
var showMenu by remember { mutableStateOf(false) }
if (showEditDialog) { if (showEditDialog) {
var editName by remember { mutableStateOf(device.name) } var editName by remember { mutableStateOf(device.name) }
@@ -274,10 +280,12 @@ fun DevicePage(
) )
val isOnline = nodeStatus?.isOnline val isOnline = nodeStatus?.isOnline
val scrollState = rememberScrollState()
Column( Column(
modifier = modifier modifier = modifier
.fillMaxSize() .fillMaxSize()
.verticalScroll(scrollState)
.padding(horizontal = 16.dp, vertical = 8.dp), .padding(horizontal = 16.dp, vertical = 8.dp),
verticalArrangement = Arrangement.spacedBy(12.dp) verticalArrangement = Arrangement.spacedBy(12.dp)
) { ) {
@@ -313,163 +321,177 @@ 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
)
}
// Compact, non-overlapping actions: Single Refresh + Overflow Menu
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(6.dp)
) {
// Refresh button (syncs status & R2 endpoints)
IconButton(
onClick = {
if (!isCheckingStatus) {
onRefreshStatus()
onSyncConfig()
}
},
modifier = Modifier
.size(34.dp)
.clip(RoundedCornerShape(9.dp))
.background(
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.15f)
else BorderSubtle.copy(alpha = 0.25f)
)
.border(
1.dp,
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.4f)
else BorderSubtle,
RoundedCornerShape(9.dp)
)
) {
Icon(
imageVector = Icons.Default.Refresh,
contentDescription = "Refresh server",
tint = if (isCheckingStatus) GreenVibrant else TextSecondary,
modifier = Modifier
.size(17.dp)
.rotate(if (isCheckingStatus) spinAngle else 0f)
)
}
// More Options Overflow (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(
@@ -21,7 +21,7 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.History import androidx.compose.material.icons.filled.History
@@ -29,12 +29,15 @@ import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.filled.SystemUpdate import androidx.compose.material.icons.filled.SystemUpdate
import androidx.compose.material.icons.filled.Terminal import androidx.compose.material.icons.filled.Terminal
import androidx.compose.material3.TopAppBar import androidx.compose.material.pullrefresh.PullRefreshIndicator
import androidx.compose.material.pullrefresh.pullRefresh
import androidx.compose.material.pullrefresh.rememberPullRefreshState
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.DisposableEffect
@@ -89,12 +92,17 @@ 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
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class) @OptIn(
ExperimentalFoundationApi::class,
ExperimentalMaterial3Api::class,
ExperimentalMaterialApi::class
)
@Composable @Composable
fun MainScreen( fun MainScreen(
repository: DeviceRepository, repository: DeviceRepository,
@@ -102,6 +110,9 @@ fun MainScreen(
appSettings: AppSettings, appSettings: AppSettings,
historyRepository: TriggerHistoryRepository, historyRepository: TriggerHistoryRepository,
requestBiometricAuth: (title: String, subtitle: String, onResult: (Boolean) -> Unit) -> Unit = { _, _, cb -> cb(true) }, requestBiometricAuth: (title: String, subtitle: String, onResult: (Boolean) -> Unit) -> Unit = { _, _, cb -> cb(true) },
isNotificationPermissionGranted: Boolean = true,
onRequestNotificationPermission: () -> Unit = {},
onSendTestNotification: () -> Unit = {},
nfcWriteResult: Result<Unit>? = null, nfcWriteResult: Result<Unit>? = null,
onStartNfcWriting: (NfcTriggerPayload) -> Unit = {}, onStartNfcWriting: (NfcTriggerPayload) -> Unit = {},
onStopNfcWriting: () -> Unit = {}, onStopNfcWriting: () -> Unit = {},
@@ -141,36 +152,12 @@ fun MainScreen(
var isBiometricEnabled by remember { mutableStateOf(appSettings.isBiometricEnabled) } var isBiometricEnabled by remember { mutableStateOf(appSettings.isBiometricEnabled) }
var isBgMonitorEnabled by remember { mutableStateOf(appSettings.isBackgroundMonitoringEnabled) } var isBgMonitorEnabled by remember { mutableStateOf(appSettings.isBackgroundMonitoringEnabled) }
fun checkAppUpdate(showToast: Boolean = false) {
isCheckingUpdate = true
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
isCheckingUpdate = false
when (result) {
is UpdateCheckResult.UpdateAvailable -> {
availableUpdate = result.info
if (showToast || dismissedVersion != result.info.versionName) {
showUpdateDialog = true
}
}
is UpdateCheckResult.UpToDate -> {
if (showToast) {
Toast.makeText(context, "App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
}
}
is UpdateCheckResult.Error -> {
if (showToast) {
Toast.makeText(context, "Update check failed: ${result.message}", Toast.LENGTH_SHORT).show()
}
}
}
}
}
val loadingStates = remember { mutableStateMapOf<String, Boolean>() } val loadingStates = remember { mutableStateMapOf<String, Boolean>() }
val statusStates = remember { mutableStateMapOf<String, Pair<String, Boolean>>() } val statusStates = remember { mutableStateMapOf<String, Pair<String, Boolean>>() }
val nodeStatuses = remember { mutableStateMapOf<String, NodeStatus>() } val nodeStatuses = remember { mutableStateMapOf<String, NodeStatus>() }
val checkingStatusMap = remember { mutableStateMapOf<String, Boolean>() } val checkingStatusMap = remember { mutableStateMapOf<String, Boolean>() }
var isSyncing by remember { mutableStateOf(false) } var isSyncing by remember { mutableStateOf(false) }
var isPullRefreshing by remember { mutableStateOf(false) }
fun refreshStatus(device: DeviceConfig, showIndicator: Boolean = false) { fun refreshStatus(device: DeviceConfig, showIndicator: Boolean = false) {
if (showIndicator || nodeStatuses[device.id] == null) { if (showIndicator || nodeStatuses[device.id] == null) {
@@ -179,6 +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
// Only update stored status when server is actually reached
if (status.isReachable) {
appSettings.setLastStatus(device.id, status.isOnline)
}
} }
} }
@@ -211,6 +202,67 @@ fun MainScreen(
} }
} }
fun checkAppUpdate(isManual: Boolean = false) {
isCheckingUpdate = true
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
isCheckingUpdate = false
when (result) {
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()
}
}
is UpdateCheckResult.UpToDate -> {
availableUpdate = null
if (isManual) {
Toast.makeText(context, "Page refreshed • App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
}
}
is UpdateCheckResult.Error -> {
if (isManual) {
Toast.makeText(context, "Page refreshed • Update check failed", Toast.LENGTH_SHORT).show()
}
}
}
}
}
// Pull-to-refresh entire page handler
fun refreshWholePage() {
isPullRefreshing = true
dismissedVersion = null
coroutineScope.launch {
// 1. Sync R2 endpoints
syncEndpoints(showToast = false)
// 2. Poll status for all configured devices
devices.forEach { dev ->
refreshStatus(dev, showIndicator = true)
}
// 3. Explicitly check for app updates with user feedback
checkAppUpdate(isManual = true)
// 4. Update home screen widgets
ServerWidgetProvider.updateAllWidgets(context)
delay(750)
isPullRefreshing = false
}
}
val pullRefreshState = rememberPullRefreshState(
refreshing = isPullRefreshing,
onRefresh = { refreshWholePage() }
)
// Initial R2 sync and update check on launch // Initial R2 sync and update check on launch
LaunchedEffect(Unit) { LaunchedEffect(Unit) {
syncEndpoints(false) syncEndpoints(false)
@@ -239,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)
}
} }
} }
@@ -298,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,
@@ -312,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(
@@ -382,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)
) )
} }
}, },
@@ -475,49 +479,63 @@ fun MainScreen(
} }
} }
) { innerPadding -> ) { innerPadding ->
HorizontalPager( // Pull to refresh container enclosing HorizontalPager
state = pagerState, Box(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.padding(innerPadding) .padding(innerPadding)
) { page -> .pullRefresh(pullRefreshState)
if (page < devices.size) { ) {
val dev = devices[page] HorizontalPager(
DevicePage( state = pagerState,
device = dev, modifier = Modifier.fillMaxSize()
isLoading = loadingStates[dev.id] == true, ) { page ->
nodeStatus = nodeStatuses[dev.id], if (page < devices.size) {
isCheckingStatus = checkingStatusMap[dev.id] == true, val dev = devices[page]
lastStatus = statusStates[dev.id]?.first, DevicePage(
lastSuccess = statusStates[dev.id]?.second, device = dev,
onDismissStatus = { statusStates.remove(dev.id) }, isLoading = loadingStates[dev.id] == true,
onRefreshStatus = { refreshStatus(dev, showIndicator = true) }, nodeStatus = nodeStatuses[dev.id],
onTrigger = { action -> executeAction(dev, action) }, isCheckingStatus = checkingStatusMap[dev.id] == true,
onDelete = { d -> lastStatus = statusStates[dev.id]?.first,
repository.deleteDevice(d.id) lastSuccess = statusStates[dev.id]?.second,
devices = repository.getDevices() onDismissStatus = { statusStates.remove(dev.id) },
}, onRefreshStatus = { refreshStatus(dev, showIndicator = true) },
onSyncConfig = { syncEndpoints(true) }, onTrigger = { action -> executeAction(dev, action) },
onUpdateDevice = { updated -> onDelete = { d ->
repository.updateDevice(updated) repository.deleteDevice(d.id)
devices = repository.getDevices() devices = repository.getDevices()
refreshStatus(updated, showIndicator = true) },
} onSyncConfig = { syncEndpoints(true) },
) onUpdateDevice = { updated ->
} else { repository.updateDevice(updated)
AddDevicePage( devices = repository.getDevices()
triggerClient = triggerClient, refreshStatus(updated, showIndicator = true)
onDeviceAdded = { newDev ->
repository.addDevice(newDev)
devices = repository.getDevices()
refreshStatus(newDev, showIndicator = true)
coroutineScope.launch {
val idx = devices.indexOfFirst { it.id == newDev.id }
if (idx >= 0) pagerState.animateScrollToPage(idx)
} }
} )
) } else {
AddDevicePage(
triggerClient = triggerClient,
onDeviceAdded = { newDev ->
repository.addDevice(newDev)
devices = repository.getDevices()
refreshStatus(newDev, showIndicator = true)
coroutineScope.launch {
val idx = devices.indexOfFirst { it.id == newDev.id }
if (idx >= 0) pagerState.animateScrollToPage(idx)
}
}
)
}
} }
PullRefreshIndicator(
refreshing = isPullRefreshing,
state = pullRefreshState,
modifier = Modifier.align(Alignment.TopCenter),
backgroundColor = BgElevated,
contentColor = GreenVibrant
)
} }
} }
@@ -550,7 +568,6 @@ fun MainScreen(
isBgMonitorEnabled = enabled isBgMonitorEnabled = enabled
appSettings.isBackgroundMonitoringEnabled = enabled appSettings.isBackgroundMonitoringEnabled = enabled
if (enabled) { if (enabled) {
ServerMonitorWorker.createNotificationChannel(context)
ServerMonitorWorker.schedule(context) ServerMonitorWorker.schedule(context)
} else { } else {
ServerMonitorWorker.cancel(context) ServerMonitorWorker.cancel(context)
@@ -558,6 +575,9 @@ fun MainScreen(
}, },
isBiometricAvailable = BiometricHelper.isBiometricAvailable(context), isBiometricAvailable = BiometricHelper.isBiometricAvailable(context),
isNfcAvailable = NfcHelper.isNfcSupported(context), isNfcAvailable = NfcHelper.isNfcSupported(context),
isNotificationPermissionGranted = isNotificationPermissionGranted,
onRequestNotificationPermission = onRequestNotificationPermission,
onSendTestNotification = onSendTestNotification,
onOpenNfcWriter = { onOpenNfcWriter = {
showNfcWriteDialog = true showNfcWriteDialog = true
}, },
@@ -590,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,6 +24,9 @@ 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(),
@@ -103,6 +106,7 @@ class UpdateManager(
val assets = json.getAsJsonArray("assets") val assets = json.getAsJsonArray("assets")
var apkUrl: String? = null var apkUrl: String? = null
var apkApiUrl: String? = null
var apkName = "app-release.apk" var apkName = "app-release.apk"
var apkSize = 0L var apkSize = 0L
@@ -112,6 +116,7 @@ class UpdateManager(
val name = assetObj.get("name")?.asString.orEmpty() val name = assetObj.get("name")?.asString.orEmpty()
if (name.endsWith(".apk", ignoreCase = true)) { if (name.endsWith(".apk", ignoreCase = true)) {
apkUrl = assetObj.get("browser_download_url")?.asString apkUrl = assetObj.get("browser_download_url")?.asString
apkApiUrl = assetObj.get("url")?.asString
apkName = name apkName = name
apkSize = assetObj.get("size")?.asLong ?: 0L apkSize = assetObj.get("size")?.asLong ?: 0L
break break
@@ -126,6 +131,7 @@ class UpdateManager(
title = title, title = title,
changelog = changelog, changelog = changelog,
downloadUrl = apkUrl, downloadUrl = apkUrl,
assetApiUrl = apkApiUrl,
apkFileName = apkName, apkFileName = apkName,
sizeBytes = apkSize sizeBytes = apkSize
) )
@@ -162,21 +168,53 @@ class UpdateManager(
/** /**
* 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 +222,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 +256,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 +273,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 +296,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 +311,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,203 @@
package com.expapp.trigger.worker
import android.content.Context
import androidx.work.Constraints
import androidx.work.CoroutineWorker
import androidx.work.Data
import androidx.work.ExistingWorkPolicy
import androidx.work.NetworkType
import androidx.work.OneTimeWorkRequestBuilder
import androidx.work.WorkManager
import androidx.work.WorkerParameters
import com.expapp.trigger.data.model.DeviceConfig
import com.expapp.trigger.data.model.TriggerLog
import com.expapp.trigger.data.repository.AppSettings
import com.expapp.trigger.data.repository.DeviceRepository
import com.expapp.trigger.data.repository.SharedPrefsStorage
import com.expapp.trigger.data.repository.TriggerHistoryRepository
import com.expapp.trigger.network.TriggerAction
import com.expapp.trigger.network.TriggerClient
import com.expapp.trigger.widget.ServerWidgetProvider
import kotlinx.coroutines.delay
class ActionTriggerWorker(
private val appContext: Context,
workerParams: WorkerParameters
) : CoroutineWorker(appContext, workerParams) {
companion object {
const val KEY_DEVICE_ID = "device_id"
const val KEY_ACTION = "action"
const val KEY_SOURCE = "source"
/**
* Enqueues guaranteed background execution of a server power action.
* Runs even if the user immediately closes the app, locks phone, or clears recents.
*/
fun enqueue(
context: Context,
deviceId: String,
action: TriggerAction,
source: String = "App"
) {
NotificationHelper.createNotificationChannel(context)
val inputData = Data.Builder()
.putString(KEY_DEVICE_ID, deviceId)
.putString(KEY_ACTION, action.name)
.putString(KEY_SOURCE, source)
.build()
val constraints = Constraints.Builder()
.setRequiredNetworkType(NetworkType.CONNECTED)
.build()
val workRequest = OneTimeWorkRequestBuilder<ActionTriggerWorker>()
.setInputData(inputData)
.setConstraints(constraints)
.build()
WorkManager.getInstance(context).enqueueUniqueWork(
"action_trigger_${deviceId}",
ExistingWorkPolicy.REPLACE,
workRequest
)
}
}
override suspend fun doWork(): Result {
val deviceId = inputData.getString(KEY_DEVICE_ID) ?: return Result.failure()
val actionName = inputData.getString(KEY_ACTION) ?: return Result.failure()
val source = inputData.getString(KEY_SOURCE) ?: "App"
val action = try {
TriggerAction.valueOf(actionName)
} catch (e: Exception) {
return Result.failure()
}
val repository = DeviceRepository(SharedPrefsStorage(appContext))
val device = repository.getDevices().find { it.id == deviceId } ?: return Result.failure()
val actionTitle = when (action) {
TriggerAction.POWER_ON -> "Power On"
TriggerAction.REBOOT -> "Reboot"
TriggerAction.POWER_OFF -> "Shutdown"
}
val triggerClient = TriggerClient()
val historyRepo = TriggerHistoryRepository(appContext)
val appSettings = AppSettings(appContext)
// 1. Execute the HTTP trigger to the server
val response = triggerClient.sendTriggerSync(device, action)
// 2. Post notification immediately confirming the signal was sent (or failed)
val signalMsg = if (response.isSuccess) {
when (action) {
TriggerAction.POWER_ON -> "Power on signal sent successfully to ${device.name}"
TriggerAction.POWER_OFF -> "Shutdown signal sent to ${device.name}"
TriggerAction.REBOOT -> "Reboot signal sent to ${device.name}"
}
} else {
val raw = response.message.trim()
val clean = if (raw.startsWith("<")) "HTTP ${response.statusCode}" else raw.take(60)
"Failed to send $actionTitle: $clean"
}
// 3. Save to history log
historyRepo.addLog(
TriggerLog(
deviceId = device.id,
deviceName = device.name,
node = device.node,
action = action,
isSuccess = response.isSuccess,
statusCode = response.statusCode,
message = signalMsg,
source = source
)
)
// 4. Update home screen widgets
ServerWidgetProvider.updateAllWidgets(appContext)
// 5. If trigger succeeded and device has a status endpoint, actively poll until state changes!
if (response.isSuccess && device.statusUrl.isNotBlank()) {
pollForTransition(device, action, triggerClient, appSettings)
}
return Result.success()
}
private suspend fun pollForTransition(
device: DeviceConfig,
action: TriggerAction,
triggerClient: TriggerClient,
appSettings: AppSettings
) {
val maxAttempts = 15 // Up to 60 seconds (15 attempts * 4s)
var attempts = 0
// Brief delay for hardware/OS to begin reaction
delay(4000L)
while (attempts < maxAttempts) {
attempts++
val status = triggerClient.checkStatusSync(device)
// If phone network is unavailable, do not misinterpret as server going offline
if (!status.isReachable) {
delay(4000L)
continue
}
when (action) {
TriggerAction.POWER_ON -> {
if (status.isOnline) {
appSettings.setLastStatus(device.id, true)
NotificationHelper.sendNotification(
context = appContext,
id = device.id.hashCode(),
title = "✅ Server Online: ${device.name}",
message = "${device.name} is now online and reachable!",
isSuccess = true
)
ServerWidgetProvider.updateAllWidgets(appContext)
return
}
}
TriggerAction.POWER_OFF -> {
if (!status.isOnline) {
appSettings.setLastStatus(device.id, false)
NotificationHelper.sendNotification(
context = appContext,
id = device.id.hashCode(),
title = "🛑 Server Offline: ${device.name}",
message = "${device.name} has shut down and is now offline.",
isSuccess = false
)
ServerWidgetProvider.updateAllWidgets(appContext)
return
}
}
TriggerAction.REBOOT -> {
if (attempts >= 2 && status.isOnline) {
appSettings.setLastStatus(device.id, true)
NotificationHelper.sendNotification(
context = appContext,
id = device.id.hashCode(),
title = "✅ Reboot Complete: ${device.name}",
message = "${device.name} successfully rebooted and is back online!",
isSuccess = true
)
ServerWidgetProvider.updateAllWidgets(appContext)
return
}
}
}
delay(4000L)
}
}
}
@@ -0,0 +1,108 @@
package com.expapp.trigger.worker
import android.app.Notification
import android.app.NotificationChannel
import android.app.NotificationManager
import android.app.PendingIntent
import android.content.Context
import android.content.Intent
import android.graphics.Color
import android.os.Build
import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat
import com.expapp.trigger.MainActivity
import com.expapp.trigger.R
object NotificationHelper {
const val CHANNEL_ID = "server_status_channel"
const val CHANNEL_NAME = "Server Status Alerts"
fun areNotificationsEnabled(context: Context): Boolean {
return NotificationManagerCompat.from(context).areNotificationsEnabled()
}
fun createNotificationChannel(context: Context) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
val channel = NotificationChannel(
CHANNEL_ID,
CHANNEL_NAME,
NotificationManager.IMPORTANCE_HIGH
).apply {
description = "Alerts when your servers go offline or come back online"
enableVibration(true)
vibrationPattern = longArrayOf(0, 300, 200, 300)
enableLights(true)
lightColor = Color.GREEN
lockscreenVisibility = Notification.VISIBILITY_PUBLIC
}
val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
manager.createNotificationChannel(channel)
}
}
fun sendNotification(
context: Context,
id: Int,
title: String,
message: String,
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,
id,
intent,
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
)
val accentColor = if (isSuccess) 0xFF22C55E.toInt() else 0xFFFF4757.toInt()
val notification = NotificationCompat.Builder(context, CHANNEL_ID)
.setSmallIcon(R.drawable.ic_notification)
.setColor(accentColor)
.setContentTitle(title)
.setContentText(message)
.setStyle(NotificationCompat.BigTextStyle().bigText(message))
.setPriority(NotificationCompat.PRIORITY_MAX)
.setDefaults(NotificationCompat.DEFAULT_ALL)
.setAutoCancel(true)
.setContentIntent(pendingIntent)
.build()
return try {
NotificationManagerCompat.from(context).notify(id, notification)
true
} catch (e: SecurityException) {
false
}
}
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,
id = 9999,
title = "🔔 Test Alert: Notifications Working",
message = "Server status notifications are properly configured and working on this device!",
isSuccess = true
)
}
}
@@ -1,22 +1,15 @@
package com.expapp.trigger.worker package com.expapp.trigger.worker
import android.app.NotificationChannel
import android.app.NotificationManager
import android.app.PendingIntent
import android.content.Context import android.content.Context
import android.content.Intent
import android.os.Build
import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat
import androidx.work.Constraints import androidx.work.Constraints
import androidx.work.CoroutineWorker import androidx.work.CoroutineWorker
import androidx.work.ExistingPeriodicWorkPolicy import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.ExistingWorkPolicy
import androidx.work.NetworkType import androidx.work.NetworkType
import androidx.work.OneTimeWorkRequestBuilder
import androidx.work.PeriodicWorkRequestBuilder import androidx.work.PeriodicWorkRequestBuilder
import androidx.work.WorkManager import androidx.work.WorkManager
import androidx.work.WorkerParameters import androidx.work.WorkerParameters
import com.expapp.trigger.MainActivity
import com.expapp.trigger.R
import com.expapp.trigger.data.repository.AppSettings import com.expapp.trigger.data.repository.AppSettings
import com.expapp.trigger.data.repository.DeviceRepository import com.expapp.trigger.data.repository.DeviceRepository
import com.expapp.trigger.data.repository.SharedPrefsStorage import com.expapp.trigger.data.repository.SharedPrefsStorage
@@ -30,9 +23,11 @@ class ServerMonitorWorker(
companion object { companion object {
const val WORK_NAME = "server_status_periodic_monitor" const val WORK_NAME = "server_status_periodic_monitor"
const val CHANNEL_ID = "server_status_channel" const val ONE_TIME_WORK_NAME = "server_status_one_time_check"
fun schedule(context: Context, repeatIntervalMinutes: Long = 15) { fun schedule(context: Context, repeatIntervalMinutes: Long = 15) {
NotificationHelper.createNotificationChannel(context)
val constraints = Constraints.Builder() val constraints = Constraints.Builder()
.setRequiredNetworkType(NetworkType.CONNECTED) .setRequiredNetworkType(NetworkType.CONNECTED)
.build() .build()
@@ -46,28 +41,36 @@ class ServerMonitorWorker(
WorkManager.getInstance(context).enqueueUniquePeriodicWork( WorkManager.getInstance(context).enqueueUniquePeriodicWork(
WORK_NAME, WORK_NAME,
ExistingPeriodicWorkPolicy.KEEP, ExistingPeriodicWorkPolicy.UPDATE,
workRequest workRequest
) )
} }
fun runOnce(context: Context) {
NotificationHelper.createNotificationChannel(context)
val constraints = Constraints.Builder()
.setRequiredNetworkType(NetworkType.CONNECTED)
.build()
val oneTimeRequest = OneTimeWorkRequestBuilder<ServerMonitorWorker>()
.setConstraints(constraints)
.build()
WorkManager.getInstance(context).enqueueUniqueWork(
ONE_TIME_WORK_NAME,
ExistingWorkPolicy.REPLACE,
oneTimeRequest
)
}
fun cancel(context: Context) { fun cancel(context: Context) {
WorkManager.getInstance(context).cancelUniqueWork(WORK_NAME) WorkManager.getInstance(context).cancelUniqueWork(WORK_NAME)
WorkManager.getInstance(context).cancelUniqueWork(ONE_TIME_WORK_NAME)
} }
fun createNotificationChannel(context: Context) { fun createNotificationChannel(context: Context) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { NotificationHelper.createNotificationChannel(context)
val channel = NotificationChannel(
CHANNEL_ID,
"Server Status Alerts",
NotificationManager.IMPORTANCE_HIGH
).apply {
description = "Alerts when your servers go offline or come back online"
enableVibration(true)
}
val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
manager.createNotificationChannel(channel)
}
} }
} }
@@ -77,8 +80,6 @@ class ServerMonitorWorker(
return Result.success() return Result.success()
} }
createNotificationChannel(appContext)
val repository = DeviceRepository(SharedPrefsStorage(appContext)) val repository = DeviceRepository(SharedPrefsStorage(appContext))
val devices = repository.getDevices() val devices = repository.getDevices()
if (devices.isEmpty()) { if (devices.isEmpty()) {
@@ -91,53 +92,52 @@ class ServerMonitorWorker(
if (device.statusUrl.isBlank()) continue if (device.statusUrl.isBlank()) continue
val status = triggerClient.checkStatusSync(device) val status = triggerClient.checkStatusSync(device)
// If the endpoint could not be reached (e.g. phone has no internet / network failure),
// do NOT treat this as the server going offline. Maintain the last known state.
if (!status.isReachable) {
continue
}
val previousStatus = appSettings.getLastStatus(device.id) val previousStatus = appSettings.getLastStatus(device.id)
// Save new status // Save new status
appSettings.setLastStatus(device.id, status.isOnline) appSettings.setLastStatus(device.id, status.isOnline)
// If we have a prior status recorded and it flipped, notify // Determine if notification is needed only when server actually transitions
if (previousStatus != null && previousStatus != status.isOnline) { if (previousStatus != null && previousStatus != status.isOnline) {
sendNotification( NotificationHelper.sendNotification(
device.id.hashCode(), context = appContext,
if (status.isOnline) "✅ Server Back Online" else "⚠️ Server Offline", id = device.id.hashCode(),
if (status.isOnline) { title = if (status.isOnline) "✅ Server Back Online" else "⚠️ Server Offline",
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
) )
} }
} }
// Check for app updates in the background and notify if a new update is found
try {
val updateManager = com.expapp.trigger.update.UpdateManager(appContext)
val currentVersion = com.expapp.trigger.BuildConfig.VERSION_NAME
updateManager.checkForUpdate(currentVersion) { result ->
if (result is com.expapp.trigger.update.UpdateCheckResult.UpdateAvailable) {
val newVer = result.info.versionName
val lastNotified = appSettings.lastNotifiedUpdateVersion
if (lastNotified != newVer) {
appSettings.lastNotifiedUpdateVersion = newVer
NotificationHelper.sendUpdateAvailableNotification(appContext, newVer)
}
}
}
} catch (_: Exception) {
// Ignore background check failure
}
return Result.success() return Result.success()
} }
private fun sendNotification(id: Int, title: String, message: String) {
val intent = Intent(appContext, MainActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
}
val pendingIntent = PendingIntent.getActivity(
appContext,
id,
intent,
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
)
val notification = NotificationCompat.Builder(appContext, CHANNEL_ID)
.setSmallIcon(R.mipmap.ic_launcher)
.setContentTitle(title)
.setContentText(message)
.setStyle(NotificationCompat.BigTextStyle().bigText(message))
.setPriority(NotificationCompat.PRIORITY_HIGH)
.setAutoCancel(true)
.setContentIntent(pendingIntent)
.build()
try {
NotificationManagerCompat.from(appContext).notify(id, notification)
} catch (e: SecurityException) {
// Android 13+ permission might not be granted yet
}
}
} }
@@ -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>
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#ffffff"
android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM18,16v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
</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>
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#0B0F19</color>
</resources>