Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
27b632bcaa | ||
|
|
0bcca1fbf4 |
@@ -11,8 +11,8 @@ android {
|
||||
applicationId = "com.expapp.trigger"
|
||||
minSdk = 24
|
||||
targetSdk = 34
|
||||
versionCode = 6
|
||||
versionName = "1.1.2"
|
||||
versionCode = 8
|
||||
versionName = "1.1.4"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables {
|
||||
|
||||
@@ -91,6 +91,25 @@ class MainActivity : FragmentActivity() {
|
||||
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)
|
||||
|
||||
@@ -208,7 +208,7 @@ fun UpdateDialog(
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Text(
|
||||
text = "Downloading update…",
|
||||
text = if (downloadState.bytesDownloaded == 0L) "Connecting to server…" else "Downloading update…",
|
||||
fontSize = 12.sp,
|
||||
color = TextSecondary
|
||||
)
|
||||
@@ -220,15 +220,26 @@ fun UpdateDialog(
|
||||
)
|
||||
}
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
LinearProgressIndicator(
|
||||
progress = { downloadState.progressPercent / 100f },
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(8.dp)
|
||||
.clip(RoundedCornerShape(4.dp)),
|
||||
color = GreenVibrant,
|
||||
trackColor = GreenVibrant.copy(alpha = 0.15f)
|
||||
)
|
||||
if (downloadState.bytesDownloaded == 0L && downloadState.progressPercent == 0) {
|
||||
LinearProgressIndicator(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(8.dp)
|
||||
.clip(RoundedCornerShape(4.dp)),
|
||||
color = GreenVibrant,
|
||||
trackColor = GreenVibrant.copy(alpha = 0.15f)
|
||||
)
|
||||
} else {
|
||||
LinearProgressIndicator(
|
||||
progress = { (downloadState.progressPercent / 100f).coerceIn(0f, 1f) },
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(8.dp)
|
||||
.clip(RoundedCornerShape(4.dp)),
|
||||
color = GreenVibrant,
|
||||
trackColor = GreenVibrant.copy(alpha = 0.15f)
|
||||
)
|
||||
}
|
||||
if (downloadState.totalBytes > 0) {
|
||||
Spacer(modifier = Modifier.height(6.dp))
|
||||
val downloadedMb = String.format("%.1f", downloadState.bytesDownloaded / (1024.0 * 1024.0))
|
||||
@@ -238,6 +249,14 @@ fun UpdateDialog(
|
||||
fontSize = 11.sp,
|
||||
color = TextMuted
|
||||
)
|
||||
} else if (downloadState.bytesDownloaded > 0) {
|
||||
Spacer(modifier = Modifier.height(6.dp))
|
||||
val downloadedMb = String.format("%.1f MB", downloadState.bytesDownloaded / (1024.0 * 1024.0))
|
||||
Text(
|
||||
text = "$downloadedMb downloaded",
|
||||
fontSize = 11.sp,
|
||||
color = TextMuted
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -199,25 +199,27 @@ fun MainScreen(
|
||||
}
|
||||
}
|
||||
|
||||
fun checkAppUpdate(showToast: Boolean = false) {
|
||||
fun checkAppUpdate(isManual: 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
|
||||
showUpdateDialog = true
|
||||
if (isManual) {
|
||||
Toast.makeText(context, "New update available: v${result.info.versionName}!", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
is UpdateCheckResult.UpToDate -> {
|
||||
if (showToast) {
|
||||
Toast.makeText(context, "App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
||||
availableUpdate = null
|
||||
if (isManual) {
|
||||
Toast.makeText(context, "Page refreshed • App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
is UpdateCheckResult.Error -> {
|
||||
if (showToast) {
|
||||
Toast.makeText(context, "Update check failed: ${result.message}", Toast.LENGTH_SHORT).show()
|
||||
if (isManual) {
|
||||
Toast.makeText(context, "Page refreshed • Update check failed", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -227,6 +229,7 @@ fun MainScreen(
|
||||
// Pull-to-refresh entire page handler
|
||||
fun refreshWholePage() {
|
||||
isPullRefreshing = true
|
||||
dismissedVersion = null
|
||||
coroutineScope.launch {
|
||||
// 1. Sync R2 endpoints
|
||||
syncEndpoints(showToast = false)
|
||||
@@ -236,15 +239,14 @@ fun MainScreen(
|
||||
refreshStatus(dev, showIndicator = true)
|
||||
}
|
||||
|
||||
// 3. Check for app updates
|
||||
checkAppUpdate(showToast = false)
|
||||
// 3. Explicitly check for app updates with user feedback
|
||||
checkAppUpdate(isManual = true)
|
||||
|
||||
// 4. Update home screen widgets
|
||||
ServerWidgetProvider.updateAllWidgets(context)
|
||||
|
||||
delay(750)
|
||||
isPullRefreshing = false
|
||||
Toast.makeText(context, "Page refreshed", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -651,23 +653,23 @@ fun MainScreen(
|
||||
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)
|
||||
downloadState = DownloadState.Downloading(0, 0, info.sizeBytes)
|
||||
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { checkResult ->
|
||||
if (checkResult is UpdateCheckResult.UpdateAvailable) {
|
||||
availableUpdate = checkResult.info
|
||||
val fresh = checkResult.info
|
||||
updateManager.downloadApk(fresh.downloadUrl, fresh.assetApiUrl) { state ->
|
||||
updateManager.downloadApk(fresh.downloadUrl, fresh.assetApiUrl, fresh.sizeBytes) { state ->
|
||||
downloadState = state
|
||||
}
|
||||
} else {
|
||||
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl) { state ->
|
||||
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl, info.sizeBytes) { state ->
|
||||
downloadState = state
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
downloadState = DownloadState.Downloading(0, 0, info.sizeBytes)
|
||||
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl) { state ->
|
||||
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl, info.sizeBytes) { state ->
|
||||
downloadState = state
|
||||
}
|
||||
}
|
||||
|
||||
@@ -173,20 +173,34 @@ class UpdateManager(
|
||||
fun downloadApk(
|
||||
downloadUrl: String,
|
||||
assetApiUrl: String? = null,
|
||||
expectedSizeBytes: Long = 0L,
|
||||
onProgress: (DownloadState) -> Unit
|
||||
): Call {
|
||||
return startDownloadCall(downloadUrl, assetApiUrl, isFallback = false, onProgress)
|
||||
return startDownloadCall(downloadUrl, assetApiUrl, expectedSizeBytes, isFallback = false, onProgress)
|
||||
}
|
||||
|
||||
private fun startDownloadCall(
|
||||
url: String,
|
||||
fallbackUrl: String?,
|
||||
expectedSizeBytes: Long,
|
||||
isFallback: Boolean,
|
||||
onProgress: (DownloadState) -> Unit
|
||||
): Call {
|
||||
// Instantly notify UI that connection/download is initializing so user gets immediate visual feedback
|
||||
runOnMain {
|
||||
onProgress(
|
||||
DownloadState.Downloading(
|
||||
progressPercent = 0,
|
||||
bytesDownloaded = 0L,
|
||||
totalBytes = expectedSizeBytes
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
val requestBuilder = Request.Builder()
|
||||
.url(url)
|
||||
.addHeader("User-Agent", "ServerControlApp")
|
||||
.addHeader("Accept-Encoding", "identity") // Disables gzip recompression to stream raw binary immediately with exact Content-Length
|
||||
|
||||
if (isFallback) {
|
||||
requestBuilder.addHeader("Accept", "application/octet-stream")
|
||||
@@ -199,7 +213,7 @@ class UpdateManager(
|
||||
override fun onFailure(call: Call, e: IOException) {
|
||||
if (call.isCanceled()) return
|
||||
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
|
||||
startDownloadCall(fallbackUrl, null, isFallback = true, onProgress)
|
||||
startDownloadCall(fallbackUrl, null, expectedSizeBytes, isFallback = true, onProgress)
|
||||
} else {
|
||||
runOnMain {
|
||||
onProgress(DownloadState.Failed("Download failed: ${e.localizedMessage}"))
|
||||
@@ -214,7 +228,7 @@ class UpdateManager(
|
||||
response.close()
|
||||
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
|
||||
// Fallback to direct asset API
|
||||
startDownloadCall(fallbackUrl, null, isFallback = true, onProgress)
|
||||
startDownloadCall(fallbackUrl, null, expectedSizeBytes, isFallback = true, onProgress)
|
||||
} else {
|
||||
runOnMain {
|
||||
onProgress(DownloadState.Failed("Server returned HTTP ${response.code}"))
|
||||
@@ -242,14 +256,16 @@ class UpdateManager(
|
||||
}
|
||||
|
||||
try {
|
||||
val totalBytes = responseBody.contentLength()
|
||||
val rawLength = responseBody.contentLength()
|
||||
val totalBytes = if (rawLength > 0L) rawLength else expectedSizeBytes
|
||||
var bytesDownloaded = 0L
|
||||
|
||||
responseBody.byteStream().use { input ->
|
||||
FileOutputStream(apkFile).use { output ->
|
||||
val buffer = ByteArray(8192)
|
||||
responseBody.byteStream().buffered(65536).use { input ->
|
||||
FileOutputStream(apkFile).buffered(65536).use { output ->
|
||||
val buffer = ByteArray(65536)
|
||||
var read: Int
|
||||
var lastPercent = -1
|
||||
var lastUpdateTime = 0L
|
||||
|
||||
while (input.read(buffer).also { read = it } != -1) {
|
||||
if (call.isCanceled()) return
|
||||
@@ -257,12 +273,14 @@ class UpdateManager(
|
||||
output.write(buffer, 0, read)
|
||||
bytesDownloaded += read
|
||||
|
||||
val percent = if (totalBytes > 0) {
|
||||
((bytesDownloaded * 100) / totalBytes).toInt()
|
||||
val percent = if (totalBytes > 0L) {
|
||||
((bytesDownloaded * 100) / totalBytes).toInt().coerceIn(0, 100)
|
||||
} else 0
|
||||
|
||||
if (percent != lastPercent) {
|
||||
val now = System.currentTimeMillis()
|
||||
if (percent != lastPercent || (now - lastUpdateTime >= 100)) {
|
||||
lastPercent = percent
|
||||
lastUpdateTime = now
|
||||
runOnMain {
|
||||
onProgress(
|
||||
DownloadState.Downloading(
|
||||
|
||||
@@ -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,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