Compare commits

...
4 Commits
Author SHA1 Message Date
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
15 changed files with 588 additions and 273 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 = 5 versionCode = 9
versionName = "1.1.1" versionName = "1.1.5"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
@@ -38,6 +38,7 @@ import com.expapp.trigger.ui.screens.MainScreen
import com.expapp.trigger.ui.theme.DarkBackground import com.expapp.trigger.ui.theme.DarkBackground
import com.expapp.trigger.ui.theme.ExpAppTheme import com.expapp.trigger.ui.theme.ExpAppTheme
import com.expapp.trigger.widget.ServerWidgetProvider import com.expapp.trigger.widget.ServerWidgetProvider
import com.expapp.trigger.worker.ActionTriggerWorker
import com.expapp.trigger.worker.NotificationHelper import com.expapp.trigger.worker.NotificationHelper
import com.expapp.trigger.worker.ServerMonitorWorker import com.expapp.trigger.worker.ServerMonitorWorker
@@ -91,6 +92,25 @@ class MainActivity : FragmentActivity() {
enableEdgeToEdge() enableEdgeToEdge()
repository = DeviceRepository(SharedPrefsStorage(applicationContext)) repository = DeviceRepository(SharedPrefsStorage(applicationContext))
val settingsPrefs = getSharedPreferences("app_settings_prefs", Context.MODE_PRIVATE)
val hasSeeded = settingsPrefs.getBoolean("has_seeded_default_device", false)
if (!hasSeeded) {
settingsPrefs.edit().putBoolean("has_seeded_default_device", true).apply()
if (repository.getDevices().isEmpty()) {
val defaultDevice = DeviceConfig(
id = "2dc98ae9-9f71-4f29-95a6-a59ac94d7bf6",
name = "Server",
node = "debian",
powerOffUrl = "https://cosmos.linuxguy.space/poweroff?node=debian",
powerOnUrl = "https://trigger.macrodroid.com/87f2f62c-09ee-43cb-8796-fd1a6465754b/wakeserver",
r2Url = "https://bucket.linuxguy.space/home-server-app/endpoints.json",
rebootUrl = "https://cosmos.linuxguy.space/reboot?node=debian",
secretKey = "Carbon@12",
statusUrl = "https://cosmos.linuxguy.space/status?node=debian"
)
repository.addDevice(defaultDevice)
}
}
triggerClient = TriggerClient() triggerClient = TriggerClient()
appSettings = AppSettings(applicationContext) appSettings = AppSettings(applicationContext)
historyRepository = TriggerHistoryRepository(applicationContext) historyRepository = TriggerHistoryRepository(applicationContext)
@@ -246,27 +266,7 @@ class MainActivity : FragmentActivity() {
val onAuthorized = { val onAuthorized = {
vibrateFeedback(true) vibrateFeedback(true)
Toast.makeText(this, "Sending $actionName signal to ${device.name}...", Toast.LENGTH_SHORT).show() Toast.makeText(this, "Sending $actionName signal to ${device.name}...", Toast.LENGTH_SHORT).show()
triggerClient.sendTrigger(device, action) { response -> ActionTriggerWorker.enqueue(this, device.id, action, source)
val msg = if (response.isSuccess) {
"$actionName signal sent successfully"
} else {
"Failed: ${response.message.take(50)}"
}
Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
historyRepository.addLog(
TriggerLog(
deviceId = device.id,
deviceName = device.name,
node = device.node,
action = action,
isSuccess = response.isSuccess,
statusCode = response.statusCode,
message = response.message,
source = source
)
)
ServerWidgetProvider.updateAllWidgets(this)
}
} }
if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(this)) { if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(this)) {
@@ -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,8 +220,8 @@ fun UpdateDialog(
) )
} }
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
if (downloadState.bytesDownloaded == 0L && downloadState.progressPercent == 0) {
LinearProgressIndicator( LinearProgressIndicator(
progress = { downloadState.progressPercent / 100f },
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.height(8.dp) .height(8.dp)
@@ -229,6 +229,17 @@ fun UpdateDialog(
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
)
} }
} }
} }
@@ -68,6 +68,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
@@ -317,22 +318,17 @@ fun DevicePage(
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 20.dp, vertical = 18.dp) .padding(horizontal = 18.dp, vertical = 16.dp)
) { ) {
// Title row // Title row
Row( Row(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically
horizontalArrangement = Arrangement.SpaceBetween
) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.weight(1f)
) { ) {
Box( Box(
modifier = Modifier modifier = Modifier
.size(48.dp) .size(44.dp)
.clip(RoundedCornerShape(14.dp)) .clip(RoundedCornerShape(12.dp))
.background( .background(
Brush.radialGradient( Brush.radialGradient(
listOf( listOf(
@@ -352,7 +348,7 @@ fun DevicePage(
false -> RedVibrant.copy(alpha = 0.25f) false -> RedVibrant.copy(alpha = 0.25f)
null -> BorderSubtle null -> BorderSubtle
}, },
RoundedCornerShape(14.dp) RoundedCornerShape(12.dp)
), ),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
@@ -364,74 +360,82 @@ fun DevicePage(
false -> RedVibrant.copy(alpha = 0.6f) false -> RedVibrant.copy(alpha = 0.6f)
null -> TextSecondary null -> TextSecondary
}, },
modifier = Modifier.size(22.dp) modifier = Modifier.size(20.dp)
) )
} }
Spacer(modifier = Modifier.width(14.dp)) Spacer(modifier = Modifier.width(10.dp))
Column { Column(
modifier = Modifier
.weight(1f)
.padding(end = 6.dp)
) {
Text( Text(
text = device.name, text = device.name,
fontSize = 20.sp, fontSize = 18.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = TextPrimary, color = TextPrimary,
maxLines = 1 maxLines = 1,
overflow = TextOverflow.Ellipsis
) )
Spacer(modifier = Modifier.height(2.dp))
Text( Text(
text = device.node, text = device.node,
fontSize = 11.sp, fontSize = 11.sp,
color = TextMuted, color = TextMuted,
fontFamily = FontFamily.Monospace, fontFamily = FontFamily.Monospace,
letterSpacing = 0.5.sp letterSpacing = 0.5.sp,
maxLines = 1,
overflow = TextOverflow.Ellipsis
) )
} }
}
// Action buttons in a fixed non-shrinking Row
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(4.dp)
) {
// Re-fetch R2 JSON config button // Re-fetch R2 JSON config button
IconButton( IconButton(
onClick = onSyncConfig, onClick = onSyncConfig,
modifier = Modifier modifier = Modifier
.size(36.dp) .size(34.dp)
.clip(RoundedCornerShape(10.dp)) .clip(RoundedCornerShape(9.dp))
.background(AmberVibrant.copy(alpha = 0.08f)) .background(AmberVibrant.copy(alpha = 0.08f))
.border(1.dp, AmberVibrant.copy(alpha = 0.2f), RoundedCornerShape(10.dp)) .border(1.dp, AmberVibrant.copy(alpha = 0.2f), RoundedCornerShape(9.dp))
) { ) {
Icon( Icon(
imageVector = Icons.Default.CloudSync, imageVector = Icons.Default.CloudSync,
contentDescription = "Re-fetch R2 JSON", contentDescription = "Re-fetch R2 JSON",
tint = AmberVibrant, tint = AmberVibrant,
modifier = Modifier.size(18.dp) modifier = Modifier.size(17.dp)
) )
} }
Spacer(modifier = Modifier.width(6.dp))
// Edit device button // Edit device button
IconButton( IconButton(
onClick = { showEditDialog = true }, onClick = { showEditDialog = true },
modifier = Modifier modifier = Modifier
.size(36.dp) .size(34.dp)
.clip(RoundedCornerShape(10.dp)) .clip(RoundedCornerShape(9.dp))
.background(BorderSubtle.copy(alpha = 0.3f)) .background(BorderSubtle.copy(alpha = 0.3f))
.border(1.dp, BorderSubtle, RoundedCornerShape(10.dp)) .border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
) { ) {
Icon( Icon(
imageVector = Icons.Default.Edit, imageVector = Icons.Default.Edit,
contentDescription = "Edit device", contentDescription = "Edit device",
tint = TextSecondary, tint = TextSecondary,
modifier = Modifier.size(18.dp) modifier = Modifier.size(17.dp)
) )
} }
Spacer(modifier = Modifier.width(6.dp))
// Refresh button (spins while checking) // Refresh button (spins while checking)
IconButton( IconButton(
onClick = { if (!isCheckingStatus) onRefreshStatus() }, onClick = { if (!isCheckingStatus) onRefreshStatus() },
modifier = Modifier modifier = Modifier
.size(36.dp) .size(34.dp)
.clip(RoundedCornerShape(10.dp)) .clip(RoundedCornerShape(9.dp))
.background( .background(
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.12f) if (isCheckingStatus) GreenVibrant.copy(alpha = 0.12f)
else BorderSubtle.copy(alpha = 0.3f) else BorderSubtle.copy(alpha = 0.3f)
@@ -440,7 +444,7 @@ fun DevicePage(
1.dp, 1.dp,
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.3f) if (isCheckingStatus) GreenVibrant.copy(alpha = 0.3f)
else BorderSubtle, else BorderSubtle,
RoundedCornerShape(10.dp) RoundedCornerShape(9.dp)
) )
) { ) {
Icon( Icon(
@@ -448,30 +452,29 @@ fun DevicePage(
contentDescription = "Refresh status", contentDescription = "Refresh status",
tint = if (isCheckingStatus) GreenVibrant else TextMuted, tint = if (isCheckingStatus) GreenVibrant else TextMuted,
modifier = Modifier modifier = Modifier
.size(18.dp) .size(17.dp)
.rotate(if (isCheckingStatus) spinAngle else 0f) .rotate(if (isCheckingStatus) spinAngle else 0f)
) )
} }
Spacer(modifier = Modifier.width(8.dp))
// Delete button // Delete button
IconButton( IconButton(
onClick = { showDeleteConfirm = true }, onClick = { showDeleteConfirm = true },
modifier = Modifier modifier = Modifier
.size(36.dp) .size(34.dp)
.clip(RoundedCornerShape(10.dp)) .clip(RoundedCornerShape(9.dp))
.background(RedVibrant.copy(alpha = 0.08f)) .background(RedVibrant.copy(alpha = 0.08f))
.border(1.dp, RedVibrant.copy(alpha = 0.15f), RoundedCornerShape(10.dp)) .border(1.dp, RedVibrant.copy(alpha = 0.15f), RoundedCornerShape(9.dp))
) { ) {
Icon( Icon(
imageVector = Icons.Default.DeleteOutline, imageVector = Icons.Default.DeleteOutline,
contentDescription = "Remove device", contentDescription = "Remove device",
tint = RedVibrant.copy(alpha = 0.7f), tint = RedVibrant.copy(alpha = 0.7f),
modifier = Modifier.size(18.dp) modifier = Modifier.size(17.dp)
) )
} }
} }
}
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(16.dp))
@@ -92,6 +92,7 @@ import com.expapp.trigger.update.ReleaseInfo
import com.expapp.trigger.update.UpdateCheckResult import com.expapp.trigger.update.UpdateCheckResult
import com.expapp.trigger.update.UpdateManager import com.expapp.trigger.update.UpdateManager
import com.expapp.trigger.widget.ServerWidgetProvider import com.expapp.trigger.widget.ServerWidgetProvider
import com.expapp.trigger.worker.ActionTriggerWorker
import com.expapp.trigger.worker.ServerMonitorWorker import com.expapp.trigger.worker.ServerMonitorWorker
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.isActive import kotlinx.coroutines.isActive
@@ -199,25 +200,27 @@ fun MainScreen(
} }
} }
fun checkAppUpdate(showToast: Boolean = false) { fun checkAppUpdate(isManual: Boolean = false) {
isCheckingUpdate = true isCheckingUpdate = true
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result -> updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
isCheckingUpdate = false isCheckingUpdate = false
when (result) { when (result) {
is UpdateCheckResult.UpdateAvailable -> { is UpdateCheckResult.UpdateAvailable -> {
availableUpdate = result.info availableUpdate = result.info
if (showToast || dismissedVersion != result.info.versionName) {
showUpdateDialog = true showUpdateDialog = true
if (isManual) {
Toast.makeText(context, "New update available: v${result.info.versionName}!", Toast.LENGTH_SHORT).show()
} }
} }
is UpdateCheckResult.UpToDate -> { is UpdateCheckResult.UpToDate -> {
if (showToast) { availableUpdate = null
Toast.makeText(context, "App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show() if (isManual) {
Toast.makeText(context, "Page refreshed • App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
} }
} }
is UpdateCheckResult.Error -> { is UpdateCheckResult.Error -> {
if (showToast) { if (isManual) {
Toast.makeText(context, "Update check failed: ${result.message}", Toast.LENGTH_SHORT).show() Toast.makeText(context, "Page refreshed • Update check failed", Toast.LENGTH_SHORT).show()
} }
} }
} }
@@ -227,6 +230,7 @@ fun MainScreen(
// Pull-to-refresh entire page handler // Pull-to-refresh entire page handler
fun refreshWholePage() { fun refreshWholePage() {
isPullRefreshing = true isPullRefreshing = true
dismissedVersion = null
coroutineScope.launch { coroutineScope.launch {
// 1. Sync R2 endpoints // 1. Sync R2 endpoints
syncEndpoints(showToast = false) syncEndpoints(showToast = false)
@@ -236,15 +240,14 @@ fun MainScreen(
refreshStatus(dev, showIndicator = true) refreshStatus(dev, showIndicator = true)
} }
// 3. Check for app updates // 3. Explicitly check for app updates with user feedback
checkAppUpdate(showToast = false) checkAppUpdate(isManual = true)
// 4. Update home screen widgets // 4. Update home screen widgets
ServerWidgetProvider.updateAllWidgets(context) ServerWidgetProvider.updateAllWidgets(context)
delay(750) delay(750)
isPullRefreshing = false isPullRefreshing = false
Toast.makeText(context, "Page refreshed", Toast.LENGTH_SHORT).show()
} }
} }
@@ -281,45 +284,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,
deviceName = device.name,
node = device.node,
action = action,
isSuccess = response.isSuccess,
statusCode = response.statusCode,
message = msg,
source = "App"
)
)
historyLogs = historyRepository.getLogs()
// Update home screen widgets
ServerWidgetProvider.updateAllWidgets(context)
// In foreground, refresh UI smoothly after short intervals if user stays in the app
coroutineScope.launch { coroutineScope.launch {
delay(1500); refreshStatus(device, showIndicator = true) delay(2000)
delay(4000); refreshStatus(device) refreshStatus(device, showIndicator = true)
delay(5000); refreshStatus(device) historyLogs = historyRepository.getLogs()
} loadingStates[device.id] = false
delay(3000)
refreshStatus(device, showIndicator = false)
historyLogs = historyRepository.getLogs()
delay(4000)
refreshStatus(device, showIndicator = false)
} }
} }
@@ -648,10 +628,29 @@ 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
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 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 ->
showUpdateDialog = false showUpdateDialog = false
@@ -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) {
response.close()
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
// Fallback to direct asset API
startDownloadCall(fallbackUrl, null, expectedSizeBytes, isFallback = true, onProgress)
} else {
runOnMain { runOnMain {
onProgress(DownloadState.Failed("Server returned HTTP ${response.code}")) 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,15 +296,23 @@ class UpdateManager(
} }
} }
if (apkFile.exists() && apkFile.length() > 0) {
runOnMain { runOnMain {
onProgress(DownloadState.ReadyToInstall(apkFile)) 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()) {
runOnMain { runOnMain {
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,218 @@
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"
}
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(
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)
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,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group
android:translateX="27.6"
android:translateY="27.6"
android:scaleX="2.2"
android:scaleY="2.2">
<path
android:fillColor="#22C55E"
android:pathData="M20,4H4C2.89,4 2,4.9 2,6v12c0,1.1 0.89,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18H4V8h16V18zM6.5,16.5l3.5,-3.5L6.5,9.5L7.91,8.09L12.83,13l-4.92,4.91L6.5,16.5zM12,15h5v2h-5V15z"/>
</group>
</vector>
@@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group
android:translateX="27.6"
android:translateY="27.6"
android:scaleX="2.2"
android:scaleY="2.2">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M20,4H4C2.89,4 2,4.9 2,6v12c0,1.1 0.89,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18H4V8h16V18zM6.5,16.5l3.5,-3.5L6.5,9.5L7.91,8.09L12.83,13l-4.92,4.91L6.5,16.5zM12,15h5v2h-5V15z"/>
</group>
</vector>
@@ -25,12 +25,13 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="6dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/widget_device_name" android:id="@+id/widget_device_name"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
@@ -41,7 +42,7 @@
<TextView <TextView
android:id="@+id/widget_node_name" android:id="@+id/widget_node_name"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
</adaptive-icon>
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
</adaptive-icon>
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#0B0F19</color>
</resources>