chore: bump to 1.9.4 + Gitea URL -> gitea.songer.eu.org

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

app/build.gradle.kts

@@ -13,8 +13,8 @@ android {
         applicationId = "com.a2i.forwarder"
         minSdk = 34
         targetSdk = 36
-        versionCode = 29
-        versionName = "1.9.0"
+        versionCode = 33
+        versionName = "1.9.4"
     }
 
     signingConfigs {

app/src/main/java/com/a2i/forwarder/core/UpdateChecker.kt

@@ -26,6 +26,7 @@ data class UpdateInfo(
     val apkSize: Long,
     val releaseNotes: String,
     val releasePageUrl: String,
+    val fallbackUrl: String? = null,   // 主 URL 下载失败时尝试的备选链接
 )
 
 /**
@@ -44,6 +45,7 @@ class UpdateChecker(private val context: Context) {
     val updateInfo = MutableStateFlow<UpdateInfo?>(null)
     val downloading = MutableStateFlow(false)
     val downloadProgress = MutableStateFlow(0)
+    val downloadSource = MutableStateFlow<String?>(null)  // "Gitea" / "GitHub" / null
     val lastError = MutableStateFlow<String?>(null)
     private var lastNotifiedVersion: String? = null  // 记录已推送的版本，避免重复通知
 
@@ -71,9 +73,12 @@ class UpdateChecker(private val context: Context) {
             // 先查 GitHub（公开默认源），从其 release notes 动态发现额外源（如自建 Gitea），取最高版本
             // 同版本时 Gitea 优先（国内可达，GitHub 可能被墙导致下载失败）
             val infos = mutableListOf<UpdateInfo>()
+            var ghInfo: UpdateInfo? = null
+            var giteaInfo: UpdateInfo? = null
             val gh = runCatching { fetchRelease(GITHUB_API) }.getOrNull()
             if (gh != null) {
-                val giteaInfo = parseUpdateSource(gh.releaseNotes)?.let { runCatching { fetchRelease(it) }.getOrNull() }
+                ghInfo = gh
+                giteaInfo = parseUpdateSource(gh.releaseNotes)?.let { runCatching { fetchRelease(it) }.getOrNull() }
                 // Gitea 放前面，同版本时优先用它下载（国内可达）
                 if (giteaInfo != null) infos.add(giteaInfo)
                 infos.add(gh)
@@ -92,7 +97,9 @@ class UpdateChecker(private val context: Context) {
                 updateInfo.value = null
                 lastNotifiedVersion = null
             } else {
-                updateInfo.value = best
+                // 主 URL 下载失败时尝试另一个源的链接
+                val fallback = if (best == giteaInfo) ghInfo?.apkUrl else giteaInfo?.apkUrl
+                updateInfo.value = best.copy(fallbackUrl = fallback)
             }
             lastError.value = null
 
@@ -178,18 +185,49 @@ class UpdateChecker(private val context: Context) {
     suspend fun download(info: UpdateInfo): File? = withContext(Dispatchers.IO) {
         downloading.value = true
         downloadProgress.value = 0
+        downloadSource.value = null
         lastError.value = null
-        try {
-            val req = Request.Builder().url(info.apkUrl).get().build()
-            http.newCall(req).execute().use { res ->
-                if (!res.isSuccessful) { lastError.value = "HTTP ${res.code}"; return@use null }
-                val body = res.body ?: run { lastError.value = "空响应"; return@use null }
+        // 主 URL (Gitea) 失败时自动尝试备选 URL (GitHub)
+        val sources = listOf(
+            info.apkUrl to sourceLabel(info.apkUrl),
+        ) + (info.fallbackUrl?.let { listOf(it to sourceLabel(it)) } ?: emptyList())
+        for ((idx, pair) in sources.withIndex()) {
+            val (url, label) = pair
+            if (idx > 0) { downloadProgress.value = 0; downloadSource.value = null }
+            downloadSource.value = label
+            val file = tryDownload(url, info.latestVersion, info.apkSize)
+            if (file != null) {
+                downloading.value = false
+                downloadSource.value = null
+                return@withContext file
+            }
+        }
+        downloading.value = false
+        downloadSource.value = null
+        null
+    }
+
+    private fun sourceLabel(url: String): String =
+        if (url.contains("songer.eu.org") || url.contains("sunlunfan")) "Gitea" else "GitHub"
+
+    private suspend fun tryDownload(url: String, version: String, expectedSize: Long): File? {
+        // 专用下载 client：更长超时（120s），避免大文件慢网超时截断
+        val dlClient = OkHttpClient.Builder()
+            .connectTimeout(15, TimeUnit.SECONDS)
+            .readTimeout(120, TimeUnit.SECONDS)
+            .retryOnConnectionFailure(true)
+            .build()
+        return try {
+            val req = Request.Builder().url(url).get().build()
+            dlClient.newCall(req).execute().use { res ->
+                if (!res.isSuccessful) { lastError.value = "HTTP ${res.code}"; return null }
+                val body = res.body ?: run { lastError.value = "空响应"; return null }
                 val total = body.contentLength()
                 val dir = context.getExternalFilesDir(null) ?: context.cacheDir
-                val target = File(dir, "gotmsg-${info.latestVersion}.apk")
+                val target = File(dir, "gotmsg-${version}.apk")
                 target.outputStream().use { sink ->
                     val input = body.byteStream()
-                    val buf = ByteArray(8 * 1024)
+                    val buf = ByteArray(64 * 1024)  // 64KB buffer 提升大文件速度
                     var read = 0L
                     while (true) {
                         val n = input.read(buf)
@@ -199,14 +237,25 @@ class UpdateChecker(private val context: Context) {
                         if (total > 0) downloadProgress.value = (read * 100 / total).toInt()
                     }
                 }
+                // 校验文件大小：Content-Length 或 release 声明的大小
+                val actualSize = target.length()
+                val refSize = if (total > 0) total else expectedSize
+                if (refSize > 0 && actualSize < refSize) {
+                    lastError.value = "文件不完整（${actualSize}/${refSize} 字节），请重试"
+                    target.delete()
+                    return null
+                }
+                if (actualSize < 1_000_000) {
+                    lastError.value = "文件过小，可能下载了错误页面"
+                    target.delete()
+                    return null
+                }
                 downloadProgress.value = 100
                 target
             }
         } catch (e: Exception) {
             lastError.value = e.message ?: "下载失败"
             null
-        } finally {
-            downloading.value = false
         }
     }
 

app/src/main/java/com/a2i/forwarder/ui/screens/UpdateDialog.kt

@@ -37,6 +37,7 @@ fun UpdateDialog(info: UpdateInfo, onDismiss: () -> Unit) {
     val app = A2iApp.instance
     val downloading by app.updateChecker.downloading.collectAsState()
     val progress by app.updateChecker.downloadProgress.collectAsState()
+    val downloadSource by app.updateChecker.downloadSource.collectAsState()
     var downloadedFile by remember { mutableStateOf<File?>(null) }
 
     AlertDialog(
@@ -70,7 +71,7 @@ fun UpdateDialog(info: UpdateInfo, onDismiss: () -> Unit) {
                     )
                     Spacer(Modifier.size(4.dp))
                     Text(
-                        "正在下载更新…",
+                        "正在下载更新…${downloadSource?.let { "（来自 $it）" } ?: ""}",
                         style = MaterialTheme.typography.bodySmall,
                         color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )