diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 50f030f..f4e8cd5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "com.lzxnone.tailscalemanager" minSdk = 28 targetSdk = 36 - versionCode = 101 - versionName = "1.0.1" + versionCode = 102 + versionName = "1.0.2" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/lzxnone/tailscalemanager/core/update/AppUpdateManager.kt b/app/src/main/java/com/lzxnone/tailscalemanager/core/update/AppUpdateManager.kt index d4657ad..4757379 100644 --- a/app/src/main/java/com/lzxnone/tailscalemanager/core/update/AppUpdateManager.kt +++ b/app/src/main/java/com/lzxnone/tailscalemanager/core/update/AppUpdateManager.kt @@ -1,17 +1,21 @@ package com.lzxnone.tailscalemanager.core.update +import com.lzxnone.tailscalemanager.BuildConfig import com.lzxnone.tailscalemanager.model.AppUpdateInfo import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext +import org.json.JSONArray import org.json.JSONObject import java.io.BufferedReader import java.io.InputStreamReader import java.net.HttpURLConnection import java.net.URL +import java.util.Locale object AppUpdateManager { - private const val UPDATE_URL = "https://update.lzxnone.cloud/tailscale_manager/version.json" + private const val UPDATE_URL = + "https://gitea.lzxnone.cloud/api/v1/repos/lzxnone/TailscaleManager/releases/latest" suspend fun checkAppUpdate(): Result = withContext(Dispatchers.IO) { try { @@ -30,22 +34,7 @@ object AppUpdateManager { val response = reader.use { it.readText() } connection.disconnect() - val json = JSONObject(response) - val versionCode = json.optLong("versionCode", 0L) - val versionName = json.optString("versionName", "") - val changelog = json.optString("changelog", "") - val downloadUrl = json.optString("downloadUrl", "") - val apkSize = json.optString("apkSize", "") - - Result.success( - AppUpdateInfo( - versionCode = versionCode, - versionName = versionName, - changelog = changelog, - downloadUrl = downloadUrl, - apkSize = apkSize - ) - ) + Result.success(parseReleaseJson(response)) } else { connection.disconnect() Result.failure(Exception("HTTP error $responseCode")) @@ -54,4 +43,80 @@ object AppUpdateManager { Result.failure(e) } } + + internal fun parseReleaseJson(response: String): AppUpdateInfo { + val json = JSONObject(response) + val rawTag = json.optString("tag_name", "").trim() + val versionName = rawTag.removePrefix("v").removePrefix("V") + val versionCode = parseVersionCode(versionName) + val changelog = json.optString("body", "").ifBlank { + json.optString("name", "") + } + + val (downloadUrl, apkSize) = selectApkAsset( + assets = json.optJSONArray("assets"), + fallbackUrl = json.optString("html_url", "") + ) + + return AppUpdateInfo( + versionCode = versionCode, + versionName = versionName, + changelog = changelog, + downloadUrl = downloadUrl, + apkSize = apkSize, + hasUpdate = isNewerVersion(versionName, BuildConfig.VERSION_NAME) + ) + } + + private fun selectApkAsset(assets: JSONArray?, fallbackUrl: String): Pair { + if (assets == null || assets.length() == 0) { + return fallbackUrl to "" + } + + for (i in 0 until assets.length()) { + val asset = assets.optJSONObject(i) ?: continue + val name = asset.optString("name", "") + val downloadUrl = asset.optString("browser_download_url", "") + val size = asset.optLong("size", 0L) + if (name.endsWith(".apk", ignoreCase = true) && downloadUrl.isNotBlank()) { + val sizeText = if (size > 0L) { + String.format(Locale.US, "%.2f MB", size / (1024.0 * 1024.0)) + } else { + "" + } + return downloadUrl to sizeText + } + } + return fallbackUrl to "" + } + + internal fun isNewerVersion(remoteVersion: String, currentVersion: String): Boolean { + val remoteParts = parseVersionParts(remoteVersion) + val currentParts = parseVersionParts(currentVersion) + if (remoteParts.isEmpty()) return false + + val maxLen = maxOf(remoteParts.size, currentParts.size) + for (i in 0 until maxLen) { + val r = remoteParts.getOrElse(i) { 0 } + val c = currentParts.getOrElse(i) { 0 } + if (r != c) return r > c + } + return false + } + + internal fun parseVersionCode(versionName: String): Long { + val parts = parseVersionParts(versionName) + if (parts.isEmpty()) return 0L + val major = parts.getOrElse(0) { 0 } + val minor = parts.getOrElse(1) { 0 } + val patch = parts.getOrElse(2) { 0 } + return major * 10000L + minor * 100L + patch + } + + private fun parseVersionParts(version: String): List { + val cleaned = version.trim().removePrefix("v").removePrefix("V") + if (cleaned.isBlank()) return emptyList() + return cleaned.split(".") + .map { segment -> segment.takeWhile { it.isDigit() }.toIntOrNull() ?: 0 } + } } diff --git a/app/src/main/java/com/lzxnone/tailscalemanager/model/AppUpdateInfo.kt b/app/src/main/java/com/lzxnone/tailscalemanager/model/AppUpdateInfo.kt index 5c7f493..3a5607e 100644 --- a/app/src/main/java/com/lzxnone/tailscalemanager/model/AppUpdateInfo.kt +++ b/app/src/main/java/com/lzxnone/tailscalemanager/model/AppUpdateInfo.kt @@ -5,5 +5,6 @@ data class AppUpdateInfo( val versionName: String, val changelog: String, val downloadUrl: String, - val apkSize: String + val apkSize: String, + val hasUpdate: Boolean = false ) diff --git a/app/src/main/java/com/lzxnone/tailscalemanager/ui/viewmodel/MainViewModel.kt b/app/src/main/java/com/lzxnone/tailscalemanager/ui/viewmodel/MainViewModel.kt index 680499f..cce20d8 100644 --- a/app/src/main/java/com/lzxnone/tailscalemanager/ui/viewmodel/MainViewModel.kt +++ b/app/src/main/java/com/lzxnone/tailscalemanager/ui/viewmodel/MainViewModel.kt @@ -103,7 +103,7 @@ class MainViewModel : ViewModel() { if (appUpdateResult.isSuccess) { val info = appUpdateResult.getOrNull() val suppressedVersion = AppPreferences.getSuppressedAppUpdateVersion() - if (info != null && info.versionCode > BuildConfig.VERSION_CODE && info.versionCode != suppressedVersion) { + if (info != null && info.hasUpdate && info.versionCode != suppressedVersion) { _appUpdateInfo.value = info } } @@ -417,7 +417,7 @@ class MainViewModel : ViewModel() { val result = AppUpdateManager.checkAppUpdate() if (result.isSuccess) { val info = result.getOrNull() - if (info != null && info.versionCode > BuildConfig.VERSION_CODE) { + if (info != null && info.hasUpdate) { _appUpdateInfo.value = info } else { android.widget.Toast.makeText(