Compare commits

...
6 Commits
Author SHA1 Message Date
Vaishno Singh a897236b90 fix(widget): self-contained 1-tap widget control without opening app & pixel-perfect UI (v1.2.4)
Build & Release Android APK / Build & Publish Release APK (push) Canceled after 1m24s
2026-11-19 22:15:40 +05:30
Vaishno Singh 1ef05a04cb fix(update): query both forge & github simultaneously to pick newest release
Build & Release Android APK / Build & Publish Release APK (push) Successful in 2m44s
2026-11-19 21:54:09 +05:30
Vaishno Singh 5c66f6c4dc fix(widget): fix 'Failed to load widget' by replacing View with FrameLayout, removing theme attrs & using PNG drawables (v1.2.3)
Build & Release Android APK / Build & Publish Release APK (push) Failing after 1m28s
2026-11-19 21:52:09 +05:30
Vaishno Singh 153bf3598d fix(update): reliable background update notifications, dedicated AppUpdateWorker, intent handling (v1.2.2)
Build & Release Android APK / Build & Publish Release APK (push) Failing after 3m26s
2026-11-19 18:36:06 +05:30
Vaishno Singh 61e2b2445b fix(notifications): instant state transition polling, 2-stage verification to prevent false positives (v1.2.1)
Build & Release Android APK / Build & Publish Release APK (push) Failing after 3m28s
2026-11-19 17:56:34 +05:30
Vaishno Singh 2f38ea7dcc feat(update,notifications): fetch updates from forge.linuxguy.space with github fallback, refine notifications, disable reboot alerts (v1.2.0)
Build & Release Android APK / Build & Publish Release APK (push) Successful in 9m48s
2026-11-19 15:06:15 +05:30
29 changed files with 895 additions and 267 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 = 13 versionCode = 18
versionName = "1.1.9" versionName = "1.2.4"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
+9
View File
@@ -60,6 +60,15 @@
android:name=".update.InstallStatusReceiver" android:name=".update.InstallStatusReceiver"
android:exported="false" /> android:exported="false" />
<!-- Transparent Widget Biometric Auth Activity (Floating Prompt on Launcher) -->
<activity
android:name=".widget.WidgetAuthActivity"
android:exported="false"
android:theme="@style/Theme.WidgetAuth"
android:excludeFromRecents="true"
android:noHistory="true"
android:launchMode="singleInstance" />
<!-- Home Screen Widget --> <!-- Home Screen Widget -->
<receiver <receiver
android:name=".widget.ServerWidgetProvider" android:name=".widget.ServerWidgetProvider"
@@ -39,6 +39,7 @@ 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.ActionTriggerWorker
import com.expapp.trigger.worker.AppUpdateWorker
import com.expapp.trigger.worker.NotificationHelper import com.expapp.trigger.worker.NotificationHelper
import com.expapp.trigger.worker.ServerMonitorWorker import com.expapp.trigger.worker.ServerMonitorWorker
@@ -62,6 +63,7 @@ class MainActivity : FragmentActivity() {
NotificationHelper.createNotificationChannel(this) NotificationHelper.createNotificationChannel(this)
if (appSettings.isBackgroundMonitoringEnabled) { if (appSettings.isBackgroundMonitoringEnabled) {
ServerMonitorWorker.schedule(this) ServerMonitorWorker.schedule(this)
AppUpdateWorker.schedule(this)
} }
onNotificationPermissionGrantedCallback?.invoke() onNotificationPermissionGrantedCallback?.invoke()
} else { } else {
@@ -127,9 +129,10 @@ class MainActivity : FragmentActivity() {
} }
} }
// Initialize background server monitoring // Initialize background server monitoring & update checks
if (appSettings.isBackgroundMonitoringEnabled) { if (appSettings.isBackgroundMonitoringEnabled) {
ServerMonitorWorker.schedule(this) ServerMonitorWorker.schedule(this)
AppUpdateWorker.schedule(this)
} }
// Handle initial launch intent (from NFC or Widget) // Handle initial launch intent (from NFC or Widget)
@@ -195,10 +198,12 @@ class MainActivity : FragmentActivity() {
override fun onStop() { override fun onStop() {
super.onStop() super.onStop()
// When leaving the app, trigger an immediate one-time check & ensure worker is scheduled // When leaving the app, trigger an immediate one-time check & ensure workers are scheduled
if (appSettings.isBackgroundMonitoringEnabled) { if (appSettings.isBackgroundMonitoringEnabled) {
ServerMonitorWorker.runOnce(this) ServerMonitorWorker.runOnce(this)
ServerMonitorWorker.schedule(this) ServerMonitorWorker.schedule(this)
AppUpdateWorker.runOnce(this)
AppUpdateWorker.schedule(this)
} }
} }
@@ -267,6 +272,9 @@ class MainActivity : FragmentActivity() {
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()
ActionTriggerWorker.enqueue(this, device.id, action, source) ActionTriggerWorker.enqueue(this, device.id, action, source)
if (source == "Widget") {
finish()
}
} }
if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(this)) { if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(this)) {
@@ -277,9 +285,14 @@ class MainActivity : FragmentActivity() {
) { success, errorMsg -> ) { success, errorMsg ->
if (success) { if (success) {
onAuthorized() onAuthorized()
} else if (errorMsg != null) { } else {
if (errorMsg != null) {
Toast.makeText(this, "Authentication cancelled", Toast.LENGTH_SHORT).show() Toast.makeText(this, "Authentication cancelled", Toast.LENGTH_SHORT).show()
} }
if (source == "Widget") {
finish()
}
}
} }
} else { } else {
onAuthorized() onAuthorized()
@@ -8,6 +8,7 @@ class AppSettings(private val storage: KeyValueStorage) {
companion object { companion object {
private const val KEY_BIOMETRIC_ENABLED = "key_biometric_enabled" private const val KEY_BIOMETRIC_ENABLED = "key_biometric_enabled"
private const val KEY_WIDGET_BIOMETRIC_ENABLED = "key_widget_biometric_enabled"
private const val KEY_BG_MONITOR_ENABLED = "key_bg_monitor_enabled" private const val KEY_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" private const val KEY_LAST_NOTIFIED_VERSION = "key_last_notified_version"
@@ -24,6 +25,10 @@ class AppSettings(private val storage: KeyValueStorage) {
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)
var isWidgetBiometricEnabled: Boolean
get() = storage.getBoolean(KEY_WIDGET_BIOMETRIC_ENABLED, false)
set(value) = storage.putBoolean(KEY_WIDGET_BIOMETRIC_ENABLED, value)
var isBackgroundMonitoringEnabled: Boolean var isBackgroundMonitoringEnabled: Boolean
get() = storage.getBoolean(KEY_BG_MONITOR_ENABLED, true) get() = storage.getBoolean(KEY_BG_MONITOR_ENABLED, true)
set(value) = storage.putBoolean(KEY_BG_MONITOR_ENABLED, value) set(value) = storage.putBoolean(KEY_BG_MONITOR_ENABLED, value)
@@ -181,7 +181,7 @@ class TriggerClient(
val baseStatusUrl = device.statusUrl.trim() val baseStatusUrl = device.statusUrl.trim()
if (baseStatusUrl.isBlank()) { if (baseStatusUrl.isBlank()) {
runOnMain { runOnMain {
callback(NodeStatus(isOnline = false, statusText = "NO STATUS URL")) callback(NodeStatus(isOnline = false, statusText = "NO STATUS URL", isReachable = false))
} }
return return
} }
@@ -190,7 +190,7 @@ class TriggerClient(
Request.Builder().url(baseStatusUrl).get().build() Request.Builder().url(baseStatusUrl).get().build()
} catch (e: Exception) { } catch (e: Exception) {
runOnMain { runOnMain {
callback(NodeStatus(isOnline = false, statusText = "INVALID URL")) callback(NodeStatus(isOnline = false, statusText = "INVALID URL", isReachable = false))
} }
return return
} }
@@ -205,7 +205,7 @@ class TriggerClient(
override fun onResponse(call: Call, response: Response) { override fun onResponse(call: Call, response: Response) {
val nodeStatus = response.use { val nodeStatus = response.use {
val body = it.body?.string().orEmpty().trim() val body = it.body?.string().orEmpty().trim()
parseNodeStatus(body, it.isSuccessful) parseNodeStatus(body, it.isSuccessful, device.node)
} }
runOnMain { callback(nodeStatus) } runOnMain { callback(nodeStatus) }
} }
@@ -223,22 +223,50 @@ class TriggerClient(
val response = client.newCall(request).execute() val response = client.newCall(request).execute()
response.use { response.use {
val body = it.body?.string().orEmpty().trim() val body = it.body?.string().orEmpty().trim()
parseNodeStatus(body, it.isSuccessful) parseNodeStatus(body, it.isSuccessful, device.node)
} }
} catch (e: Exception) { } catch (e: Exception) {
NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false) NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false)
} }
} }
private fun parseNodeStatus(body: String, isHttpSuccess: Boolean): NodeStatus { private fun parseNodeStatus(body: String, isHttpSuccess: Boolean, targetNode: String = ""): NodeStatus {
if (body.startsWith("{")) { if (body.startsWith("{")) {
return try { return try {
val json = com.google.gson.JsonParser.parseString(body).asJsonObject val rootJson = com.google.gson.JsonParser.parseString(body).asJsonObject
// Support both single-node JSON ({"node":"debian", "online":true, ...})
// and multi-node dashboard JSON ({"service":"Tailscale Sentinel", "nodes":{"debian":{...}, ...}})
val json = if (rootJson.has("nodes") && rootJson.get("nodes").isJsonObject) {
val nodesObj = rootJson.getAsJsonObject("nodes")
var matchedObj: com.google.gson.JsonObject? = null
if (targetNode.isNotBlank()) {
for (key in nodesObj.keySet()) {
if (key.equals(targetNode, ignoreCase = true)) {
matchedObj = nodesObj.getAsJsonObject(key)
break
}
}
}
if (matchedObj != null) {
matchedObj
} else if (targetNode.isNotBlank()) {
// Node explicitly configured but missing from sentinel nodes map
return NodeStatus(isOnline = false, statusText = "UNKNOWN NODE", isReachable = true)
} else if (nodesObj.size() > 0) {
nodesObj.entrySet().first().value.asJsonObject
} else {
rootJson
}
} else {
rootJson
}
val online = when { val online = when {
json.has("online") && json.get("online").isJsonPrimitive && json.get("online").asJsonPrimitive.isBoolean -> json.has("online") && json.get("online").isJsonPrimitive && json.get("online").asJsonPrimitive.isBoolean ->
json.get("online").asBoolean json.get("online").asBoolean
json.has("status") && json.get("status").isJsonPrimitive -> json.has("status") && json.get("status").isJsonPrimitive ->
json.get("status").asString.equals("online", ignoreCase = true) json.get("status").asString.trim().equals("online", ignoreCase = true)
else -> false else -> false
} }
val ip = if (json.has("ip") && !json.get("ip").isJsonNull) json.get("ip").asString else null val ip = if (json.has("ip") && !json.get("ip").isJsonNull) json.get("ip").asString else null
@@ -264,16 +292,17 @@ class TriggerClient(
uptime = uptime, uptime = uptime,
onSinceIst = onSinceIst, onSinceIst = onSinceIst,
lastActiveAgo = lastActiveAgo, lastActiveAgo = lastActiveAgo,
lastActiveIst = lastActiveIst lastActiveIst = lastActiveIst,
isReachable = true
) )
} catch (e: Exception) { } catch (e: Exception) {
NodeStatus(isOnline = false, statusText = "ERROR") NodeStatus(isOnline = false, statusText = "ERROR", isReachable = isHttpSuccess)
} }
} else if (isHttpSuccess) { } else if (isHttpSuccess) {
val isOnline = body.equals("ONLINE", ignoreCase = true) val isOnline = body.trim().equals("ONLINE", ignoreCase = true)
return NodeStatus(isOnline = isOnline, statusText = if (isOnline) "ONLINE" else "OFFLINE") return NodeStatus(isOnline = isOnline, statusText = if (isOnline) "ONLINE" else "OFFLINE", isReachable = true)
} else { } else {
return NodeStatus(isOnline = false, statusText = "OFFLINE") return NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false)
} }
} }
} }
@@ -60,6 +60,8 @@ import com.expapp.trigger.ui.theme.TextSecondary
fun SettingsDialog( fun SettingsDialog(
isBiometricEnabled: Boolean, isBiometricEnabled: Boolean,
onBiometricToggled: (Boolean) -> Unit, onBiometricToggled: (Boolean) -> Unit,
isWidgetBiometricEnabled: Boolean = false,
onWidgetBiometricToggled: (Boolean) -> Unit = {},
isBgMonitorEnabled: Boolean, isBgMonitorEnabled: Boolean,
onBgMonitorToggled: (Boolean) -> Unit, onBgMonitorToggled: (Boolean) -> Unit,
isBiometricAvailable: Boolean, isBiometricAvailable: Boolean,
@@ -165,6 +167,59 @@ fun SettingsDialog(
} }
} }
// Widget Biometric Setting (Optional)
if (isBiometricEnabled && isBiometricAvailable) {
Spacer(modifier = Modifier.height(10.dp))
Box(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(14.dp))
.background(BgCard)
.border(1.dp, BorderSubtle, RoundedCornerShape(14.dp))
.padding(14.dp)
) {
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically
) {
Icon(
Icons.Default.Fingerprint,
contentDescription = null,
tint = if (isWidgetBiometricEnabled) GreenVibrant else TextMuted,
modifier = Modifier.size(28.dp)
)
Spacer(modifier = Modifier.width(12.dp))
Column(modifier = Modifier.weight(1f)) {
Text(
"Widget Biometric Prompt",
color = TextPrimary,
fontSize = 14.sp,
fontWeight = FontWeight.SemiBold
)
Spacer(modifier = Modifier.height(2.dp))
Text(
if (isWidgetBiometricEnabled)
"Fingerprint overlay required before widget actions"
else
"1-tap instant action from home screen (no prompt)",
color = TextMuted,
fontSize = 11.sp
)
}
Switch(
checked = isWidgetBiometricEnabled,
onCheckedChange = { onWidgetBiometricToggled(it) },
colors = SwitchDefaults.colors(
checkedThumbColor = GreenVibrant,
checkedTrackColor = GreenVibrant.copy(alpha = 0.3f),
uncheckedThumbColor = TextMuted,
uncheckedTrackColor = BgElevated
)
)
}
}
}
Spacer(modifier = Modifier.height(12.dp)) Spacer(modifier = Modifier.height(12.dp))
// Background Monitor Setting Card // Background Monitor Setting Card
@@ -93,6 +93,7 @@ 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.ActionTriggerWorker
import com.expapp.trigger.worker.AppUpdateWorker
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
@@ -150,6 +151,7 @@ fun MainScreen(
var showNfcWriteDialog by remember { mutableStateOf(false) } var showNfcWriteDialog by remember { mutableStateOf(false) }
var historyLogs by remember { mutableStateOf(historyRepository.getLogs()) } var historyLogs by remember { mutableStateOf(historyRepository.getLogs()) }
var isBiometricEnabled by remember { mutableStateOf(appSettings.isBiometricEnabled) } var isBiometricEnabled by remember { mutableStateOf(appSettings.isBiometricEnabled) }
var isWidgetBiometricEnabled by remember { mutableStateOf(appSettings.isWidgetBiometricEnabled) }
var isBgMonitorEnabled by remember { mutableStateOf(appSettings.isBackgroundMonitoringEnabled) } var isBgMonitorEnabled by remember { mutableStateOf(appSettings.isBackgroundMonitoringEnabled) }
val loadingStates = remember { mutableStateMapOf<String, Boolean>() } val loadingStates = remember { mutableStateMapOf<String, Boolean>() }
@@ -212,8 +214,14 @@ fun MainScreen(
showUpdateDialog = true showUpdateDialog = true
val newVer = result.info.versionName val newVer = result.info.versionName
if (appSettings.lastNotifiedUpdateVersion != newVer) { if (appSettings.lastNotifiedUpdateVersion != newVer) {
val notified = com.expapp.trigger.worker.NotificationHelper.sendUpdateAvailableNotification(
context = context,
newVersion = newVer,
releaseTitle = result.info.title
)
if (notified) {
appSettings.lastNotifiedUpdateVersion = newVer appSettings.lastNotifiedUpdateVersion = newVer
com.expapp.trigger.worker.NotificationHelper.sendUpdateAvailableNotification(context, newVer) }
} }
if (isManual) { if (isManual) {
Toast.makeText(context, "New update available: v${result.info.versionName}!", Toast.LENGTH_SHORT).show() Toast.makeText(context, "New update available: v${result.info.versionName}!", Toast.LENGTH_SHORT).show()
@@ -563,14 +571,21 @@ fun MainScreen(
isBiometricEnabled = enabled isBiometricEnabled = enabled
appSettings.isBiometricEnabled = enabled appSettings.isBiometricEnabled = enabled
}, },
isWidgetBiometricEnabled = isWidgetBiometricEnabled,
onWidgetBiometricToggled = { enabled ->
isWidgetBiometricEnabled = enabled
appSettings.isWidgetBiometricEnabled = enabled
},
isBgMonitorEnabled = isBgMonitorEnabled, isBgMonitorEnabled = isBgMonitorEnabled,
onBgMonitorToggled = { enabled -> onBgMonitorToggled = { enabled ->
isBgMonitorEnabled = enabled isBgMonitorEnabled = enabled
appSettings.isBackgroundMonitoringEnabled = enabled appSettings.isBackgroundMonitoringEnabled = enabled
if (enabled) { if (enabled) {
ServerMonitorWorker.schedule(context) ServerMonitorWorker.schedule(context)
AppUpdateWorker.schedule(context)
} else { } else {
ServerMonitorWorker.cancel(context) ServerMonitorWorker.cancel(context)
AppUpdateWorker.cancel(context)
} }
}, },
isBiometricAvailable = BiometricHelper.isBiometricAvailable(context), isBiometricAvailable = BiometricHelper.isBiometricAvailable(context),
@@ -30,7 +30,8 @@ class UpdateManager(
.connectTimeout(30, TimeUnit.SECONDS) .connectTimeout(30, TimeUnit.SECONDS)
.readTimeout(60, TimeUnit.SECONDS) .readTimeout(60, TimeUnit.SECONDS)
.build(), .build(),
val githubRepo: String = "vaishnosingh/server-control-app" val primaryReleasesUrl: String = "https://forge.linuxguy.space/api/v1/repos/vaishnosingh/server-control-app/releases",
val fallbackReleasesUrl: String = "https://api.github.com/repos/vaishnosingh/server-control-app/releases"
) { ) {
private val mainHandler = try { private val mainHandler = try {
val looper = Looper.getMainLooper() val looper = Looper.getMainLooper()
@@ -44,11 +45,34 @@ class UpdateManager(
} }
/** /**
* Synchronously checks GitHub Releases API for the latest published release. * Synchronously checks for updates from the self-hosted Git server (primary),
* and automatically falls back to GitHub if the primary server fails or is unreachable.
* Suitable for use inside background workers (e.g. WorkManager CoroutineWorker). * Suitable for use inside background workers (e.g. WorkManager CoroutineWorker).
*/ */
fun checkForUpdateSync(currentVersionName: String): UpdateCheckResult { fun checkForUpdateSync(currentVersionName: String): UpdateCheckResult {
val url = "https://api.github.com/repos/$githubRepo/releases" // Query both primary (forge) and fallback (GitHub) and pick the highest available release
val primaryResult = queryReleasesSync(primaryReleasesUrl, currentVersionName)
val fallbackResult = queryReleasesSync(fallbackReleasesUrl, currentVersionName)
val primaryUpdate = if (primaryResult is UpdateCheckResult.UpdateAvailable) primaryResult.info else null
val fallbackUpdate = if (fallbackResult is UpdateCheckResult.UpdateAvailable) fallbackResult.info else null
return when {
primaryUpdate != null && fallbackUpdate != null -> {
if (isNewerVersion(primaryUpdate.versionName, fallbackUpdate.versionName)) {
UpdateCheckResult.UpdateAvailable(primaryUpdate)
} else {
UpdateCheckResult.UpdateAvailable(fallbackUpdate)
}
}
primaryUpdate != null -> UpdateCheckResult.UpdateAvailable(primaryUpdate)
fallbackUpdate != null -> UpdateCheckResult.UpdateAvailable(fallbackUpdate)
primaryResult is UpdateCheckResult.UpToDate || fallbackResult is UpdateCheckResult.UpToDate -> UpdateCheckResult.UpToDate
else -> primaryResult
}
}
private fun queryReleasesSync(url: String, currentVersionName: String): UpdateCheckResult {
val request = Request.Builder() val request = Request.Builder()
.url(url) .url(url)
.addHeader("Accept", "application/vnd.github.v3+json") .addHeader("Accept", "application/vnd.github.v3+json")
@@ -63,16 +87,82 @@ class UpdateManager(
return UpdateCheckResult.UpToDate return UpdateCheckResult.UpToDate
} }
if (!res.isSuccessful) { if (!res.isSuccessful) {
return UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates") return UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates from $url")
} }
val body = res.body?.string().orEmpty() val body = res.body?.string().orEmpty()
parseReleases(body, currentVersionName) parseReleases(body, currentVersionName)
} }
} catch (e: Exception) { } catch (e: Exception) {
UpdateCheckResult.Error("Network error: ${e.localizedMessage}") UpdateCheckResult.Error("Network error ($url): ${e.localizedMessage}")
} }
} }
/**
* Asynchronously checks for updates with primary (self-hosted) -> fallback (GitHub) strategy.
*/
fun checkForUpdate(
currentVersionName: String,
callback: (UpdateCheckResult) -> Unit
) {
queryReleasesAsync(primaryReleasesUrl, currentVersionName) { primaryResult ->
queryReleasesAsync(fallbackReleasesUrl, currentVersionName) { fallbackResult ->
val primaryUpdate = if (primaryResult is UpdateCheckResult.UpdateAvailable) primaryResult.info else null
val fallbackUpdate = if (fallbackResult is UpdateCheckResult.UpdateAvailable) fallbackResult.info else null
val finalResult = when {
primaryUpdate != null && fallbackUpdate != null -> {
if (isNewerVersion(primaryUpdate.versionName, fallbackUpdate.versionName)) {
UpdateCheckResult.UpdateAvailable(primaryUpdate)
} else {
UpdateCheckResult.UpdateAvailable(fallbackUpdate)
}
}
primaryUpdate != null -> UpdateCheckResult.UpdateAvailable(primaryUpdate)
fallbackUpdate != null -> UpdateCheckResult.UpdateAvailable(fallbackUpdate)
primaryResult is UpdateCheckResult.UpToDate || fallbackResult is UpdateCheckResult.UpToDate -> UpdateCheckResult.UpToDate
else -> if (primaryResult is UpdateCheckResult.Error) primaryResult else fallbackResult
}
runOnMain { callback(finalResult) }
}
}
}
private fun queryReleasesAsync(
url: String,
currentVersionName: String,
onComplete: (UpdateCheckResult) -> Unit
) {
val request = Request.Builder()
.url(url)
.addHeader("Accept", "application/vnd.github.v3+json")
.addHeader("User-Agent", "ServerControlApp")
.get()
.build()
okHttpClient.newCall(request).enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) {
onComplete(UpdateCheckResult.Error("Network error: ${e.localizedMessage}"))
}
override fun onResponse(call: Call, response: Response) {
response.use { res ->
if (res.code == 404) {
onComplete(UpdateCheckResult.UpToDate)
return
}
if (!res.isSuccessful) {
onComplete(UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates"))
return
}
val body = res.body?.string().orEmpty()
val result = parseReleases(body, currentVersionName)
onComplete(result)
}
}
})
}
private fun parseReleases(body: String, currentVersionName: String): UpdateCheckResult { private fun parseReleases(body: String, currentVersionName: String): UpdateCheckResult {
return try { return try {
val jsonElement = JsonParser.parseString(body) val jsonElement = JsonParser.parseString(body)
@@ -150,50 +240,7 @@ class UpdateManager(
} }
} }
/**
* Checks GitHub Releases API for the latest published release.
*/
fun checkForUpdate(
currentVersionName: String,
callback: (UpdateCheckResult) -> Unit
) {
// Query releases list so we always inspect the highest semantic version
val url = "https://api.github.com/repos/$githubRepo/releases"
val request = Request.Builder()
.url(url)
.addHeader("Accept", "application/vnd.github.v3+json")
.addHeader("User-Agent", "ServerControlApp")
.get()
.build()
okHttpClient.newCall(request).enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) {
runOnMain {
callback(UpdateCheckResult.Error("Network error: ${e.localizedMessage}"))
}
}
override fun onResponse(call: Call, response: Response) {
response.use { res ->
if (res.code == 404) {
runOnMain { callback(UpdateCheckResult.UpToDate) }
return
}
if (!res.isSuccessful) {
runOnMain {
callback(UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates"))
}
return
}
val body = res.body?.string().orEmpty()
val result = parseReleases(body, currentVersionName)
runOnMain { callback(result) }
}
}
})
}
/** /**
* 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.
@@ -9,22 +9,31 @@ import android.content.Intent
import android.os.Build import android.os.Build
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.os.VibrationEffect
import android.os.Vibrator
import android.os.VibratorManager
import android.widget.RemoteViews import android.widget.RemoteViews
import android.widget.Toast import android.widget.Toast
import com.expapp.trigger.MainActivity import com.expapp.trigger.MainActivity
import com.expapp.trigger.R import com.expapp.trigger.R
import com.expapp.trigger.data.model.DeviceConfig 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.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
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 com.expapp.trigger.worker.ActionTriggerWorker
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
import java.util.concurrent.Executors import java.util.concurrent.Executors
/**
* Self-contained Home Screen Widget for server control and monitoring.
* Executes server triggers and status refreshes completely in the background
* without opening the main application.
*/
class ServerWidgetProvider : AppWidgetProvider() { class ServerWidgetProvider : AppWidgetProvider() {
companion object { companion object {
@@ -50,6 +59,31 @@ class ServerWidgetProvider : AppWidgetProvider() {
context.sendBroadcast(intent) context.sendBroadcast(intent)
} }
} }
fun updateStatus(context: Context, statusText: String, footerText: String? = null) {
try {
val appWidgetManager = AppWidgetManager.getInstance(context)
val thisWidget = ComponentName(context, ServerWidgetProvider::class.java)
val appWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
if (appWidgetIds != null && appWidgetIds.isNotEmpty()) {
for (id in appWidgetIds) {
val views = RemoteViews(context.packageName, R.layout.widget_server_control)
views.setTextViewText(R.id.widget_status_text, statusText)
if (statusText == "SENDING..." || statusText == "CHECKING...") {
views.setTextColor(R.id.widget_status_text, 0xFFF59E0B.toInt())
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_gray)
views.setInt(R.id.widget_status_chip, "setBackgroundResource", R.drawable.widget_chip_checking)
}
if (footerText != null) {
views.setTextViewText(R.id.widget_footer_text, footerText)
}
appWidgetManager.partiallyUpdateAppWidget(id, views)
}
}
} catch (e: Exception) {
e.printStackTrace()
}
}
} }
override fun onUpdate( override fun onUpdate(
@@ -57,6 +91,7 @@ class ServerWidgetProvider : AppWidgetProvider() {
appWidgetManager: AppWidgetManager, appWidgetManager: AppWidgetManager,
appWidgetIds: IntArray appWidgetIds: IntArray
) { ) {
try {
val repository = DeviceRepository(SharedPrefsStorage(context)) val repository = DeviceRepository(SharedPrefsStorage(context))
val devices = repository.getDevices() val devices = repository.getDevices()
@@ -64,16 +99,29 @@ class ServerWidgetProvider : AppWidgetProvider() {
val device = devices.firstOrNull() val device = devices.firstOrNull()
renderWidget(context, appWidgetManager, appWidgetId, device, null) renderWidget(context, appWidgetManager, appWidgetId, device, null)
// If device exists, fetch live status asynchronously // If device exists, fetch live status asynchronously in background
if (device != null && device.statusUrl.isNotBlank()) { if (device != null && device.statusUrl.isNotBlank()) {
executor.execute { executor.execute {
try {
val status = TriggerClient().checkStatusSync(device) val status = TriggerClient().checkStatusSync(device)
val appSettings = AppSettings(context)
appSettings.setLastStatus(device.id, status.isOnline)
mainHandler.post { mainHandler.post {
try {
renderWidget(context, appWidgetManager, appWidgetId, device, status) renderWidget(context, appWidgetManager, appWidgetId, device, status)
} catch (e: Exception) {
e.printStackTrace()
}
}
} catch (e: Exception) {
e.printStackTrace()
} }
} }
} }
} }
} catch (e: Exception) {
e.printStackTrace()
}
} }
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
@@ -83,39 +131,66 @@ class ServerWidgetProvider : AppWidgetProvider() {
ACTION_TRIGGER -> { ACTION_TRIGGER -> {
val deviceId = intent.getStringExtra(EXTRA_DEVICE_ID) ?: return val deviceId = intent.getStringExtra(EXTRA_DEVICE_ID) ?: return
val actionName = intent.getStringExtra(EXTRA_ACTION) ?: return val actionName = intent.getStringExtra(EXTRA_ACTION) ?: return
val action = try { TriggerAction.valueOf(actionName) } catch (e: Exception) { return } val action = try { TriggerAction.valueOf(actionName) } catch (_: Exception) { return }
val appSettings = AppSettings(context) val appSettings = AppSettings(context)
if (appSettings.isBiometricEnabled) { if (appSettings.isWidgetBiometricEnabled && appSettings.isBiometricEnabled) {
// Biometric is enabled: open MainActivity with Trigger intent // Biometric is explicitly required for widget: launch transparent prompt over home screen
val launchIntent = Intent(context, MainActivity::class.java).apply { val launchIntent = Intent(context, WidgetAuthActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_NO_ANIMATION
this.action = ACTION_TRIGGER
putExtra(EXTRA_DEVICE_ID, deviceId) putExtra(EXTRA_DEVICE_ID, deviceId)
putExtra(EXTRA_ACTION, actionName) putExtra(EXTRA_ACTION, actionName)
} }
context.startActivity(launchIntent) context.startActivity(launchIntent)
} else { } else {
// Biometric disabled: execute via guaranteed background worker // Frictionless 1-tap trigger directly from home screen without opening the app
Toast.makeText(context, "Sending ${action.name} signal...", Toast.LENGTH_SHORT).show() val repository = DeviceRepository(SharedPrefsStorage(context))
val device = repository.getDevices().find { it.id == deviceId }
val deviceName = device?.name ?: "Server"
val actionTitle = when (action) {
TriggerAction.POWER_ON -> "Power On"
TriggerAction.REBOOT -> "Reboot"
TriggerAction.POWER_OFF -> "Shutdown"
}
vibrate(context)
Toast.makeText(context, "⚡ Sending $actionTitle signal to $deviceName...", Toast.LENGTH_SHORT).show()
updateStatus(context, "SENDING...", "⚡ Dispatched $actionTitle • Verifying...")
ActionTriggerWorker.enqueue(context, deviceId, action, "Widget") ActionTriggerWorker.enqueue(context, deviceId, action, "Widget")
} }
} }
ACTION_REFRESH -> { ACTION_REFRESH -> {
// Immediate visual feedback on home screen
updateStatus(context, "CHECKING...", "🔄 Refreshing server status...")
Toast.makeText(context, "Checking server status...", Toast.LENGTH_SHORT).show()
vibrate(context)
executor.execute { executor.execute {
val repository = DeviceRepository(SharedPrefsStorage(context)) val repository = DeviceRepository(SharedPrefsStorage(context))
val device = repository.getDevices().firstOrNull() val device = repository.getDevices().firstOrNull()
if (device != null) { if (device != null) {
val status = TriggerClient().checkStatusSync(device) val status = TriggerClient().checkStatusSync(device)
val appSettings = AppSettings(context)
appSettings.setLastStatus(device.id, status.isOnline)
val timeStr = SimpleDateFormat("HH:mm", Locale.getDefault()).format(Date())
val footer = if (status.isOnline) {
if (!status.uptime.isNullOrBlank()) "🟢 Up: ${status.uptime} • Checked $timeStr"
else "🟢 Online • Checked $timeStr"
} else {
"🛑 Server is offline • Checked $timeStr"
}
mainHandler.post { mainHandler.post {
val appWidgetManager = AppWidgetManager.getInstance(context) val appWidgetManager = AppWidgetManager.getInstance(context)
val thisWidget = ComponentName(context, ServerWidgetProvider::class.java) val thisWidget = ComponentName(context, ServerWidgetProvider::class.java)
val ids = appWidgetManager.getAppWidgetIds(thisWidget) val ids = appWidgetManager.getAppWidgetIds(thisWidget)
for (id in ids) { for (id in ids) {
renderWidget(context, appWidgetManager, id, device, status, "Updated just now") renderWidget(context, appWidgetManager, id, device, status, footer)
} }
Toast.makeText(context, "Widget refreshed", Toast.LENGTH_SHORT).show() val toastMsg = if (status.isOnline) "🟢 ${device.name} is online" else "🛑 ${device.name} is offline"
Toast.makeText(context, toastMsg, Toast.LENGTH_SHORT).show()
} }
} }
} }
@@ -131,62 +206,62 @@ class ServerWidgetProvider : AppWidgetProvider() {
status: NodeStatus?, status: NodeStatus?,
footerOverride: String? = null footerOverride: String? = null
) { ) {
try {
val views = RemoteViews(context.packageName, R.layout.widget_server_control) val views = RemoteViews(context.packageName, R.layout.widget_server_control)
if (device == null) { if (device == null) {
views.setTextViewText(R.id.widget_device_name, "No Device") views.setTextViewText(R.id.widget_device_name, "No Device")
views.setTextViewText(R.id.widget_node_name, "Configure in app") views.setTextViewText(R.id.widget_node_name, "Configure in app")
views.setTextViewText(R.id.widget_status_text, "OFFLINE") views.setTextViewText(R.id.widget_status_text, "OFFLINE")
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_gray) views.setTextColor(R.id.widget_status_text, 0xFFEF4444.toInt())
views.setTextViewText(R.id.widget_footer_text, "Open app to add server") views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_red)
views.setInt(R.id.widget_status_chip, "setBackgroundResource", R.drawable.widget_chip_offline)
views.setTextViewText(R.id.widget_footer_text, "Tap icon to open app & add server")
val appIntent = Intent(context, MainActivity::class.java) // Only icon opens app when no device configured
val appIntent = Intent(context, MainActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
}
val pendingApp = PendingIntent.getActivity( val pendingApp = PendingIntent.getActivity(
context, 0, appIntent, context, 0, appIntent,
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0) PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
) )
views.setOnClickPendingIntent(R.id.widget_header_clickable, pendingApp) views.setOnClickPendingIntent(R.id.widget_app_icon_badge, pendingApp)
views.setOnClickPendingIntent(R.id.widget_root, pendingApp)
appWidgetManager.updateAppWidget(appWidgetId, views) appWidgetManager.updateAppWidget(appWidgetId, views)
return return
} }
views.setTextViewText(R.id.widget_device_name, device.name) views.setTextViewText(R.id.widget_device_name, device.name)
views.setTextViewText(R.id.widget_node_name, device.node) views.setTextViewText(R.id.widget_node_name, "${device.node} • Server Control")
// Status display // Status chip display
val timeStr = SimpleDateFormat("HH:mm", Locale.getDefault()).format(Date())
if (status == null) { if (status == null) {
views.setTextViewText(R.id.widget_status_text, "SYNCING") views.setTextViewText(R.id.widget_status_text, "CHECKING")
views.setTextColor(R.id.widget_status_text, 0xFF71717A.toInt()) views.setTextColor(R.id.widget_status_text, 0xFF9CA3AF.toInt())
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_gray) views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_gray)
views.setInt(R.id.widget_status_chip, "setBackgroundResource", R.drawable.widget_chip_checking)
} else if (status.isOnline) { } else if (status.isOnline) {
views.setTextViewText(R.id.widget_status_text, "ONLINE") views.setTextViewText(R.id.widget_status_text, "ONLINE")
views.setTextColor(R.id.widget_status_text, 0xFF22C55E.toInt()) views.setTextColor(R.id.widget_status_text, 0xFF22C55E.toInt())
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_green) views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_green)
views.setInt(R.id.widget_status_chip, "setBackgroundResource", R.drawable.widget_chip_online)
} else { } else {
views.setTextViewText(R.id.widget_status_text, "OFFLINE") views.setTextViewText(R.id.widget_status_text, "OFFLINE")
views.setTextColor(R.id.widget_status_text, 0xFFEF4444.toInt()) views.setTextColor(R.id.widget_status_text, 0xFFEF4444.toInt())
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_red) views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_red)
views.setInt(R.id.widget_status_chip, "setBackgroundResource", R.drawable.widget_chip_offline)
} }
views.setTextViewText( // Contextual Footer Text
R.id.widget_footer_text, val defaultFooter = when {
footerOverride ?: (if (status?.uptime != null) "Up: ${status.uptime}" else "Tap header to open • Tap button to trigger") status == null -> "Checking server status..."
) status.isOnline -> if (!status.uptime.isNullOrBlank()) "🟢 Up: ${status.uptime} • Checked $timeStr" else "🟢 Online • Checked $timeStr"
else -> "🛑 Offline • Tap Refresh to check"
// Header click -> Open app
val openAppIntent = Intent(context, MainActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
} }
val pendingOpenApp = PendingIntent.getActivity( views.setTextViewText(R.id.widget_footer_text, footerOverride ?: defaultFooter)
context,
appWidgetId * 10,
openAppIntent,
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
)
views.setOnClickPendingIntent(R.id.widget_header_clickable, pendingOpenApp)
// Refresh click // Dedicated Refresh Broadcast Intent
val refreshIntent = Intent(context, ServerWidgetProvider::class.java).apply { val refreshIntent = Intent(context, ServerWidgetProvider::class.java).apply {
action = ACTION_REFRESH action = ACTION_REFRESH
} }
@@ -196,27 +271,46 @@ class ServerWidgetProvider : AppWidgetProvider() {
refreshIntent, refreshIntent,
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0) PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
) )
views.setOnClickPendingIntent(R.id.widget_btn_refresh, pendingRefresh)
// Power On click // Refresh button & Info row triggers Refresh (NOT app launch)
views.setOnClickPendingIntent(R.id.widget_btn_refresh, pendingRefresh)
views.setOnClickPendingIntent(R.id.widget_header_info, pendingRefresh)
views.setOnClickPendingIntent(R.id.widget_footer_text, pendingRefresh)
// Explicit App Icon Badge Intent (Only this small terminal icon opens MainActivity if desired)
val openAppIntent = Intent(context, MainActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
}
val pendingOpenApp = PendingIntent.getActivity(
context,
appWidgetId * 10,
openAppIntent,
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
)
views.setOnClickPendingIntent(R.id.widget_app_icon_badge, pendingOpenApp)
// Power On click (1-tap background action)
views.setOnClickPendingIntent( views.setOnClickPendingIntent(
R.id.widget_btn_power_on, R.id.widget_btn_power_on,
createTriggerPendingIntent(context, appWidgetId * 10 + 2, device.id, TriggerAction.POWER_ON) createTriggerPendingIntent(context, appWidgetId * 10 + 2, device.id, TriggerAction.POWER_ON)
) )
// Reboot click // Reboot click (1-tap background action)
views.setOnClickPendingIntent( views.setOnClickPendingIntent(
R.id.widget_btn_reboot, R.id.widget_btn_reboot,
createTriggerPendingIntent(context, appWidgetId * 10 + 3, device.id, TriggerAction.REBOOT) createTriggerPendingIntent(context, appWidgetId * 10 + 3, device.id, TriggerAction.REBOOT)
) )
// Power Off click // Power Off click (1-tap background action)
views.setOnClickPendingIntent( views.setOnClickPendingIntent(
R.id.widget_btn_power_off, R.id.widget_btn_power_off,
createTriggerPendingIntent(context, appWidgetId * 10 + 4, device.id, TriggerAction.POWER_OFF) createTriggerPendingIntent(context, appWidgetId * 10 + 4, device.id, TriggerAction.POWER_OFF)
) )
appWidgetManager.updateAppWidget(appWidgetId, views) appWidgetManager.updateAppWidget(appWidgetId, views)
} catch (e: Exception) {
e.printStackTrace()
}
} }
private fun createTriggerPendingIntent( private fun createTriggerPendingIntent(
@@ -237,4 +331,19 @@ class ServerWidgetProvider : AppWidgetProvider() {
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0) PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
) )
} }
private fun vibrate(context: Context) {
try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
val vibratorManager = context.getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as? VibratorManager
vibratorManager?.defaultVibrator?.vibrate(
VibrationEffect.createOneShot(40, VibrationEffect.DEFAULT_AMPLITUDE)
)
} else {
@Suppress("DEPRECATION")
val vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator
vibrator?.vibrate(40)
}
} catch (_: Exception) {}
}
} }
@@ -0,0 +1,118 @@
package com.expapp.trigger.widget
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.os.Build
import android.os.Bundle
import android.os.VibrationEffect
import android.os.Vibrator
import android.os.VibratorManager
import android.widget.Toast
import androidx.fragment.app.FragmentActivity
import com.expapp.trigger.data.repository.DeviceRepository
import com.expapp.trigger.data.repository.SharedPrefsStorage
import com.expapp.trigger.network.TriggerAction
import com.expapp.trigger.security.BiometricHelper
import com.expapp.trigger.worker.ActionTriggerWorker
/**
* Completely translucent activity that prompts for biometric verification directly
* on top of the home screen / launcher without ever loading or revealing the main application.
* Dismisses instantly and executes the action via guaranteed background worker.
*/
class WidgetAuthActivity : FragmentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
// Make window completely transparent & borderless
window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
window.setDimAmount(0f)
val deviceId = intent.getStringExtra(ServerWidgetProvider.EXTRA_DEVICE_ID)
val actionName = intent.getStringExtra(ServerWidgetProvider.EXTRA_ACTION)
if (deviceId.isNullOrBlank() || actionName.isNullOrBlank()) {
finishWithoutAnimation()
return
}
val action = try {
TriggerAction.valueOf(actionName)
} catch (_: Exception) {
finishWithoutAnimation()
return
}
val repository = DeviceRepository(SharedPrefsStorage(applicationContext))
val device = repository.getDevices().find { it.id == deviceId }
if (device == null) {
finishWithoutAnimation()
return
}
val actionTitle = when (action) {
TriggerAction.POWER_ON -> "Power On"
TriggerAction.REBOOT -> "Reboot"
TriggerAction.POWER_OFF -> "Shutdown"
}
if (BiometricHelper.isBiometricAvailable(this)) {
BiometricHelper.authenticate(
this,
title = "Confirm $actionTitle",
subtitle = "Authenticate to trigger ${device.name}"
) { success, errorMsg ->
if (success) {
vibrateFeedback()
Toast.makeText(this, "⚡ Sending $actionTitle signal to ${device.name}...", Toast.LENGTH_SHORT).show()
ServerWidgetProvider.updateStatus(
applicationContext,
"SENDING...",
"⚡ Dispatched $actionTitle • Verifying..."
)
ActionTriggerWorker.enqueue(applicationContext, device.id, action, "Widget")
} else if (errorMsg != null) {
Toast.makeText(this, "Trigger cancelled", Toast.LENGTH_SHORT).show()
}
finishWithoutAnimation()
}
} else {
// Biometric hardware unavailable; dispatch directly
vibrateFeedback()
Toast.makeText(this, "⚡ Sending $actionTitle signal to ${device.name}...", Toast.LENGTH_SHORT).show()
ServerWidgetProvider.updateStatus(
applicationContext,
"SENDING...",
"⚡ Dispatched $actionTitle • Verifying..."
)
ActionTriggerWorker.enqueue(applicationContext, device.id, action, "Widget")
finishWithoutAnimation()
}
}
private fun finishWithoutAnimation() {
finish()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
overrideActivityTransition(OVERRIDE_TRANSITION_CLOSE, 0, 0)
} else {
@Suppress("DEPRECATION")
overridePendingTransition(0, 0)
}
}
private fun vibrateFeedback() {
try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
val vibratorManager = getSystemService(VIBRATOR_MANAGER_SERVICE) as? VibratorManager
vibratorManager?.defaultVibrator?.vibrate(
VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE)
)
} else {
@Suppress("DEPRECATION")
val vibrator = getSystemService(VIBRATOR_SERVICE) as? Vibrator
vibrator?.vibrate(50)
}
} catch (_: Exception) {}
}
}
@@ -136,11 +136,12 @@ class ActionTriggerWorker(
triggerClient: TriggerClient, triggerClient: TriggerClient,
appSettings: AppSettings appSettings: AppSettings
) { ) {
val maxAttempts = 15 // Up to 60 seconds (15 attempts * 4s) val maxAttempts = 30 // Up to 60 seconds (30 attempts * 2s) for instant notification
var attempts = 0 var attempts = 0
var consecutiveTargetMatches = 0
// Brief delay for hardware/OS to begin reaction // Brief delay before first check to allow server to receive trigger
delay(4000L) delay(1500L)
while (attempts < maxAttempts) { while (attempts < maxAttempts) {
attempts++ attempts++
@@ -148,56 +149,62 @@ class ActionTriggerWorker(
// If phone network is unavailable, do not misinterpret as server going offline // If phone network is unavailable, do not misinterpret as server going offline
if (!status.isReachable) { if (!status.isReachable) {
delay(4000L) delay(2000L)
continue continue
} }
when (action) { when (action) {
TriggerAction.POWER_ON -> { TriggerAction.POWER_ON -> {
if (status.isOnline) { if (status.isOnline) {
consecutiveTargetMatches++
// Require 2 consecutive online confirmations (or 1 if status explicitly verified)
if (consecutiveTargetMatches >= 2 || status.statusText == "ONLINE") {
appSettings.setLastStatus(device.id, true) appSettings.setLastStatus(device.id, true)
NotificationHelper.sendNotification( NotificationHelper.sendNotification(
context = appContext, context = appContext,
id = device.id.hashCode(), id = device.id.hashCode(),
title = "✅ Server Online: ${device.name}", title = "✅ Server Online",
message = "${device.name} is now online and reachable!", message = "${device.name} is now online and reachable.",
isSuccess = true isSuccess = true
) )
ServerWidgetProvider.updateAllWidgets(appContext) ServerWidgetProvider.updateAllWidgets(appContext)
return return
} }
} else {
consecutiveTargetMatches = 0
}
} }
TriggerAction.POWER_OFF -> { TriggerAction.POWER_OFF -> {
if (!status.isOnline) { if (!status.isOnline) {
consecutiveTargetMatches++
// Require 2 consecutive offline confirmations to completely eliminate false positives
if (consecutiveTargetMatches >= 2) {
appSettings.setLastStatus(device.id, false) appSettings.setLastStatus(device.id, false)
NotificationHelper.sendNotification( NotificationHelper.sendNotification(
context = appContext, context = appContext,
id = device.id.hashCode(), id = device.id.hashCode(),
title = "🛑 Server Offline: ${device.name}", title = "⚠️ Server Offline",
message = "${device.name} has shut down and is now offline.", message = "${device.name} has powered off or is offline.",
isSuccess = false isSuccess = false
) )
ServerWidgetProvider.updateAllWidgets(appContext) ServerWidgetProvider.updateAllWidgets(appContext)
return return
} }
} else {
consecutiveTargetMatches = 0
}
} }
TriggerAction.REBOOT -> { TriggerAction.REBOOT -> {
if (attempts >= 2 && status.isOnline) { // No notification for reboot per user instructions
if (attempts >= 4 && status.isOnline) {
appSettings.setLastStatus(device.id, true) 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) ServerWidgetProvider.updateAllWidgets(appContext)
return return
} }
} }
} }
delay(4000L) delay(2000L)
} }
} }
} }
@@ -0,0 +1,105 @@
package com.expapp.trigger.worker
import android.content.Context
import androidx.work.Constraints
import androidx.work.CoroutineWorker
import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.ExistingWorkPolicy
import androidx.work.NetworkType
import androidx.work.OneTimeWorkRequestBuilder
import androidx.work.PeriodicWorkRequestBuilder
import androidx.work.WorkManager
import androidx.work.WorkerParameters
import com.expapp.trigger.BuildConfig
import com.expapp.trigger.data.repository.AppSettings
import com.expapp.trigger.update.UpdateCheckResult
import com.expapp.trigger.update.UpdateManager
import java.util.concurrent.TimeUnit
/**
* Dedicated background worker that checks for new app updates independently of server devices.
* Ensures notifications are dispatched even if no servers are configured or if servers are offline.
*/
class AppUpdateWorker(
private val appContext: Context,
workerParams: WorkerParameters
) : CoroutineWorker(appContext, workerParams) {
companion object {
const val WORK_NAME = "app_update_periodic_check"
const val ONE_TIME_WORK_NAME = "app_update_one_time_check"
fun schedule(context: Context, repeatIntervalMinutes: Long = 15) {
NotificationHelper.createNotificationChannel(context)
val constraints = Constraints.Builder()
.setRequiredNetworkType(NetworkType.CONNECTED)
.build()
val workRequest = PeriodicWorkRequestBuilder<AppUpdateWorker>(
repeatIntervalMinutes,
TimeUnit.MINUTES
)
.setConstraints(constraints)
.build()
WorkManager.getInstance(context).enqueueUniquePeriodicWork(
WORK_NAME,
ExistingPeriodicWorkPolicy.UPDATE,
workRequest
)
}
fun cancel(context: Context) {
WorkManager.getInstance(context).cancelUniqueWork(WORK_NAME)
}
fun runOnce(context: Context) {
NotificationHelper.createNotificationChannel(context)
val constraints = Constraints.Builder()
.setRequiredNetworkType(NetworkType.CONNECTED)
.build()
val oneTimeRequest = OneTimeWorkRequestBuilder<AppUpdateWorker>()
.setConstraints(constraints)
.build()
WorkManager.getInstance(context).enqueueUniqueWork(
ONE_TIME_WORK_NAME,
ExistingWorkPolicy.REPLACE,
oneTimeRequest
)
}
}
override suspend fun doWork(): Result {
val appSettings = AppSettings(appContext)
try {
val updateManager = UpdateManager(appContext)
val currentVersion = BuildConfig.VERSION_NAME
val result = updateManager.checkForUpdateSync(currentVersion)
if (result is UpdateCheckResult.UpdateAvailable) {
val newVer = result.info.versionName
val lastNotified = appSettings.lastNotifiedUpdateVersion
if (lastNotified != newVer) {
val notified = NotificationHelper.sendUpdateAvailableNotification(
context = appContext,
newVersion = newVer,
releaseTitle = result.info.title
)
if (notified) {
appSettings.lastNotifiedUpdateVersion = newVer
}
}
}
} catch (_: Exception) {
// Ignore failure; will retry next interval
}
return Result.success()
}
}
@@ -85,11 +85,20 @@ object NotificationHelper {
} }
} }
fun sendUpdateAvailableNotification(context: Context, newVersion: String): Boolean { fun sendUpdateAvailableNotification(
context: Context,
newVersion: String,
releaseTitle: String? = null
): Boolean {
val title = if (!releaseTitle.isNullOrBlank() && releaseTitle != "v$newVersion") {
"🚀 Update Available: $releaseTitle"
} else {
"🚀 Update Available: v$newVersion"
}
return sendNotification( return sendNotification(
context = context, context = context,
id = 8888, id = 8888,
title = "🚀 Update Available: v$newVersion", title = title,
message = "A new version (v$newVersion) of Device Trigger is ready to install. Tap to update!", message = "A new version (v$newVersion) of Device Trigger is ready to install. Tap to update!",
isSuccess = true, isSuccess = true,
extraAction = "open_update" extraAction = "open_update"
@@ -91,7 +91,7 @@ class ServerMonitorWorker(
for (device in devices) { for (device in devices) {
if (device.statusUrl.isBlank()) continue if (device.statusUrl.isBlank()) continue
val status = triggerClient.checkStatusSync(device) var status = triggerClient.checkStatusSync(device)
// If the endpoint could not be reached (e.g. phone has no internet / network failure), // 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. // do NOT treat this as the server going offline. Maintain the last known state.
@@ -101,7 +101,20 @@ class ServerMonitorWorker(
val previousStatus = appSettings.getLastStatus(device.id) val previousStatus = appSettings.getLastStatus(device.id)
// Save new status // If a transition is detected (especially online -> offline or offline -> online),
// double-check with an immediate secondary request after 2 seconds to eliminate false positives
if (previousStatus != null && previousStatus != status.isOnline) {
kotlinx.coroutines.delay(2000L)
val verificationStatus = triggerClient.checkStatusSync(device)
if (verificationStatus.isReachable && verificationStatus.isOnline == status.isOnline) {
status = verificationStatus
} else {
// False positive or transient state; do not change status or trigger false alert
continue
}
}
// Save new verified status
appSettings.setLastStatus(device.id, status.isOnline) appSettings.setLastStatus(device.id, status.isOnline)
// Determine if notification is needed only when server actually transitions // Determine if notification is needed only when server actually transitions
@@ -109,7 +122,7 @@ class ServerMonitorWorker(
NotificationHelper.sendNotification( NotificationHelper.sendNotification(
context = appContext, context = appContext,
id = device.id.hashCode(), id = device.id.hashCode(),
title = if (status.isOnline) "✅ Server Back Online" else "⚠️ Server Offline", title = if (status.isOnline) "✅ Server Online" else "⚠️ Server Offline",
message = if (status.isOnline) { message = if (status.isOnline) {
"${device.name} is now online and reachable." "${device.name} is now online and reachable."
} else { } else {
@@ -129,8 +142,14 @@ class ServerMonitorWorker(
val newVer = result.info.versionName val newVer = result.info.versionName
val lastNotified = appSettings.lastNotifiedUpdateVersion val lastNotified = appSettings.lastNotifiedUpdateVersion
if (lastNotified != newVer) { if (lastNotified != newVer) {
val notified = NotificationHelper.sendUpdateAvailableNotification(
context = appContext,
newVersion = newVer,
releaseTitle = result.info.title
)
if (notified) {
appSettings.lastNotifiedUpdateVersion = newVer appSettings.lastNotifiedUpdateVersion = newVer
NotificationHelper.sendUpdateAvailableNotification(appContext, newVer) }
} }
} }
} catch (_: Exception) { } catch (_: Exception) {
+3 -3
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="#161619" /> <solid android:color="#101013" />
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="#2b2b30" /> android:color="#24242a" />
<corners android:radius="18dp" /> <corners android:radius="20dp" />
</shape> </shape>
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="#2c1e0f" /> <solid android:color="#281909" />
<stroke <stroke
android:width="1dp" android:width="1.2dp"
android:color="#f59e0b" /> android:color="#f59e0b" />
<corners android:radius="10dp" /> <corners android:radius="11dp" />
</shape> </shape>
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="#14291e" /> <solid android:color="#0e261a" />
<stroke <stroke
android:width="1dp" android:width="1.2dp"
android:color="#22c55e" /> android:color="#22c55e" />
<corners android:radius="10dp" /> <corners android:radius="11dp" />
</shape> </shape>
+3 -3
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="#2c1214" /> <solid android:color="#2a1013" />
<stroke <stroke
android:width="1dp" android:width="1.2dp"
android:color="#ef4444" /> android:color="#ef4444" />
<corners android:radius="10dp" /> <corners android:radius="11dp" />
</shape> </shape>
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#18181e" />
<stroke
android:width="1dp"
android:color="#2c2c36" />
<corners android:radius="9dp" />
</shape>
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#1a1a20" />
<stroke
android:width="1dp"
android:color="#363640" />
<corners android:radius="12dp" />
</shape>
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#2b1114" />
<stroke
android:width="1dp"
android:color="#ef4444" />
<corners android:radius="12dp" />
</shape>
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#122a1c" />
<stroke
android:width="1dp"
android:color="#22c55e" />
<corners android:radius="12dp" />
</shape>
Binary file not shown.

After

Width:  |  Height:  |  Size: 324 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 314 B

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#18181e" />
<stroke
android:width="1dp"
android:color="#282832" />
<corners android:radius="8dp" />
</shape>
@@ -5,7 +5,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/widget_bg" android:background="@drawable/widget_bg"
android:orientation="vertical" android:orientation="vertical"
android:padding="12dp"> android:padding="13dp">
<!-- Header Row --> <!-- Header Row -->
<LinearLayout <LinearLayout
@@ -14,17 +14,27 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <!-- App Launcher Icon Badge (Explicit App Launch only if user taps this badge) -->
android:layout_width="18dp" <FrameLayout
android:layout_height="18dp" android:id="@+id/widget_app_icon_badge"
android:src="@drawable/ic_terminal" android:layout_width="32dp"
android:contentDescription="Server" /> android:layout_height="32dp"
android:background="@drawable/widget_icon_badge">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:src="@drawable/widget_ic_terminal"
android:contentDescription="Server App" />
</FrameLayout>
<!-- Device & Node Info (Tapping this refreshes status, does NOT open app) -->
<LinearLayout <LinearLayout
android:id="@+id/widget_header_clickable" android:id="@+id/widget_header_info"
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="9dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
@@ -47,59 +57,70 @@
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:text="debian" android:text="debian"
android:textColor="#71717a" android:textColor="#9ca3af"
android:textSize="11sp" /> android:textSize="11sp" />
</LinearLayout> </LinearLayout>
<!-- Status Dot + Text --> <!-- Status Chip Badge -->
<LinearLayout <LinearLayout
android:id="@+id/widget_status_chip"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/widget_chip_checking"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="6dp"> android:paddingStart="7dp"
android:paddingTop="3dp"
android:paddingEnd="7dp"
android:paddingBottom="3dp">
<ImageView <ImageView
android:id="@+id/widget_status_dot" android:id="@+id/widget_status_dot"
android:layout_width="8dp" android:layout_width="6dp"
android:layout_height="8dp" android:layout_height="6dp"
android:src="@drawable/widget_dot_gray" android:src="@drawable/widget_dot_gray"
android:contentDescription="Status" /> android:contentDescription="Status Dot" />
<TextView <TextView
android:id="@+id/widget_status_text" android:id="@+id/widget_status_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="5dp" android:layout_marginStart="4dp"
android:text="CHECKING" android:text="CHECKING"
android:textColor="#71717a" android:textColor="#9ca3af"
android:textSize="11sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<!-- Refresh Button --> <!-- Refresh Button Container (Large 32x32dp touch target) -->
<ImageView <FrameLayout
android:id="@+id/widget_btn_refresh" android:id="@+id/widget_btn_refresh"
android:layout_width="26dp" android:layout_width="32dp"
android:layout_height="26dp" android:layout_height="32dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:layout_marginStart="6dp"
android:contentDescription="Refresh" android:background="@drawable/widget_btn_refresh_bg">
android:padding="3dp"
android:src="@drawable/ic_refresh" /> <ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:src="@drawable/widget_ic_refresh"
android:contentDescription="Refresh" />
</FrameLayout>
</LinearLayout> </LinearLayout>
<!-- Spacer / Divider --> <!-- Sleek Horizontal Divider -->
<View <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="8dp" android:layout_marginTop="9dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="9dp"
android:background="#27272a" /> android:background="#222228" />
<!-- Action Buttons Row --> <!-- Action Buttons Row -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="38dp" android:layout_height="40dp"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
@@ -107,12 +128,12 @@
android:id="@+id/widget_btn_power_on" android:id="@+id/widget_btn_power_on"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="4dp" android:layout_marginEnd="3dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/widget_btn_green" android:background="@drawable/widget_btn_green"
android:gravity="center" android:gravity="center"
android:text="POWER ON" android:text="⚡ POWER ON"
android:textColor="#22c55e" android:textColor="#4ade80"
android:textSize="11sp" android:textSize="11sp"
android:textStyle="bold" /> android:textStyle="bold" />
@@ -125,8 +146,8 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/widget_btn_amber" android:background="@drawable/widget_btn_amber"
android:gravity="center" android:gravity="center"
android:text="REBOOT" android:text="🔄 REBOOT"
android:textColor="#f59e0b" android:textColor="#fbbf24"
android:textSize="11sp" android:textSize="11sp"
android:textStyle="bold" /> android:textStyle="bold" />
@@ -134,12 +155,12 @@
android:id="@+id/widget_btn_power_off" android:id="@+id/widget_btn_power_off"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="4dp" android:layout_marginStart="3dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/widget_btn_red" android:background="@drawable/widget_btn_red"
android:gravity="center" android:gravity="center"
android:text="OFF" android:text="🛑 OFF"
android:textColor="#ef4444" android:textColor="#f87171"
android:textSize="11sp" android:textSize="11sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
@@ -149,9 +170,11 @@
android:id="@+id/widget_footer_text" android:id="@+id/widget_footer_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="7dp"
android:ellipsize="end"
android:gravity="center" android:gravity="center"
android:text="Tap header to open app • Tap action to trigger" android:maxLines="1"
android:textColor="#52525b" android:text="Checking server status..."
android:textColor="#71717a"
android:textSize="10sp" /> android:textSize="10sp" />
</LinearLayout> </LinearLayout>
+12
View File
@@ -3,4 +3,16 @@
<item name="android:statusBarColor">#121212</item> <item name="android:statusBarColor">#121212</item>
<item name="android:navigationBarColor">#121212</item> <item name="android:navigationBarColor">#121212</item>
</style> </style>
<!-- Translucent invisible theme for widget biometric authentication dialog -->
<style name="Theme.WidgetAuth" parent="android:Theme.Material.NoActionBar">
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">false</item>
<item name="android:backgroundDimEnabled">false</item>
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
</style>
</resources> </resources>
+6 -2
View File
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android" <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
android:minWidth="250dp" android:minWidth="220dp"
android:minHeight="100dp" android:minHeight="90dp"
android:targetCellWidth="3"
android:targetCellHeight="2"
android:minResizeWidth="180dp"
android:minResizeHeight="70dp"
android:updatePeriodMillis="1800000" android:updatePeriodMillis="1800000"
android:initialLayout="@layout/widget_server_control" android:initialLayout="@layout/widget_server_control"
android:resizeMode="horizontal|vertical" android:resizeMode="horizontal|vertical"
@@ -37,6 +37,7 @@ class AppSettingsTest {
fun defaultValues_areTrue() { fun defaultValues_areTrue() {
assertTrue(settings.isBiometricEnabled) assertTrue(settings.isBiometricEnabled)
assertTrue(settings.isBackgroundMonitoringEnabled) assertTrue(settings.isBackgroundMonitoringEnabled)
assertFalse(settings.isWidgetBiometricEnabled)
} }
@Test @Test
@@ -46,6 +47,9 @@ class AppSettingsTest {
settings.isBackgroundMonitoringEnabled = false settings.isBackgroundMonitoringEnabled = false
assertFalse(settings.isBackgroundMonitoringEnabled) assertFalse(settings.isBackgroundMonitoringEnabled)
settings.isWidgetBiometricEnabled = true
assertTrue(settings.isWidgetBiometricEnabled)
} }
@Test @Test