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
Build & Release Android APK / Build & Publish Release APK (push) Canceled after 1m24s
This commit is contained in:
@@ -272,6 +272,9 @@ class MainActivity : FragmentActivity() {
|
||||
vibrateFeedback(true)
|
||||
Toast.makeText(this, "Sending $actionName signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
||||
ActionTriggerWorker.enqueue(this, device.id, action, source)
|
||||
if (source == "Widget") {
|
||||
finish()
|
||||
}
|
||||
}
|
||||
|
||||
if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(this)) {
|
||||
@@ -282,8 +285,13 @@ class MainActivity : FragmentActivity() {
|
||||
) { success, errorMsg ->
|
||||
if (success) {
|
||||
onAuthorized()
|
||||
} else if (errorMsg != null) {
|
||||
Toast.makeText(this, "Authentication cancelled", Toast.LENGTH_SHORT).show()
|
||||
} else {
|
||||
if (errorMsg != null) {
|
||||
Toast.makeText(this, "Authentication cancelled", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
if (source == "Widget") {
|
||||
finish()
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -8,6 +8,7 @@ class AppSettings(private val storage: KeyValueStorage) {
|
||||
|
||||
companion object {
|
||||
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_LAST_STATUS_PREFIX = "last_status_"
|
||||
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)
|
||||
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
|
||||
get() = storage.getBoolean(KEY_BG_MONITOR_ENABLED, true)
|
||||
set(value) = storage.putBoolean(KEY_BG_MONITOR_ENABLED, value)
|
||||
|
||||
@@ -60,6 +60,8 @@ import com.expapp.trigger.ui.theme.TextSecondary
|
||||
fun SettingsDialog(
|
||||
isBiometricEnabled: Boolean,
|
||||
onBiometricToggled: (Boolean) -> Unit,
|
||||
isWidgetBiometricEnabled: Boolean = false,
|
||||
onWidgetBiometricToggled: (Boolean) -> Unit = {},
|
||||
isBgMonitorEnabled: Boolean,
|
||||
onBgMonitorToggled: (Boolean) -> Unit,
|
||||
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))
|
||||
|
||||
// Background Monitor Setting Card
|
||||
|
||||
@@ -151,6 +151,7 @@ fun MainScreen(
|
||||
var showNfcWriteDialog by remember { mutableStateOf(false) }
|
||||
var historyLogs by remember { mutableStateOf(historyRepository.getLogs()) }
|
||||
var isBiometricEnabled by remember { mutableStateOf(appSettings.isBiometricEnabled) }
|
||||
var isWidgetBiometricEnabled by remember { mutableStateOf(appSettings.isWidgetBiometricEnabled) }
|
||||
var isBgMonitorEnabled by remember { mutableStateOf(appSettings.isBackgroundMonitoringEnabled) }
|
||||
|
||||
val loadingStates = remember { mutableStateMapOf<String, Boolean>() }
|
||||
@@ -570,6 +571,11 @@ fun MainScreen(
|
||||
isBiometricEnabled = enabled
|
||||
appSettings.isBiometricEnabled = enabled
|
||||
},
|
||||
isWidgetBiometricEnabled = isWidgetBiometricEnabled,
|
||||
onWidgetBiometricToggled = { enabled ->
|
||||
isWidgetBiometricEnabled = enabled
|
||||
appSettings.isWidgetBiometricEnabled = enabled
|
||||
},
|
||||
isBgMonitorEnabled = isBgMonitorEnabled,
|
||||
onBgMonitorToggled = { enabled ->
|
||||
isBgMonitorEnabled = enabled
|
||||
|
||||
@@ -9,22 +9,31 @@ import android.content.Intent
|
||||
import android.os.Build
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import android.os.VibrationEffect
|
||||
import android.os.Vibrator
|
||||
import android.os.VibratorManager
|
||||
import android.widget.RemoteViews
|
||||
import android.widget.Toast
|
||||
import com.expapp.trigger.MainActivity
|
||||
import com.expapp.trigger.R
|
||||
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.NodeStatus
|
||||
import com.expapp.trigger.network.TriggerAction
|
||||
import com.expapp.trigger.network.TriggerClient
|
||||
import com.expapp.trigger.worker.ActionTriggerWorker
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.Date
|
||||
import java.util.Locale
|
||||
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() {
|
||||
|
||||
companion object {
|
||||
@@ -50,6 +59,31 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
||||
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(
|
||||
@@ -65,11 +99,13 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
||||
val device = devices.firstOrNull()
|
||||
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()) {
|
||||
executor.execute {
|
||||
try {
|
||||
val status = TriggerClient().checkStatusSync(device)
|
||||
val appSettings = AppSettings(context)
|
||||
appSettings.setLastStatus(device.id, status.isOnline)
|
||||
mainHandler.post {
|
||||
try {
|
||||
renderWidget(context, appWidgetManager, appWidgetId, device, status)
|
||||
@@ -95,39 +131,66 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
||||
ACTION_TRIGGER -> {
|
||||
val deviceId = intent.getStringExtra(EXTRA_DEVICE_ID) ?: 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)
|
||||
if (appSettings.isBiometricEnabled) {
|
||||
// Biometric is enabled: open MainActivity with Trigger intent
|
||||
val launchIntent = Intent(context, MainActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
this.action = ACTION_TRIGGER
|
||||
if (appSettings.isWidgetBiometricEnabled && appSettings.isBiometricEnabled) {
|
||||
// Biometric is explicitly required for widget: launch transparent prompt over home screen
|
||||
val launchIntent = Intent(context, WidgetAuthActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_NO_ANIMATION
|
||||
putExtra(EXTRA_DEVICE_ID, deviceId)
|
||||
putExtra(EXTRA_ACTION, actionName)
|
||||
}
|
||||
context.startActivity(launchIntent)
|
||||
} else {
|
||||
// Biometric disabled: execute via guaranteed background worker
|
||||
Toast.makeText(context, "Sending ${action.name} signal...", Toast.LENGTH_SHORT).show()
|
||||
// Frictionless 1-tap trigger directly from home screen without opening the app
|
||||
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")
|
||||
}
|
||||
}
|
||||
|
||||
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 {
|
||||
val repository = DeviceRepository(SharedPrefsStorage(context))
|
||||
val device = repository.getDevices().firstOrNull()
|
||||
if (device != null) {
|
||||
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 {
|
||||
val appWidgetManager = AppWidgetManager.getInstance(context)
|
||||
val thisWidget = ComponentName(context, ServerWidgetProvider::class.java)
|
||||
val ids = appWidgetManager.getAppWidgetIds(thisWidget)
|
||||
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()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -150,56 +213,55 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
||||
views.setTextViewText(R.id.widget_device_name, "No Device")
|
||||
views.setTextViewText(R.id.widget_node_name, "Configure in app")
|
||||
views.setTextViewText(R.id.widget_status_text, "OFFLINE")
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_gray)
|
||||
views.setTextViewText(R.id.widget_footer_text, "Open app to add server")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFFEF4444.toInt())
|
||||
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(
|
||||
context, 0, appIntent,
|
||||
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_root, pendingApp)
|
||||
views.setOnClickPendingIntent(R.id.widget_app_icon_badge, pendingApp)
|
||||
appWidgetManager.updateAppWidget(appWidgetId, views)
|
||||
return
|
||||
}
|
||||
|
||||
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) {
|
||||
views.setTextViewText(R.id.widget_status_text, "SYNCING")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFF71717A.toInt())
|
||||
views.setTextViewText(R.id.widget_status_text, "CHECKING")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFF9CA3AF.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)
|
||||
} else if (status.isOnline) {
|
||||
views.setTextViewText(R.id.widget_status_text, "ONLINE")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFF22C55E.toInt())
|
||||
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 {
|
||||
views.setTextViewText(R.id.widget_status_text, "OFFLINE")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFFEF4444.toInt())
|
||||
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,
|
||||
footerOverride ?: (if (status?.uptime != null) "Up: ${status.uptime}" else "Tap header to open • Tap button to trigger")
|
||||
)
|
||||
|
||||
// Header click -> Open app
|
||||
val openAppIntent = Intent(context, MainActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
// Contextual Footer Text
|
||||
val defaultFooter = when {
|
||||
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"
|
||||
}
|
||||
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_header_clickable, pendingOpenApp)
|
||||
views.setTextViewText(R.id.widget_footer_text, footerOverride ?: defaultFooter)
|
||||
|
||||
// Refresh click
|
||||
// Dedicated Refresh Broadcast Intent
|
||||
val refreshIntent = Intent(context, ServerWidgetProvider::class.java).apply {
|
||||
action = ACTION_REFRESH
|
||||
}
|
||||
@@ -209,21 +271,37 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
||||
refreshIntent,
|
||||
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(
|
||||
R.id.widget_btn_power_on,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 2, device.id, TriggerAction.POWER_ON)
|
||||
)
|
||||
|
||||
// Reboot click
|
||||
// Reboot click (1-tap background action)
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_reboot,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 3, device.id, TriggerAction.REBOOT)
|
||||
)
|
||||
|
||||
// Power Off click
|
||||
// Power Off click (1-tap background action)
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_power_off,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 4, device.id, TriggerAction.POWER_OFF)
|
||||
@@ -253,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)
|
||||
)
|
||||
}
|
||||
|
||||
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) {}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user