Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0bcca1fbf4 | ||
|
|
898b2468c5 | ||
|
|
ff989afcc1 |
@@ -11,8 +11,8 @@ android {
|
||||
applicationId = "com.expapp.trigger"
|
||||
minSdk = 24
|
||||
targetSdk = 34
|
||||
versionCode = 4
|
||||
versionName = "1.1.0"
|
||||
versionCode = 7
|
||||
versionName = "1.1.3"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables {
|
||||
|
||||
@@ -38,6 +38,7 @@ import com.expapp.trigger.ui.screens.MainScreen
|
||||
import com.expapp.trigger.ui.theme.DarkBackground
|
||||
import com.expapp.trigger.ui.theme.ExpAppTheme
|
||||
import com.expapp.trigger.widget.ServerWidgetProvider
|
||||
import com.expapp.trigger.worker.NotificationHelper
|
||||
import com.expapp.trigger.worker.ServerMonitorWorker
|
||||
|
||||
class MainActivity : FragmentActivity() {
|
||||
@@ -50,22 +51,72 @@ class MainActivity : FragmentActivity() {
|
||||
private var activeNfcWritePayload by mutableStateOf<NfcTriggerPayload?>(null)
|
||||
private var nfcWriteResult by mutableStateOf<Result<Unit>?>(null)
|
||||
|
||||
private var isNotificationPermissionGranted by mutableStateOf(false)
|
||||
private var onNotificationPermissionGrantedCallback: (() -> Unit)? = null
|
||||
|
||||
private val notificationPermissionLauncher =
|
||||
registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
|
||||
if (isGranted && appSettings.isBackgroundMonitoringEnabled) {
|
||||
ServerMonitorWorker.schedule(this)
|
||||
isNotificationPermissionGranted = isGranted || NotificationHelper.areNotificationsEnabled(this)
|
||||
if (isGranted) {
|
||||
NotificationHelper.createNotificationChannel(this)
|
||||
if (appSettings.isBackgroundMonitoringEnabled) {
|
||||
ServerMonitorWorker.schedule(this)
|
||||
}
|
||||
onNotificationPermissionGrantedCallback?.invoke()
|
||||
} else {
|
||||
Toast.makeText(this, "Notification permission is required for alerts", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
onNotificationPermissionGrantedCallback = null
|
||||
}
|
||||
|
||||
fun requestNotificationPermission(onGranted: () -> Unit = {}) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||
if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
|
||||
== PackageManager.PERMISSION_GRANTED
|
||||
) {
|
||||
isNotificationPermissionGranted = true
|
||||
onGranted()
|
||||
} else {
|
||||
onNotificationPermissionGrantedCallback = onGranted
|
||||
notificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
|
||||
}
|
||||
} else {
|
||||
isNotificationPermissionGranted = NotificationHelper.areNotificationsEnabled(this)
|
||||
onGranted()
|
||||
}
|
||||
}
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
enableEdgeToEdge()
|
||||
|
||||
repository = DeviceRepository(SharedPrefsStorage(applicationContext))
|
||||
val settingsPrefs = getSharedPreferences("app_settings_prefs", Context.MODE_PRIVATE)
|
||||
val hasSeeded = settingsPrefs.getBoolean("has_seeded_default_device", false)
|
||||
if (!hasSeeded) {
|
||||
settingsPrefs.edit().putBoolean("has_seeded_default_device", true).apply()
|
||||
if (repository.getDevices().isEmpty()) {
|
||||
val defaultDevice = DeviceConfig(
|
||||
id = "2dc98ae9-9f71-4f29-95a6-a59ac94d7bf6",
|
||||
name = "Server",
|
||||
node = "debian",
|
||||
powerOffUrl = "https://cosmos.linuxguy.space/poweroff?node=debian",
|
||||
powerOnUrl = "https://trigger.macrodroid.com/87f2f62c-09ee-43cb-8796-fd1a6465754b/wakeserver",
|
||||
r2Url = "https://bucket.linuxguy.space/home-server-app/endpoints.json",
|
||||
rebootUrl = "https://cosmos.linuxguy.space/reboot?node=debian",
|
||||
secretKey = "Carbon@12",
|
||||
statusUrl = "https://cosmos.linuxguy.space/status?node=debian"
|
||||
)
|
||||
repository.addDevice(defaultDevice)
|
||||
}
|
||||
}
|
||||
triggerClient = TriggerClient()
|
||||
appSettings = AppSettings(applicationContext)
|
||||
historyRepository = TriggerHistoryRepository(applicationContext)
|
||||
|
||||
NotificationHelper.createNotificationChannel(this)
|
||||
isNotificationPermissionGranted = NotificationHelper.areNotificationsEnabled(this)
|
||||
|
||||
// Request notification permission on Android 13+
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||
if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
|
||||
@@ -77,7 +128,6 @@ class MainActivity : FragmentActivity() {
|
||||
|
||||
// Initialize background server monitoring
|
||||
if (appSettings.isBackgroundMonitoringEnabled) {
|
||||
ServerMonitorWorker.createNotificationChannel(this)
|
||||
ServerMonitorWorker.schedule(this)
|
||||
}
|
||||
|
||||
@@ -100,6 +150,18 @@ class MainActivity : FragmentActivity() {
|
||||
onResult(success)
|
||||
}
|
||||
},
|
||||
isNotificationPermissionGranted = isNotificationPermissionGranted,
|
||||
onRequestNotificationPermission = {
|
||||
requestNotificationPermission()
|
||||
},
|
||||
onSendTestNotification = {
|
||||
val ok = NotificationHelper.sendTestNotification(this)
|
||||
if (ok) {
|
||||
Toast.makeText(this, "Test notification sent!", Toast.LENGTH_SHORT).show()
|
||||
} else {
|
||||
Toast.makeText(this, "Notification failed to send. Check system permissions.", Toast.LENGTH_LONG).show()
|
||||
}
|
||||
},
|
||||
nfcWriteResult = nfcWriteResult,
|
||||
onStartNfcWriting = { payload ->
|
||||
nfcWriteResult = null
|
||||
@@ -117,6 +179,7 @@ class MainActivity : FragmentActivity() {
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
isNotificationPermissionGranted = NotificationHelper.areNotificationsEnabled(this)
|
||||
if (NfcHelper.isNfcSupported(this)) {
|
||||
NfcHelper.enableForegroundDispatch(this)
|
||||
}
|
||||
@@ -129,6 +192,15 @@ class MainActivity : FragmentActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
override fun onStop() {
|
||||
super.onStop()
|
||||
// When leaving the app, trigger an immediate one-time check & ensure worker is scheduled
|
||||
if (appSettings.isBackgroundMonitoringEnabled) {
|
||||
ServerMonitorWorker.runOnce(this)
|
||||
ServerMonitorWorker.schedule(this)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onNewIntent(intent: Intent) {
|
||||
super.onNewIntent(intent)
|
||||
setIntent(intent)
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
package com.expapp.trigger.ui.components
|
||||
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.provider.Settings
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.border
|
||||
import androidx.compose.foundation.clickable
|
||||
@@ -19,7 +23,11 @@ import androidx.compose.material.icons.filled.Close
|
||||
import androidx.compose.material.icons.filled.Fingerprint
|
||||
import androidx.compose.material.icons.filled.Nfc
|
||||
import androidx.compose.material.icons.filled.Notifications
|
||||
import androidx.compose.material.icons.filled.NotificationsActive
|
||||
import androidx.compose.material.icons.filled.Settings
|
||||
import androidx.compose.material.icons.filled.Warning
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.Surface
|
||||
@@ -30,17 +38,20 @@ import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.compose.ui.window.Dialog
|
||||
import com.expapp.trigger.BuildConfig
|
||||
import com.expapp.trigger.ui.theme.AmberVibrant
|
||||
import com.expapp.trigger.ui.theme.BgCard
|
||||
import com.expapp.trigger.ui.theme.BgElevated
|
||||
import com.expapp.trigger.ui.theme.BgSurface
|
||||
import com.expapp.trigger.ui.theme.BorderSubtle
|
||||
import com.expapp.trigger.ui.theme.GreenVibrant
|
||||
import com.expapp.trigger.ui.theme.RedVibrant
|
||||
import com.expapp.trigger.ui.theme.TextMuted
|
||||
import com.expapp.trigger.ui.theme.TextPrimary
|
||||
import com.expapp.trigger.ui.theme.TextSecondary
|
||||
@@ -53,9 +64,14 @@ fun SettingsDialog(
|
||||
onBgMonitorToggled: (Boolean) -> Unit,
|
||||
isBiometricAvailable: Boolean,
|
||||
isNfcAvailable: Boolean,
|
||||
isNotificationPermissionGranted: Boolean,
|
||||
onRequestNotificationPermission: () -> Unit,
|
||||
onSendTestNotification: () -> Unit,
|
||||
onOpenNfcWriter: () -> Unit,
|
||||
onDismiss: () -> Unit
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
|
||||
Dialog(onDismissRequest = onDismiss) {
|
||||
Surface(
|
||||
modifier = Modifier.fillMaxWidth(0.95f),
|
||||
@@ -151,7 +167,7 @@ fun SettingsDialog(
|
||||
|
||||
Spacer(modifier = Modifier.height(12.dp))
|
||||
|
||||
// Background Monitor Setting
|
||||
// Background Monitor Setting Card
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
@@ -160,41 +176,118 @@ fun SettingsDialog(
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(14.dp))
|
||||
.padding(14.dp)
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Notifications,
|
||||
contentDescription = null,
|
||||
tint = if (isBgMonitorEnabled) GreenVibrant else TextMuted,
|
||||
modifier = Modifier.size(28.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(12.dp))
|
||||
Column(modifier = Modifier.weight(1f)) {
|
||||
Text(
|
||||
"Server Status Alerts",
|
||||
color = TextPrimary,
|
||||
fontSize = 14.sp,
|
||||
fontWeight = FontWeight.SemiBold
|
||||
Column {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Notifications,
|
||||
contentDescription = null,
|
||||
tint = if (isBgMonitorEnabled && isNotificationPermissionGranted) GreenVibrant else TextMuted,
|
||||
modifier = Modifier.size(28.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.height(2.dp))
|
||||
Text(
|
||||
"Notify outside app if servers go offline or online",
|
||||
color = TextMuted,
|
||||
fontSize = 11.sp
|
||||
Spacer(modifier = Modifier.width(12.dp))
|
||||
Column(modifier = Modifier.weight(1f)) {
|
||||
Text(
|
||||
"Server Status Alerts",
|
||||
color = TextPrimary,
|
||||
fontSize = 14.sp,
|
||||
fontWeight = FontWeight.SemiBold
|
||||
)
|
||||
Spacer(modifier = Modifier.height(2.dp))
|
||||
Text(
|
||||
"Alert outside app when servers go offline or online",
|
||||
color = TextMuted,
|
||||
fontSize = 11.sp
|
||||
)
|
||||
}
|
||||
Switch(
|
||||
checked = isBgMonitorEnabled,
|
||||
onCheckedChange = { enabled ->
|
||||
if (enabled && !isNotificationPermissionGranted) {
|
||||
onRequestNotificationPermission()
|
||||
}
|
||||
onBgMonitorToggled(enabled)
|
||||
},
|
||||
colors = SwitchDefaults.colors(
|
||||
checkedThumbColor = GreenVibrant,
|
||||
checkedTrackColor = GreenVibrant.copy(alpha = 0.3f),
|
||||
uncheckedThumbColor = TextMuted,
|
||||
uncheckedTrackColor = BgElevated
|
||||
)
|
||||
)
|
||||
}
|
||||
Switch(
|
||||
checked = isBgMonitorEnabled,
|
||||
onCheckedChange = { onBgMonitorToggled(it) },
|
||||
colors = SwitchDefaults.colors(
|
||||
checkedThumbColor = GreenVibrant,
|
||||
checkedTrackColor = GreenVibrant.copy(alpha = 0.3f),
|
||||
uncheckedThumbColor = TextMuted,
|
||||
uncheckedTrackColor = BgElevated
|
||||
|
||||
// Warning banner if notification permission is blocked
|
||||
if (isBgMonitorEnabled && !isNotificationPermissionGranted) {
|
||||
Spacer(modifier = Modifier.height(10.dp))
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(8.dp))
|
||||
.background(AmberVibrant.copy(alpha = 0.12f))
|
||||
.border(1.dp, AmberVibrant.copy(alpha = 0.3f), RoundedCornerShape(8.dp))
|
||||
.clickable {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||
onRequestNotificationPermission()
|
||||
} else {
|
||||
val intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS).apply {
|
||||
putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
|
||||
}
|
||||
context.startActivity(intent)
|
||||
}
|
||||
}
|
||||
.padding(8.dp)
|
||||
) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Icon(
|
||||
Icons.Default.Warning,
|
||||
contentDescription = null,
|
||||
tint = AmberVibrant,
|
||||
modifier = Modifier.size(16.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(6.dp))
|
||||
Text(
|
||||
"Notification permission missing. Tap to enable.",
|
||||
color = AmberVibrant,
|
||||
fontSize = 11.sp,
|
||||
fontWeight = FontWeight.Medium
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Send Test Notification button
|
||||
Spacer(modifier = Modifier.height(10.dp))
|
||||
Button(
|
||||
onClick = {
|
||||
if (!isNotificationPermissionGranted) {
|
||||
onRequestNotificationPermission()
|
||||
} else {
|
||||
onSendTestNotification()
|
||||
}
|
||||
},
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = if (isNotificationPermissionGranted) GreenVibrant.copy(alpha = 0.15f) else AmberVibrant.copy(alpha = 0.15f)
|
||||
),
|
||||
shape = RoundedCornerShape(8.dp),
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.NotificationsActive,
|
||||
contentDescription = null,
|
||||
tint = if (isNotificationPermissionGranted) GreenVibrant else AmberVibrant,
|
||||
modifier = Modifier.size(16.dp)
|
||||
)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
Text(
|
||||
text = if (isNotificationPermissionGranted) "Send Test Notification" else "Grant Permission & Test",
|
||||
color = if (isNotificationPermissionGranted) GreenVibrant else AmberVibrant,
|
||||
fontSize = 12.sp,
|
||||
fontWeight = FontWeight.SemiBold
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -15,6 +15,8 @@ import androidx.compose.animation.fadeOut
|
||||
import androidx.compose.animation.togetherWith
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.border
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
@@ -66,6 +68,7 @@ import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
||||
import androidx.compose.ui.text.input.VisualTransformation
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import com.expapp.trigger.data.model.DeviceConfig
|
||||
@@ -274,10 +277,12 @@ fun DevicePage(
|
||||
)
|
||||
|
||||
val isOnline = nodeStatus?.isOnline
|
||||
val scrollState = rememberScrollState()
|
||||
|
||||
Column(
|
||||
modifier = modifier
|
||||
.fillMaxSize()
|
||||
.verticalScroll(scrollState)
|
||||
.padding(horizontal = 16.dp, vertical = 8.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(12.dp)
|
||||
) {
|
||||
@@ -313,159 +318,161 @@ fun DevicePage(
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 20.dp, vertical = 18.dp)
|
||||
.padding(horizontal = 18.dp, vertical = 16.dp)
|
||||
) {
|
||||
// Title row
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
modifier = Modifier.weight(1f)
|
||||
) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(48.dp)
|
||||
.clip(RoundedCornerShape(14.dp))
|
||||
.background(
|
||||
Brush.radialGradient(
|
||||
listOf(
|
||||
when (isOnline) {
|
||||
true -> GreenVibrant.copy(alpha = 0.18f)
|
||||
false -> RedVibrant.copy(alpha = 0.12f)
|
||||
null -> BorderDefault.copy(alpha = 0.1f)
|
||||
},
|
||||
Color.Transparent
|
||||
)
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(44.dp)
|
||||
.clip(RoundedCornerShape(12.dp))
|
||||
.background(
|
||||
Brush.radialGradient(
|
||||
listOf(
|
||||
when (isOnline) {
|
||||
true -> GreenVibrant.copy(alpha = 0.18f)
|
||||
false -> RedVibrant.copy(alpha = 0.12f)
|
||||
null -> BorderDefault.copy(alpha = 0.1f)
|
||||
},
|
||||
Color.Transparent
|
||||
)
|
||||
)
|
||||
.border(
|
||||
1.dp,
|
||||
when (isOnline) {
|
||||
true -> GreenVibrant.copy(alpha = 0.35f)
|
||||
false -> RedVibrant.copy(alpha = 0.25f)
|
||||
null -> BorderSubtle
|
||||
},
|
||||
RoundedCornerShape(14.dp)
|
||||
),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Terminal,
|
||||
contentDescription = null,
|
||||
tint = when (isOnline) {
|
||||
true -> GreenVibrant
|
||||
false -> RedVibrant.copy(alpha = 0.6f)
|
||||
null -> TextSecondary
|
||||
},
|
||||
modifier = Modifier.size(22.dp)
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.width(14.dp))
|
||||
|
||||
Column {
|
||||
Text(
|
||||
text = device.name,
|
||||
fontSize = 20.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary,
|
||||
maxLines = 1
|
||||
)
|
||||
Text(
|
||||
text = device.node,
|
||||
fontSize = 11.sp,
|
||||
color = TextMuted,
|
||||
fontFamily = FontFamily.Monospace,
|
||||
letterSpacing = 0.5.sp
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Re-fetch R2 JSON config button
|
||||
IconButton(
|
||||
onClick = onSyncConfig,
|
||||
modifier = Modifier
|
||||
.size(36.dp)
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.background(AmberVibrant.copy(alpha = 0.08f))
|
||||
.border(1.dp, AmberVibrant.copy(alpha = 0.2f), RoundedCornerShape(10.dp))
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.CloudSync,
|
||||
contentDescription = "Re-fetch R2 JSON",
|
||||
tint = AmberVibrant,
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.width(6.dp))
|
||||
|
||||
// Edit device button
|
||||
IconButton(
|
||||
onClick = { showEditDialog = true },
|
||||
modifier = Modifier
|
||||
.size(36.dp)
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.background(BorderSubtle.copy(alpha = 0.3f))
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(10.dp))
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Edit,
|
||||
contentDescription = "Edit device",
|
||||
tint = TextSecondary,
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.width(6.dp))
|
||||
|
||||
// Refresh button (spins while checking)
|
||||
IconButton(
|
||||
onClick = { if (!isCheckingStatus) onRefreshStatus() },
|
||||
modifier = Modifier
|
||||
.size(36.dp)
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.background(
|
||||
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.12f)
|
||||
else BorderSubtle.copy(alpha = 0.3f)
|
||||
)
|
||||
.border(
|
||||
1.dp,
|
||||
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.3f)
|
||||
else BorderSubtle,
|
||||
RoundedCornerShape(10.dp)
|
||||
)
|
||||
when (isOnline) {
|
||||
true -> GreenVibrant.copy(alpha = 0.35f)
|
||||
false -> RedVibrant.copy(alpha = 0.25f)
|
||||
null -> BorderSubtle
|
||||
},
|
||||
RoundedCornerShape(12.dp)
|
||||
),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Refresh,
|
||||
contentDescription = "Refresh status",
|
||||
tint = if (isCheckingStatus) GreenVibrant else TextMuted,
|
||||
modifier = Modifier
|
||||
.size(18.dp)
|
||||
.rotate(if (isCheckingStatus) spinAngle else 0f)
|
||||
imageVector = Icons.Default.Terminal,
|
||||
contentDescription = null,
|
||||
tint = when (isOnline) {
|
||||
true -> GreenVibrant
|
||||
false -> RedVibrant.copy(alpha = 0.6f)
|
||||
null -> TextSecondary
|
||||
},
|
||||
modifier = Modifier.size(20.dp)
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
Spacer(modifier = Modifier.width(10.dp))
|
||||
|
||||
// Delete button
|
||||
IconButton(
|
||||
onClick = { showDeleteConfirm = true },
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.size(36.dp)
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.background(RedVibrant.copy(alpha = 0.08f))
|
||||
.border(1.dp, RedVibrant.copy(alpha = 0.15f), RoundedCornerShape(10.dp))
|
||||
.weight(1f)
|
||||
.padding(end = 6.dp)
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.DeleteOutline,
|
||||
contentDescription = "Remove device",
|
||||
tint = RedVibrant.copy(alpha = 0.7f),
|
||||
modifier = Modifier.size(18.dp)
|
||||
Text(
|
||||
text = device.name,
|
||||
fontSize = 18.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis
|
||||
)
|
||||
Spacer(modifier = Modifier.height(2.dp))
|
||||
Text(
|
||||
text = device.node,
|
||||
fontSize = 11.sp,
|
||||
color = TextMuted,
|
||||
fontFamily = FontFamily.Monospace,
|
||||
letterSpacing = 0.5.sp,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis
|
||||
)
|
||||
}
|
||||
|
||||
// Action buttons in a fixed non-shrinking Row
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(4.dp)
|
||||
) {
|
||||
// Re-fetch R2 JSON config button
|
||||
IconButton(
|
||||
onClick = onSyncConfig,
|
||||
modifier = Modifier
|
||||
.size(34.dp)
|
||||
.clip(RoundedCornerShape(9.dp))
|
||||
.background(AmberVibrant.copy(alpha = 0.08f))
|
||||
.border(1.dp, AmberVibrant.copy(alpha = 0.2f), RoundedCornerShape(9.dp))
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.CloudSync,
|
||||
contentDescription = "Re-fetch R2 JSON",
|
||||
tint = AmberVibrant,
|
||||
modifier = Modifier.size(17.dp)
|
||||
)
|
||||
}
|
||||
|
||||
// Edit device button
|
||||
IconButton(
|
||||
onClick = { showEditDialog = true },
|
||||
modifier = Modifier
|
||||
.size(34.dp)
|
||||
.clip(RoundedCornerShape(9.dp))
|
||||
.background(BorderSubtle.copy(alpha = 0.3f))
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Edit,
|
||||
contentDescription = "Edit device",
|
||||
tint = TextSecondary,
|
||||
modifier = Modifier.size(17.dp)
|
||||
)
|
||||
}
|
||||
|
||||
// Refresh button (spins while checking)
|
||||
IconButton(
|
||||
onClick = { if (!isCheckingStatus) onRefreshStatus() },
|
||||
modifier = Modifier
|
||||
.size(34.dp)
|
||||
.clip(RoundedCornerShape(9.dp))
|
||||
.background(
|
||||
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.12f)
|
||||
else BorderSubtle.copy(alpha = 0.3f)
|
||||
)
|
||||
.border(
|
||||
1.dp,
|
||||
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.3f)
|
||||
else BorderSubtle,
|
||||
RoundedCornerShape(9.dp)
|
||||
)
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Refresh,
|
||||
contentDescription = "Refresh status",
|
||||
tint = if (isCheckingStatus) GreenVibrant else TextMuted,
|
||||
modifier = Modifier
|
||||
.size(17.dp)
|
||||
.rotate(if (isCheckingStatus) spinAngle else 0f)
|
||||
)
|
||||
}
|
||||
|
||||
// Delete button
|
||||
IconButton(
|
||||
onClick = { showDeleteConfirm = true },
|
||||
modifier = Modifier
|
||||
.size(34.dp)
|
||||
.clip(RoundedCornerShape(9.dp))
|
||||
.background(RedVibrant.copy(alpha = 0.08f))
|
||||
.border(1.dp, RedVibrant.copy(alpha = 0.15f), RoundedCornerShape(9.dp))
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.DeleteOutline,
|
||||
contentDescription = "Remove device",
|
||||
tint = RedVibrant.copy(alpha = 0.7f),
|
||||
modifier = Modifier.size(17.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.pager.HorizontalPager
|
||||
import androidx.compose.foundation.pager.rememberPagerState
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.ExperimentalMaterialApi
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Add
|
||||
import androidx.compose.material.icons.filled.History
|
||||
@@ -29,12 +29,15 @@ import androidx.compose.material.icons.filled.Refresh
|
||||
import androidx.compose.material.icons.filled.Settings
|
||||
import androidx.compose.material.icons.filled.SystemUpdate
|
||||
import androidx.compose.material.icons.filled.Terminal
|
||||
import androidx.compose.material3.TopAppBar
|
||||
import androidx.compose.material.pullrefresh.PullRefreshIndicator
|
||||
import androidx.compose.material.pullrefresh.pullRefresh
|
||||
import androidx.compose.material.pullrefresh.rememberPullRefreshState
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TopAppBar
|
||||
import androidx.compose.material3.TopAppBarDefaults
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.DisposableEffect
|
||||
@@ -94,7 +97,11 @@ import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.isActive
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
|
||||
@OptIn(
|
||||
ExperimentalFoundationApi::class,
|
||||
ExperimentalMaterial3Api::class,
|
||||
ExperimentalMaterialApi::class
|
||||
)
|
||||
@Composable
|
||||
fun MainScreen(
|
||||
repository: DeviceRepository,
|
||||
@@ -102,6 +109,9 @@ fun MainScreen(
|
||||
appSettings: AppSettings,
|
||||
historyRepository: TriggerHistoryRepository,
|
||||
requestBiometricAuth: (title: String, subtitle: String, onResult: (Boolean) -> Unit) -> Unit = { _, _, cb -> cb(true) },
|
||||
isNotificationPermissionGranted: Boolean = true,
|
||||
onRequestNotificationPermission: () -> Unit = {},
|
||||
onSendTestNotification: () -> Unit = {},
|
||||
nfcWriteResult: Result<Unit>? = null,
|
||||
onStartNfcWriting: (NfcTriggerPayload) -> Unit = {},
|
||||
onStopNfcWriting: () -> Unit = {},
|
||||
@@ -141,36 +151,12 @@ fun MainScreen(
|
||||
var isBiometricEnabled by remember { mutableStateOf(appSettings.isBiometricEnabled) }
|
||||
var isBgMonitorEnabled by remember { mutableStateOf(appSettings.isBackgroundMonitoringEnabled) }
|
||||
|
||||
fun checkAppUpdate(showToast: Boolean = false) {
|
||||
isCheckingUpdate = true
|
||||
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
|
||||
isCheckingUpdate = false
|
||||
when (result) {
|
||||
is UpdateCheckResult.UpdateAvailable -> {
|
||||
availableUpdate = result.info
|
||||
if (showToast || dismissedVersion != result.info.versionName) {
|
||||
showUpdateDialog = true
|
||||
}
|
||||
}
|
||||
is UpdateCheckResult.UpToDate -> {
|
||||
if (showToast) {
|
||||
Toast.makeText(context, "App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
is UpdateCheckResult.Error -> {
|
||||
if (showToast) {
|
||||
Toast.makeText(context, "Update check failed: ${result.message}", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val loadingStates = remember { mutableStateMapOf<String, Boolean>() }
|
||||
val statusStates = remember { mutableStateMapOf<String, Pair<String, Boolean>>() }
|
||||
val nodeStatuses = remember { mutableStateMapOf<String, NodeStatus>() }
|
||||
val checkingStatusMap = remember { mutableStateMapOf<String, Boolean>() }
|
||||
var isSyncing by remember { mutableStateOf(false) }
|
||||
var isPullRefreshing by remember { mutableStateOf(false) }
|
||||
|
||||
fun refreshStatus(device: DeviceConfig, showIndicator: Boolean = false) {
|
||||
if (showIndicator || nodeStatuses[device.id] == null) {
|
||||
@@ -179,6 +165,8 @@ fun MainScreen(
|
||||
triggerClient.checkStatus(device) { status ->
|
||||
checkingStatusMap[device.id] = false
|
||||
nodeStatuses[device.id] = status
|
||||
// Keep background monitoring synced with the latest live status
|
||||
appSettings.setLastStatus(device.id, status.isOnline)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -211,6 +199,60 @@ fun MainScreen(
|
||||
}
|
||||
}
|
||||
|
||||
fun checkAppUpdate(showToast: Boolean = false) {
|
||||
isCheckingUpdate = true
|
||||
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
|
||||
isCheckingUpdate = false
|
||||
when (result) {
|
||||
is UpdateCheckResult.UpdateAvailable -> {
|
||||
availableUpdate = result.info
|
||||
if (showToast || dismissedVersion != result.info.versionName) {
|
||||
showUpdateDialog = true
|
||||
}
|
||||
}
|
||||
is UpdateCheckResult.UpToDate -> {
|
||||
if (showToast) {
|
||||
Toast.makeText(context, "App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
is UpdateCheckResult.Error -> {
|
||||
if (showToast) {
|
||||
Toast.makeText(context, "Update check failed: ${result.message}", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Pull-to-refresh entire page handler
|
||||
fun refreshWholePage() {
|
||||
isPullRefreshing = true
|
||||
coroutineScope.launch {
|
||||
// 1. Sync R2 endpoints
|
||||
syncEndpoints(showToast = false)
|
||||
|
||||
// 2. Poll status for all configured devices
|
||||
devices.forEach { dev ->
|
||||
refreshStatus(dev, showIndicator = true)
|
||||
}
|
||||
|
||||
// 3. Check for app updates
|
||||
checkAppUpdate(showToast = false)
|
||||
|
||||
// 4. Update home screen widgets
|
||||
ServerWidgetProvider.updateAllWidgets(context)
|
||||
|
||||
delay(750)
|
||||
isPullRefreshing = false
|
||||
Toast.makeText(context, "Page refreshed", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
|
||||
val pullRefreshState = rememberPullRefreshState(
|
||||
refreshing = isPullRefreshing,
|
||||
onRefresh = { refreshWholePage() }
|
||||
)
|
||||
|
||||
// Initial R2 sync and update check on launch
|
||||
LaunchedEffect(Unit) {
|
||||
syncEndpoints(false)
|
||||
@@ -475,49 +517,63 @@ fun MainScreen(
|
||||
}
|
||||
}
|
||||
) { innerPadding ->
|
||||
HorizontalPager(
|
||||
state = pagerState,
|
||||
// Pull to refresh container enclosing HorizontalPager
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(innerPadding)
|
||||
) { page ->
|
||||
if (page < devices.size) {
|
||||
val dev = devices[page]
|
||||
DevicePage(
|
||||
device = dev,
|
||||
isLoading = loadingStates[dev.id] == true,
|
||||
nodeStatus = nodeStatuses[dev.id],
|
||||
isCheckingStatus = checkingStatusMap[dev.id] == true,
|
||||
lastStatus = statusStates[dev.id]?.first,
|
||||
lastSuccess = statusStates[dev.id]?.second,
|
||||
onDismissStatus = { statusStates.remove(dev.id) },
|
||||
onRefreshStatus = { refreshStatus(dev, showIndicator = true) },
|
||||
onTrigger = { action -> executeAction(dev, action) },
|
||||
onDelete = { d ->
|
||||
repository.deleteDevice(d.id)
|
||||
devices = repository.getDevices()
|
||||
},
|
||||
onSyncConfig = { syncEndpoints(true) },
|
||||
onUpdateDevice = { updated ->
|
||||
repository.updateDevice(updated)
|
||||
devices = repository.getDevices()
|
||||
refreshStatus(updated, showIndicator = true)
|
||||
}
|
||||
)
|
||||
} else {
|
||||
AddDevicePage(
|
||||
triggerClient = triggerClient,
|
||||
onDeviceAdded = { newDev ->
|
||||
repository.addDevice(newDev)
|
||||
devices = repository.getDevices()
|
||||
refreshStatus(newDev, showIndicator = true)
|
||||
coroutineScope.launch {
|
||||
val idx = devices.indexOfFirst { it.id == newDev.id }
|
||||
if (idx >= 0) pagerState.animateScrollToPage(idx)
|
||||
.pullRefresh(pullRefreshState)
|
||||
) {
|
||||
HorizontalPager(
|
||||
state = pagerState,
|
||||
modifier = Modifier.fillMaxSize()
|
||||
) { page ->
|
||||
if (page < devices.size) {
|
||||
val dev = devices[page]
|
||||
DevicePage(
|
||||
device = dev,
|
||||
isLoading = loadingStates[dev.id] == true,
|
||||
nodeStatus = nodeStatuses[dev.id],
|
||||
isCheckingStatus = checkingStatusMap[dev.id] == true,
|
||||
lastStatus = statusStates[dev.id]?.first,
|
||||
lastSuccess = statusStates[dev.id]?.second,
|
||||
onDismissStatus = { statusStates.remove(dev.id) },
|
||||
onRefreshStatus = { refreshStatus(dev, showIndicator = true) },
|
||||
onTrigger = { action -> executeAction(dev, action) },
|
||||
onDelete = { d ->
|
||||
repository.deleteDevice(d.id)
|
||||
devices = repository.getDevices()
|
||||
},
|
||||
onSyncConfig = { syncEndpoints(true) },
|
||||
onUpdateDevice = { updated ->
|
||||
repository.updateDevice(updated)
|
||||
devices = repository.getDevices()
|
||||
refreshStatus(updated, showIndicator = true)
|
||||
}
|
||||
}
|
||||
)
|
||||
)
|
||||
} else {
|
||||
AddDevicePage(
|
||||
triggerClient = triggerClient,
|
||||
onDeviceAdded = { newDev ->
|
||||
repository.addDevice(newDev)
|
||||
devices = repository.getDevices()
|
||||
refreshStatus(newDev, showIndicator = true)
|
||||
coroutineScope.launch {
|
||||
val idx = devices.indexOfFirst { it.id == newDev.id }
|
||||
if (idx >= 0) pagerState.animateScrollToPage(idx)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
PullRefreshIndicator(
|
||||
refreshing = isPullRefreshing,
|
||||
state = pullRefreshState,
|
||||
modifier = Modifier.align(Alignment.TopCenter),
|
||||
backgroundColor = BgElevated,
|
||||
contentColor = GreenVibrant
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -550,7 +606,6 @@ fun MainScreen(
|
||||
isBgMonitorEnabled = enabled
|
||||
appSettings.isBackgroundMonitoringEnabled = enabled
|
||||
if (enabled) {
|
||||
ServerMonitorWorker.createNotificationChannel(context)
|
||||
ServerMonitorWorker.schedule(context)
|
||||
} else {
|
||||
ServerMonitorWorker.cancel(context)
|
||||
@@ -558,6 +613,9 @@ fun MainScreen(
|
||||
},
|
||||
isBiometricAvailable = BiometricHelper.isBiometricAvailable(context),
|
||||
isNfcAvailable = NfcHelper.isNfcSupported(context),
|
||||
isNotificationPermissionGranted = isNotificationPermissionGranted,
|
||||
onRequestNotificationPermission = onRequestNotificationPermission,
|
||||
onSendTestNotification = onSendTestNotification,
|
||||
onOpenNfcWriter = {
|
||||
showNfcWriteDialog = true
|
||||
},
|
||||
@@ -590,9 +648,28 @@ fun MainScreen(
|
||||
currentVersion = BuildConfig.VERSION_NAME,
|
||||
downloadState = downloadState,
|
||||
onDownload = {
|
||||
downloadState = DownloadState.Downloading(0, 0, availableUpdate!!.sizeBytes)
|
||||
updateManager.downloadApk(availableUpdate!!.downloadUrl) { state ->
|
||||
downloadState = state
|
||||
val info = availableUpdate!!
|
||||
// If retrying from failure, re-check to get fresh release asset URLs
|
||||
if (downloadState is DownloadState.Failed) {
|
||||
downloadState = DownloadState.Downloading(0, 0, 0)
|
||||
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { checkResult ->
|
||||
if (checkResult is UpdateCheckResult.UpdateAvailable) {
|
||||
availableUpdate = checkResult.info
|
||||
val fresh = checkResult.info
|
||||
updateManager.downloadApk(fresh.downloadUrl, fresh.assetApiUrl) { state ->
|
||||
downloadState = state
|
||||
}
|
||||
} else {
|
||||
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl) { state ->
|
||||
downloadState = state
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
downloadState = DownloadState.Downloading(0, 0, info.sizeBytes)
|
||||
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl) { state ->
|
||||
downloadState = state
|
||||
}
|
||||
}
|
||||
},
|
||||
onInstall = { file ->
|
||||
|
||||
@@ -24,6 +24,9 @@ import java.util.concurrent.TimeUnit
|
||||
class UpdateManager(
|
||||
private val context: Context,
|
||||
private val okHttpClient: OkHttpClient = OkHttpClient.Builder()
|
||||
.followRedirects(true)
|
||||
.followSslRedirects(true)
|
||||
.retryOnConnectionFailure(true)
|
||||
.connectTimeout(30, TimeUnit.SECONDS)
|
||||
.readTimeout(60, TimeUnit.SECONDS)
|
||||
.build(),
|
||||
@@ -103,6 +106,7 @@ class UpdateManager(
|
||||
|
||||
val assets = json.getAsJsonArray("assets")
|
||||
var apkUrl: String? = null
|
||||
var apkApiUrl: String? = null
|
||||
var apkName = "app-release.apk"
|
||||
var apkSize = 0L
|
||||
|
||||
@@ -112,6 +116,7 @@ class UpdateManager(
|
||||
val name = assetObj.get("name")?.asString.orEmpty()
|
||||
if (name.endsWith(".apk", ignoreCase = true)) {
|
||||
apkUrl = assetObj.get("browser_download_url")?.asString
|
||||
apkApiUrl = assetObj.get("url")?.asString
|
||||
apkName = name
|
||||
apkSize = assetObj.get("size")?.asLong ?: 0L
|
||||
break
|
||||
@@ -126,6 +131,7 @@ class UpdateManager(
|
||||
title = title,
|
||||
changelog = changelog,
|
||||
downloadUrl = apkUrl,
|
||||
assetApiUrl = apkApiUrl,
|
||||
apkFileName = apkName,
|
||||
sizeBytes = apkSize
|
||||
)
|
||||
@@ -162,21 +168,39 @@ class UpdateManager(
|
||||
|
||||
/**
|
||||
* Downloads the APK file to the app's cache directory and streams progress updates.
|
||||
* If the browser download URL fails or returns 404, automatically attempts fallback to the API asset URL.
|
||||
*/
|
||||
fun downloadApk(
|
||||
downloadUrl: String,
|
||||
assetApiUrl: String? = null,
|
||||
onProgress: (DownloadState) -> Unit
|
||||
): Call {
|
||||
val request = Request.Builder()
|
||||
.url(downloadUrl)
|
||||
.addHeader("User-Agent", "ServerControlApp")
|
||||
.get()
|
||||
.build()
|
||||
return startDownloadCall(downloadUrl, assetApiUrl, isFallback = false, onProgress)
|
||||
}
|
||||
|
||||
private fun startDownloadCall(
|
||||
url: String,
|
||||
fallbackUrl: String?,
|
||||
isFallback: Boolean,
|
||||
onProgress: (DownloadState) -> Unit
|
||||
): Call {
|
||||
val requestBuilder = Request.Builder()
|
||||
.url(url)
|
||||
.addHeader("User-Agent", "ServerControlApp")
|
||||
|
||||
if (isFallback) {
|
||||
requestBuilder.addHeader("Accept", "application/octet-stream")
|
||||
}
|
||||
|
||||
val request = requestBuilder.get().build()
|
||||
val call = okHttpClient.newCall(request)
|
||||
|
||||
call.enqueue(object : Callback {
|
||||
override fun onFailure(call: Call, e: IOException) {
|
||||
if (!call.isCanceled()) {
|
||||
if (call.isCanceled()) return
|
||||
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
|
||||
startDownloadCall(fallbackUrl, null, isFallback = true, onProgress)
|
||||
} else {
|
||||
runOnMain {
|
||||
onProgress(DownloadState.Failed("Download failed: ${e.localizedMessage}"))
|
||||
}
|
||||
@@ -184,15 +208,24 @@ class UpdateManager(
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call, response: Response) {
|
||||
if (call.isCanceled()) return
|
||||
|
||||
if (!response.isSuccessful) {
|
||||
runOnMain {
|
||||
onProgress(DownloadState.Failed("Server returned HTTP ${response.code}"))
|
||||
response.close()
|
||||
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
|
||||
// Fallback to direct asset API
|
||||
startDownloadCall(fallbackUrl, null, isFallback = true, onProgress)
|
||||
} else {
|
||||
runOnMain {
|
||||
onProgress(DownloadState.Failed("Server returned HTTP ${response.code}"))
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
val responseBody = response.body
|
||||
if (responseBody == null) {
|
||||
response.close()
|
||||
runOnMain {
|
||||
onProgress(DownloadState.Failed("Response body was empty"))
|
||||
}
|
||||
@@ -245,8 +278,14 @@ class UpdateManager(
|
||||
}
|
||||
}
|
||||
|
||||
runOnMain {
|
||||
onProgress(DownloadState.ReadyToInstall(apkFile))
|
||||
if (apkFile.exists() && apkFile.length() > 0) {
|
||||
runOnMain {
|
||||
onProgress(DownloadState.ReadyToInstall(apkFile))
|
||||
}
|
||||
} else {
|
||||
runOnMain {
|
||||
onProgress(DownloadState.Failed("Downloaded file was empty"))
|
||||
}
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
if (!call.isCanceled()) {
|
||||
@@ -254,6 +293,8 @@ class UpdateManager(
|
||||
onProgress(DownloadState.Failed("File write failed: ${e.localizedMessage}"))
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
response.close()
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,8 +8,9 @@ data class ReleaseInfo(
|
||||
val title: String,
|
||||
val changelog: String,
|
||||
val downloadUrl: String,
|
||||
val apkFileName: String,
|
||||
val sizeBytes: Long
|
||||
val assetApiUrl: String? = null,
|
||||
val apkFileName: String = "app-release.apk",
|
||||
val sizeBytes: Long = 0L
|
||||
)
|
||||
|
||||
sealed class UpdateCheckResult {
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
package com.expapp.trigger.worker
|
||||
|
||||
import android.app.Notification
|
||||
import android.app.NotificationChannel
|
||||
import android.app.NotificationManager
|
||||
import android.app.PendingIntent
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.graphics.Color
|
||||
import android.os.Build
|
||||
import androidx.core.app.NotificationCompat
|
||||
import androidx.core.app.NotificationManagerCompat
|
||||
import com.expapp.trigger.MainActivity
|
||||
import com.expapp.trigger.R
|
||||
|
||||
object NotificationHelper {
|
||||
const val CHANNEL_ID = "server_status_channel"
|
||||
const val CHANNEL_NAME = "Server Status Alerts"
|
||||
|
||||
fun areNotificationsEnabled(context: Context): Boolean {
|
||||
return NotificationManagerCompat.from(context).areNotificationsEnabled()
|
||||
}
|
||||
|
||||
fun createNotificationChannel(context: Context) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
val channel = NotificationChannel(
|
||||
CHANNEL_ID,
|
||||
CHANNEL_NAME,
|
||||
NotificationManager.IMPORTANCE_HIGH
|
||||
).apply {
|
||||
description = "Alerts when your servers go offline or come back online"
|
||||
enableVibration(true)
|
||||
vibrationPattern = longArrayOf(0, 300, 200, 300)
|
||||
enableLights(true)
|
||||
lightColor = Color.GREEN
|
||||
lockscreenVisibility = Notification.VISIBILITY_PUBLIC
|
||||
}
|
||||
val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
||||
manager.createNotificationChannel(channel)
|
||||
}
|
||||
}
|
||||
|
||||
fun sendNotification(
|
||||
context: Context,
|
||||
id: Int,
|
||||
title: String,
|
||||
message: String,
|
||||
isSuccess: Boolean = true
|
||||
): Boolean {
|
||||
createNotificationChannel(context)
|
||||
|
||||
val intent = Intent(context, MainActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
}
|
||||
val pendingIntent = PendingIntent.getActivity(
|
||||
context,
|
||||
id,
|
||||
intent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||
)
|
||||
|
||||
val accentColor = if (isSuccess) 0xFF22C55E.toInt() else 0xFFFF4757.toInt()
|
||||
|
||||
val notification = NotificationCompat.Builder(context, CHANNEL_ID)
|
||||
.setSmallIcon(R.drawable.ic_notification)
|
||||
.setColor(accentColor)
|
||||
.setContentTitle(title)
|
||||
.setContentText(message)
|
||||
.setStyle(NotificationCompat.BigTextStyle().bigText(message))
|
||||
.setPriority(NotificationCompat.PRIORITY_MAX)
|
||||
.setDefaults(NotificationCompat.DEFAULT_ALL)
|
||||
.setAutoCancel(true)
|
||||
.setContentIntent(pendingIntent)
|
||||
.build()
|
||||
|
||||
return try {
|
||||
NotificationManagerCompat.from(context).notify(id, notification)
|
||||
true
|
||||
} catch (e: SecurityException) {
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
fun sendTestNotification(context: Context): Boolean {
|
||||
return sendNotification(
|
||||
context = context,
|
||||
id = 9999,
|
||||
title = "🔔 Test Alert: Notifications Working",
|
||||
message = "Server status notifications are properly configured and working on this device!",
|
||||
isSuccess = true
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -1,22 +1,15 @@
|
||||
package com.expapp.trigger.worker
|
||||
|
||||
import android.app.NotificationChannel
|
||||
import android.app.NotificationManager
|
||||
import android.app.PendingIntent
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.os.Build
|
||||
import androidx.core.app.NotificationCompat
|
||||
import androidx.core.app.NotificationManagerCompat
|
||||
import androidx.work.Constraints
|
||||
import androidx.work.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.MainActivity
|
||||
import com.expapp.trigger.R
|
||||
import com.expapp.trigger.data.repository.AppSettings
|
||||
import com.expapp.trigger.data.repository.DeviceRepository
|
||||
import com.expapp.trigger.data.repository.SharedPrefsStorage
|
||||
@@ -30,9 +23,11 @@ class ServerMonitorWorker(
|
||||
|
||||
companion object {
|
||||
const val WORK_NAME = "server_status_periodic_monitor"
|
||||
const val CHANNEL_ID = "server_status_channel"
|
||||
const val ONE_TIME_WORK_NAME = "server_status_one_time_check"
|
||||
|
||||
fun schedule(context: Context, repeatIntervalMinutes: Long = 15) {
|
||||
NotificationHelper.createNotificationChannel(context)
|
||||
|
||||
val constraints = Constraints.Builder()
|
||||
.setRequiredNetworkType(NetworkType.CONNECTED)
|
||||
.build()
|
||||
@@ -46,28 +41,36 @@ class ServerMonitorWorker(
|
||||
|
||||
WorkManager.getInstance(context).enqueueUniquePeriodicWork(
|
||||
WORK_NAME,
|
||||
ExistingPeriodicWorkPolicy.KEEP,
|
||||
ExistingPeriodicWorkPolicy.UPDATE,
|
||||
workRequest
|
||||
)
|
||||
}
|
||||
|
||||
fun runOnce(context: Context) {
|
||||
NotificationHelper.createNotificationChannel(context)
|
||||
|
||||
val constraints = Constraints.Builder()
|
||||
.setRequiredNetworkType(NetworkType.CONNECTED)
|
||||
.build()
|
||||
|
||||
val oneTimeRequest = OneTimeWorkRequestBuilder<ServerMonitorWorker>()
|
||||
.setConstraints(constraints)
|
||||
.build()
|
||||
|
||||
WorkManager.getInstance(context).enqueueUniqueWork(
|
||||
ONE_TIME_WORK_NAME,
|
||||
ExistingWorkPolicy.REPLACE,
|
||||
oneTimeRequest
|
||||
)
|
||||
}
|
||||
|
||||
fun cancel(context: Context) {
|
||||
WorkManager.getInstance(context).cancelUniqueWork(WORK_NAME)
|
||||
WorkManager.getInstance(context).cancelUniqueWork(ONE_TIME_WORK_NAME)
|
||||
}
|
||||
|
||||
fun createNotificationChannel(context: Context) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
val channel = NotificationChannel(
|
||||
CHANNEL_ID,
|
||||
"Server Status Alerts",
|
||||
NotificationManager.IMPORTANCE_HIGH
|
||||
).apply {
|
||||
description = "Alerts when your servers go offline or come back online"
|
||||
enableVibration(true)
|
||||
}
|
||||
val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
||||
manager.createNotificationChannel(channel)
|
||||
}
|
||||
NotificationHelper.createNotificationChannel(context)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -77,8 +80,6 @@ class ServerMonitorWorker(
|
||||
return Result.success()
|
||||
}
|
||||
|
||||
createNotificationChannel(appContext)
|
||||
|
||||
val repository = DeviceRepository(SharedPrefsStorage(appContext))
|
||||
val devices = repository.getDevices()
|
||||
if (devices.isEmpty()) {
|
||||
@@ -96,48 +97,31 @@ class ServerMonitorWorker(
|
||||
// Save new status
|
||||
appSettings.setLastStatus(device.id, status.isOnline)
|
||||
|
||||
// If we have a prior status recorded and it flipped, notify
|
||||
// Determine if notification is needed
|
||||
if (previousStatus != null && previousStatus != status.isOnline) {
|
||||
sendNotification(
|
||||
device.id.hashCode(),
|
||||
if (status.isOnline) "✅ Server Back Online" else "⚠️ Server Offline",
|
||||
if (status.isOnline) {
|
||||
NotificationHelper.sendNotification(
|
||||
context = appContext,
|
||||
id = device.id.hashCode(),
|
||||
title = if (status.isOnline) "✅ Server Back Online" else "⚠️ Server Offline",
|
||||
message = if (status.isOnline) {
|
||||
"${device.name} is now online and reachable."
|
||||
} else {
|
||||
"${device.name} is unreachable or offline."
|
||||
}
|
||||
},
|
||||
isSuccess = status.isOnline
|
||||
)
|
||||
} else if (previousStatus == null && !status.isOnline) {
|
||||
// Initial check revealed server is offline
|
||||
NotificationHelper.sendNotification(
|
||||
context = appContext,
|
||||
id = device.id.hashCode(),
|
||||
title = "⚠️ Server Offline",
|
||||
message = "${device.name} is currently unreachable or offline.",
|
||||
isSuccess = false
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
return Result.success()
|
||||
}
|
||||
|
||||
private fun sendNotification(id: Int, title: String, message: String) {
|
||||
val intent = Intent(appContext, MainActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
}
|
||||
val pendingIntent = PendingIntent.getActivity(
|
||||
appContext,
|
||||
id,
|
||||
intent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||
)
|
||||
|
||||
val notification = NotificationCompat.Builder(appContext, CHANNEL_ID)
|
||||
.setSmallIcon(R.mipmap.ic_launcher)
|
||||
.setContentTitle(title)
|
||||
.setContentText(message)
|
||||
.setStyle(NotificationCompat.BigTextStyle().bigText(message))
|
||||
.setPriority(NotificationCompat.PRIORITY_HIGH)
|
||||
.setAutoCancel(true)
|
||||
.setContentIntent(pendingIntent)
|
||||
.build()
|
||||
|
||||
try {
|
||||
NotificationManagerCompat.from(appContext).notify(id, notification)
|
||||
} catch (e: SecurityException) {
|
||||
// Android 13+ permission might not be granted yet
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="108"
|
||||
android:viewportHeight="108">
|
||||
<group
|
||||
android:translateX="27.6"
|
||||
android:translateY="27.6"
|
||||
android:scaleX="2.2"
|
||||
android:scaleY="2.2">
|
||||
<path
|
||||
android:fillColor="#22C55E"
|
||||
android:pathData="M20,4H4C2.89,4 2,4.9 2,6v12c0,1.1 0.89,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18H4V8h16V18zM6.5,16.5l3.5,-3.5L6.5,9.5L7.91,8.09L12.83,13l-4.92,4.91L6.5,16.5zM12,15h5v2h-5V15z"/>
|
||||
</group>
|
||||
</vector>
|
||||
@@ -0,0 +1,15 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="108"
|
||||
android:viewportHeight="108">
|
||||
<group
|
||||
android:translateX="27.6"
|
||||
android:translateY="27.6"
|
||||
android:scaleX="2.2"
|
||||
android:scaleY="2.2">
|
||||
<path
|
||||
android:fillColor="#FFFFFFFF"
|
||||
android:pathData="M20,4H4C2.89,4 2,4.9 2,6v12c0,1.1 0.89,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18H4V8h16V18zM6.5,16.5l3.5,-3.5L6.5,9.5L7.91,8.09L12.83,13l-4.92,4.91L6.5,16.5zM12,15h5v2h-5V15z"/>
|
||||
</group>
|
||||
</vector>
|
||||
@@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#ffffff"
|
||||
android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM18,16v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
|
||||
</vector>
|
||||
@@ -25,12 +25,13 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/widget_device_name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
@@ -41,7 +42,7 @@
|
||||
|
||||
<TextView
|
||||
android:id="@+id/widget_node_name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
|
||||
</adaptive-icon>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
|
||||
</adaptive-icon>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="ic_launcher_background">#0B0F19</color>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user