feat: multi-config lists for ntfy/email/sms + per-channel stopOnFirst

All four forwarding channels now support multiple configurations (add/ edit/delete/reorder/enable per item, matching Bark server UX): - model: NtfyServer, EmailServer, SmsTarget data classes - SettingsStore: ntfyServers/emailServers/smsTargets as List; full CRUD (add/update/delete/move/setEnabled); legacy single-config auto-migrated to list via config_version; 4 stopOnFirst toggles (bark=true, others false) - BarkSender/NtfySender/EmailSender: pushToEnabled(configs, stopOnFirst) — stopOnFirst=true: first success stops; false: send to all - SmsFallbackForwarder: forward iterates smsTargets per stopOnFirst - UI: each channel SectionCard has toggle + stopOnFirst switch + config list + add button; ConfigRow + ConfigDialog reusable components - version 1.7.3 -> 1.8.0 (code 16 -> 17) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
fix: startup always checks + dual-source (Gitea+GitHub) take highest
2026-07-09 21:16:23 +08:00 · 2026-07-09 20:48:16 +08:00 · 2026-07-09 20:32:26 +08:00 · 2026-07-09 18:03:42 +08:00 · 2026-07-09 17:49:15 +08:00 · 2026-07-09 17:16:41 +08:00
22 changed files with 190 additions and 1140 deletions
@@ -1,15 +1,13 @@
-# GotMsg ·有消息
+# A2i ·安到果（按倒过[呲牙]）

-把安卓手机上的通知（短信、验证码、电话“有电话进来这个通知，不是电话呼叫转移”、微信、QQ、Telegram 等）实时转发到 iOS / Android / 鸿蒙等接收端。iOS 可通过 [Bark](https://github.com/Finb/Bark) 推送到 iPhone / iPad；Android 可用 ntfy；鸿蒙可用 Meow。在 iOS 上点击通知，还能一键跳转到对应的 App。
+把安卓手机上的通知（短信、验证码、电话“有电话进来这个通知，不是电话呼叫转移”、微信、QQ、Telegram 等）实时转发到 iOS，通过 [Bark](https://github.com/Finb/Bark) 推送到 iPhone / iPad。在 iOS 上点击通知，还能一键跳转到对应的 App。

-适用于把安卓备机的消息同步到 iPhone 或其他安卓 / 鸿蒙手机，不漏验证码、不漏重要聊天。
-
-![GotMsg 设置页](screenshots/overview.png)
+适用于把安卓备机的消息同步到 iOS 设备，不漏验证码、不漏重要聊天。

 ## 主要功能

 - **系统级通知监听**：接入 Android 通知监听服务，覆盖所有发出通知的 App。
- **多通道推送**：支持 Bark、ntfy、Meow、电邮和短信兜底；每个通道可保存多个目标，勾选参与转发，并支持“发通一条就停”或全部广播。
+- **Bark 推送**：支持官方 Bark 服务和自建 Bark Server，可保存多个服务器并随时切换。
 - **验证码自动提取**：自动识别通知中的验证码，收到即复制，也可点击复制。
 - **通知优化**：
  - 广告关键词过滤（内置 + 自定义）
@@ -37,16 +35,14 @@

 1. 在 iOS 上安装 [Bark](https://apps.apple.com/us/app/bark-customed-push/id1613210986)。
 2. 打开 Bark，复制你的专属推送地址，形如 `https://api.day.app/你的Key`。
-3. 在 GotMsg 的「设置」中添加服务器：
+3. 在 a2i 的「设置」中添加服务器：
   - 名称：随意，例如「我的 iPhone」
   - 服务器地址：`https://api.day.app`（自建则填自建地址）
   - Device Key：Bark 地址中的那段 Key

-如果接收端是 Android 或鸿蒙手机，也可以在「设置」里配置 ntfy 或 Meow；对应区块右上角有帮助按钮，按弹窗步骤填写服务器地址、Topic / Device Key 后点测试发送。
-
 ### 3. 授权通知监听

-打开 GotMsg，首页会提示「需要授权通知监听」。点击「前往系统授权」，在系统的通知访问设置中开启 GotMsg。
+打开 a2i，首页会提示「需要授权通知监听」。点击「前往系统授权」，在系统的通知访问设置中开启 a2i。

 > 授权是一次性的，卸载后重新安装需要再次授权。

@@ -60,12 +56,12 @@
 - **想同步聊天**：保持黑名单模式（默认），在「过滤」页开启「微信 / QQ / Telegram 优化」。
 - **通知没推过来**：先看「日志」页，每条通知（无论转发、过滤还是失败）都会记录原因。
 - **想让通知带图标**：参考下方「应用图标」一节。
- **电话通知不工作**：MIUI 会把系统电话通知限制为不向第三方通知监听器分发，本 App 通过轮询 `getCallonyState()` 绕过此限制。需要授予「电话」权限（设置 → 应用 → GotMsg → 权限 → 电话）。
+- **电话通知不工作**：MIUI 会把系统电话通知限制为不向第三方通知监听器分发，本 App 通过轮询 `getCallonyState()` 绕过此限制。需要授予「电话」权限（设置 → 应用 → a2i → 权限 → 电话）。
 - **断网收不到通知**：开启「设置 → 断网短信兜底」，填好 iPhone 号码、授予短信权限、设好手动额度。断网时验证码和来电会走短信（消耗套餐额度，5 分钟限 1 条）。

 ## 应用图标

-Bark 的 `icon` 字段需要一个公网可访问的图片 URL。GotMsg 支持把已安装 App 的图标批量导出到你选择的目录，方便上传到你自己的图床。
+Bark 的 `icon` 字段需要一个公网可访问的图片 URL。a2i 支持把已安装 App 的图标批量导出到你选择的目录，方便上传到你自己的图床。

 规则：转发时 `icon = 图标 URL 前缀 + 安卓包名 + .png`。在「设置 → 应用图标」里：

@@ -77,7 +73,7 @@ Bark 的 `icon` 字段需要一个公网可访问的图片 URL。GotMsg 支持

 ## 自建 Bark 服务（可选）

-GotMsg 默认用 Bark 官方服务器（`https://api.day.app`），免费够用。如果想完全自控、不限速、不依赖第三方，可以自建 Bark Server。下面是三种零成本方案：
+a2i 默认用 Bark 官方服务器（`https://api.day.app`），免费够用。如果想完全自控、不限速、不依赖第三方，可以自建 Bark Server。下面是三种零成本方案：

 ### 方案 1：Vercel 云托管（最适合新手）

@@ -111,7 +107,7 @@ GotMsg 默认用 Bark 官方服务器（`https://api.day.app`），免费够用

 - Kotlin + Jetpack Compose（Material 3）
 - AndroidX DataStore（持久化设置与日志）
- OkHttp（Bark / ntfy / Meow / 更新检查）
+- OkHttp（Bark 推送）
 - WorkManager（失败重试）
 - Navigation Compose（单 Activity 多页面）
 - 最低 Android 14（API 34），目标 Android 16（API 36）
@@ -13,8 +13,8 @@ android {
        applicationId = "com.a2i.forwarder"
        minSdk = 34
        targetSdk = 36
-        versionCode = 30
-        versionName = "1.9.1"
+        versionCode = 17
+        versionName = "1.8.0"
    }

    signingConfigs {
@@ -120,6 +120,7 @@ object EmailSender {
    /** 如果电邮转发已启用且收件人非空，异步发邮件（fire-and-forget，不阻塞主流程）。 */
    fun trySend(app: A2iApp, title: String, body: String, scope: CoroutineScope) {
        val s = app.settings
+        if (!s.emailForwardingEnabled.value) return
        val configs = s.emailServers.value.filter { it.enabled && it.to.isNotBlank() && it.host.isNotBlank() }
        if (configs.isEmpty()) return
        scope.launch {
@@ -1,145 +0,0 @@
-package com.a2i.forwarder.core
-
-import com.a2i.forwarder.A2iApp
-import com.a2i.forwarder.model.MeowServer
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
-import org.json.JSONObject
-import java.io.IOException
-import java.util.concurrent.TimeUnit
-
-/**
- * Meow for HarmonyOS push channel.
- *
- * Meow's public API shape is less standardized than Bark/ntfy in this app,
- * so this sender accepts a user-provided endpoint and tries common JSON/GET forms.
- */
-object MeowSender {
-    private val http = OkHttpClient.Builder()
-        .connectTimeout(10, TimeUnit.SECONDS)
-        .writeTimeout(10, TimeUnit.SECONDS)
-        .readTimeout(15, TimeUnit.SECONDS)
-        .retryOnConnectionFailure(true)
-        .build()
-
-    suspend fun send(
-        server: String,
-        deviceKey: String,
-        title: String,
-        body: String,
-    ): Result<Unit> = withContext(Dispatchers.IO) {
-        runCatching {
-            val endpoint = server.trim().removeSuffix("/")
-            val key = deviceKey.trim()
-            require(endpoint.isNotBlank()) { "Meow 服务器地址未填" }
-            require(key.isNotBlank()) { "Meow Device Key 未填" }
-
-            val attempts = buildRequests(endpoint, key, title.take(200), body.take(4000))
-            var last: Throwable? = null
-            for (req in attempts) {
-                val r = runCatching { doPushWithRetry(req) }
-                if (r.isSuccess) return@runCatching
-                last = r.exceptionOrNull()
-            }
-            throw last ?: error("Meow 推送失败")
-        }
-    }
-
-    suspend fun pushToEnabled(configs: List<MeowServer>, title: String, body: String, stopOnFirst: Boolean): Result<Unit> = withContext(Dispatchers.IO) {
-        runCatching {
-            require(configs.any()) { "无 Meow 配置" }
-            var anyOk = false
-            var lastErr: Throwable? = null
-            for (c in configs) {
-                val r = send(c.server, c.deviceKey, title, body)
-                if (r.isSuccess) {
-                    anyOk = true
-                    if (stopOnFirst) return@runCatching
-                } else {
-                    lastErr = r.exceptionOrNull()
-                }
-            }
-            if (!anyOk) throw lastErr ?: error("全部 Meow 推送失败")
-        }
-    }
-
-    fun trySend(app: A2iApp, title: String, body: String, scope: CoroutineScope) {
-        val s = app.settings
-        val configs = s.meowServers.value.filter { it.enabled && it.server.isNotBlank() && it.deviceKey.isNotBlank() }
-        if (configs.isEmpty()) return
-        scope.launch {
-            pushToEnabled(configs, title, body, s.meowStopOnFirst.value)
-        }
-    }
-
-    private fun buildRequests(endpoint: String, key: String, title: String, body: String): List<Request> {
-        val payload = JSONObject()
-            .put("deviceKey", key)
-            .put("device_key", key)
-            .put("key", key)
-            .put("title", title)
-            .put("content", body)
-            .put("message", body)
-            .put("body", body)
-            .toString()
-
-        val postTargets = listOf(endpoint, "$endpoint/push").distinct()
-        val postRequests = postTargets.map { url ->
-            Request.Builder()
-                .url(url)
-                .header("Authorization", "Bearer $key")
-                .header("X-Device-Key", key)
-                .post(payload.toRequestBody(JSON))
-                .build()
-        }
-
-        val getRequest = endpoint.toHttpUrlOrNull()?.newBuilder()
-            ?.addQueryParameter("deviceKey", key)
-            ?.addQueryParameter("key", key)
-            ?.addQueryParameter("title", title)
-            ?.addQueryParameter("content", body)
-            ?.addQueryParameter("message", body)
-            ?.build()
-            ?.let { url ->
-                Request.Builder()
-                    .url(url)
-                    .header("Authorization", "Bearer $key")
-                    .header("X-Device-Key", key)
-                    .get()
-                    .build()
-            }
-
-        return postRequests + listOfNotNull(getRequest)
-    }
-
-    private fun doPushWithRetry(req: Request) {
-        var lastError: IOException? = null
-        repeat(MAX_ATTEMPTS) { attempt ->
-            try {
-                http.newCall(req).execute().use { res ->
-                    if (res.isSuccessful) return
-                    error("HTTP ${res.code}")
-                }
-            } catch (e: IOException) {
-                lastError = e
-                if (attempt < MAX_ATTEMPTS - 1) {
-                    Thread.sleep(BACKOFF_MS[attempt])
-                }
-            } catch (e: IllegalStateException) {
-                throw e
-            }
-        }
-        throw lastError ?: error("Meow 推送失败")
-    }
-
-    private val JSON = "application/json; charset=utf-8".toMediaType()
-    private const val MAX_ATTEMPTS = 3
-    private val BACKOFF_MS = longArrayOf(600L, 1200L)
-}
@@ -89,6 +89,7 @@ object NtfySender {

    fun trySend(app: A2iApp, title: String, body: String, scope: CoroutineScope) {
        val s = app.settings
+        if (!s.ntfyEnabled.value) return
        val configs = s.ntfyServers.value.filter { it.enabled && it.topic.isNotBlank() }
        if (configs.isEmpty()) return
        scope.launch {
@@ -127,7 +127,6 @@ class PhoneCallMonitor(private val context: Context) {
            if (servers.isEmpty()) {
                EmailSender.trySend(app, msg.title ?: logBody, msg.body ?: "", scope)
                NtfySender.trySend(app, msg.title ?: logBody, msg.body ?: "", scope)
-                MeowSender.trySend(app, msg.title ?: logBody, msg.body ?: "", scope)
                return@launch
            }
            val result = BarkSender.pushToEnabled(servers, msg, app.settings.barkStopOnFirst.value)
@@ -147,7 +146,6 @@ class PhoneCallMonitor(private val context: Context) {
            }
            EmailSender.trySend(app, msg.title ?: logBody, msg.body ?: "", scope)
            NtfySender.trySend(app, msg.title ?: logBody, msg.body ?: "", scope)
-            MeowSender.trySend(app, msg.title ?: logBody, msg.body ?: "", scope)
        }
    }
 }
@@ -35,6 +35,7 @@ class SmsFallbackForwarder(private val context: Context) {
    /** 尝试用短信转发（遍历所有启用的目标号，按 stopOnFirst 决定发通一条止还是全发）。 */
    fun forward(d: Decision) {
        scope.launch {
+            if (!settings.smsFallbackEnabled.value) return@launch
            if (settings.smsSuspended.value) {
                log(d, "failed", "短信已挂起（余额不足）")
                return@launch
@@ -26,7 +26,6 @@ data class UpdateInfo(
    val apkSize: Long,
    val releaseNotes: String,
    val releasePageUrl: String,
-    val fallbackUrl: String? = null,   // 主 URL 下载失败时尝试的备选链接
 )

 /**
@@ -69,18 +68,9 @@ class UpdateChecker(private val context: Context) {
            val now = System.currentTimeMillis()
            if (throttle && now - settings.lastUpdateCheckTime.value < CHECK_INTERVAL_MS) return@runCatching updateInfo.value

-            // 先查 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) {
-                ghInfo = gh
-                giteaInfo = parseUpdateSource(gh.releaseNotes)?.let { runCatching { fetchRelease(it) }.getOrNull() }
-                // Gitea 放前面，同版本时优先用它下载（国内可达）
-                if (giteaInfo != null) infos.add(giteaInfo)
-                infos.add(gh)
+            // 双源查询（Gitea 国内优先 + GitHub 备用），任一不通跳过，取最高版本
+            val infos = RELEASES_APIS.mapNotNull { api ->
+                runCatching { fetchRelease(api) }.getOrNull()
            }
            settings.setLastUpdateCheck(now)
            if (infos.isEmpty()) {
@@ -96,9 +86,7 @@ class UpdateChecker(private val context: Context) {
                updateInfo.value = null
                lastNotifiedVersion = null
            } else {
-                // 主 URL 下载失败时尝试另一个源的链接
-                val fallback = if (best == giteaInfo) ghInfo?.apkUrl else giteaInfo?.apkUrl
-                updateInfo.value = best.copy(fallbackUrl = fallback)
+                updateInfo.value = best
            }
            lastError.value = null

@@ -115,7 +103,7 @@ class UpdateChecker(private val context: Context) {
        val req = Request.Builder()
            .url(api)
            .header("Accept", "application/json")
-            .header("User-Agent", "gotmsg-android")
+            .header("User-Agent", "a2i-android")
            .get()
            .build()
        return http.newCall(req).execute().use { res ->
@@ -130,7 +118,7 @@ class UpdateChecker(private val context: Context) {
    /** 发现新版后，自动通过所有已开启的推送通道通知用户 */
    private fun notifyNewVersion(prev: UpdateInfo?, info: UpdateInfo) {
        val s = app.settings
-        val title = "🆕 GotMsg 新版本 v${info.latestVersion}"
+        val title = "🆕 a2i 新版本 v${info.latestVersion}"
        val body = "发现 v${info.latestVersion}（当前 v${currentVersionName()}）\n${formatSize(info.apkSize)} · 点击更新\n\n${info.releaseNotes.take(300)}"
        val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)

@@ -149,9 +137,6 @@ class UpdateChecker(private val context: Context) {
        // ntfy
        NtfySender.trySend(app, title, body, scope)

-        // Meow
-        MeowSender.trySend(app, title, body, scope)
-
        // 电邮
        EmailSender.trySend(app, title, body, scope)
    }
@@ -185,29 +170,14 @@ class UpdateChecker(private val context: Context) {
        downloading.value = true
        downloadProgress.value = 0
        lastError.value = null
-        // 主 URL 失败时自动尝试备选 URL
-        val urls = listOf(info.apkUrl) + (info.fallbackUrl?.let { listOf(it) } ?: emptyList())
-        for ((idx, url) in urls.withIndex()) {
-            if (idx > 0) downloadProgress.value = 0  // 重试时重置进度
-            val file = tryDownload(url, info.latestVersion)
-            if (file != null) {
-                downloading.value = false
-                return@withContext file
-            }
-        }
-        downloading.value = false
-        null
-    }
-
-    private suspend fun tryDownload(url: String, version: String): File? {
-        return try {
-            val req = Request.Builder().url(url).get().build()
+        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@tryDownload null }
-                val body = res.body ?: run { lastError.value = "空响应"; return@tryDownload null }
+                if (!res.isSuccessful) { lastError.value = "HTTP ${res.code}"; return@use null }
+                val body = res.body ?: run { lastError.value = "空响应"; return@use null }
                val total = body.contentLength()
                val dir = context.getExternalFilesDir(null) ?: context.cacheDir
-                val target = File(dir, "gotmsg-${version}.apk")
+                val target = File(dir, "a2i-${info.latestVersion}.apk")
                target.outputStream().use { sink ->
                    val input = body.byteStream()
                    val buf = ByteArray(8 * 1024)
@@ -226,6 +196,8 @@ class UpdateChecker(private val context: Context) {
        } catch (e: Exception) {
            lastError.value = e.message ?: "下载失败"
            null
+        } finally {
+            downloading.value = false
        }
    }

@@ -273,26 +245,13 @@ class UpdateChecker(private val context: Context) {
        return false
    }

-    /** 从 release notes 的 HTML 注释里解析额外更新源（加扰编码，兼容 Base64/明文）。 */
-    private fun parseUpdateSource(body: String): String? {
-        val raw = Regex("""update-source:\s*(\S+)""").find(body)?.groupValues?.getOrNull(1) ?: return null
-        // 加扰格式：Base64(反转(XOR(明文, key)))。尝试完整解扰，失败则依次尝试 Base64/明文。
-        val b64 = runCatching { java.util.Base64.getDecoder().decode(raw) }.getOrNull() ?: return raw
-        val unscrambled = unscramble(b64)
-        return unscrambled ?: runCatching { String(b64, Charsets.UTF_8) }.getOrNull() ?: raw
-    }
-
-    /** 解扰：反转字节 → XOR 每字节 → UTF-8 字符串。 */
-    private fun unscramble(data: ByteArray): String? = runCatching {
-        val key = SCRAMBLE_KEY
-        val reversed = data.reversedArray()
-        String(ByteArray(reversed.size) { i -> ((reversed[i].toInt() and 0xFF) xor (key[i % key.size].toInt() and 0xFF)).toByte() }, Charsets.UTF_8)
-    }.getOrNull()
-
    companion object {
-        const val GITHUB_API = "https://api.github.com/repos/lsxf/a2i/releases/latest"
+        // 双源：Gitea（国内优先）+ GitHub（备用），任一不通跳过，取最高版本
+        val RELEASES_APIS = listOf(
+            "https://git.sunlunfan.com/api/v1/repos/song/a2i/releases/latest",
+            "https://api.github.com/repos/lsxf/a2i/releases/latest",
+        )
        const val CHECK_INTERVAL_MS = 24L * 60 * 60 * 1000
-        private val SCRAMBLE_KEY = byteArrayOf(0x4B, 0x6F, 0x72, 0x6E)  // "Korn"
    }

    fun formatSize(bytes: Long): String {
@@ -24,15 +24,6 @@ data class NtfyServer(
    val enabled: Boolean = true,
 )

-@Serializable
-data class MeowServer(
-    val id: String = UUID.randomUUID().toString(),
-    val name: String,
-    val server: String = "",
-    val deviceKey: String = "",
-    val enabled: Boolean = true,
-)
-
@Serializable
 data class EmailServer(
    val id: String = UUID.randomUUID().toString(),
@@ -6,7 +6,6 @@ import com.a2i.forwarder.A2iApp
 import com.a2i.forwarder.core.BarkSender
 import com.a2i.forwarder.core.EmailSender
 import com.a2i.forwarder.core.ForwardLog
-import com.a2i.forwarder.core.MeowSender
 import com.a2i.forwarder.core.NotificationProcessor
 import com.a2i.forwarder.core.NtfySender
 import com.a2i.forwarder.core.PendingPush
@@ -66,7 +65,6 @@ class NotifyListenerService : NotificationListenerService() {
            app.logStore.addLog(ForwardLog(now, sbn.packageName, d.appLabel, msg.title, msg.body, "failed", "未配置可用 Bark 服务器"))
            EmailSender.trySend(app, msg.title ?: d.appLabel, msg.body, scope)
            NtfySender.trySend(app, msg.title ?: d.appLabel, msg.body, scope)
-            MeowSender.trySend(app, msg.title ?: d.appLabel, msg.body, scope)
            return
        }

@@ -82,6 +80,5 @@ class NotifyListenerService : NotificationListenerService() {
        }
        EmailSender.trySend(app, msg.title ?: d.appLabel, msg.body, scope)
        NtfySender.trySend(app, msg.title ?: d.appLabel, msg.body, scope)
-        MeowSender.trySend(app, msg.title ?: d.appLabel, msg.body, scope)
    }
 }
@@ -11,7 +11,6 @@ import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import com.a2i.forwarder.model.BarkServer
 import com.a2i.forwarder.model.EmailServer
-import com.a2i.forwarder.model.MeowServer
 import com.a2i.forwarder.model.NtfyServer
 import com.a2i.forwarder.model.OFFICIAL_BARK_SERVER
 import com.a2i.forwarder.model.SmsTarget
@@ -45,7 +44,6 @@ class SettingsStore(
        // 各通道「发通一条止 / 全发」开关
        val BARK_STOP_FIRST = booleanPreferencesKey("bark_stop_first")
        val NTFY_STOP_FIRST = booleanPreferencesKey("ntfy_stop_first")
-        val MEOW_STOP_FIRST = booleanPreferencesKey("meow_stop_first")
        val EMAIL_STOP_FIRST = booleanPreferencesKey("email_stop_first")
        val SMS_STOP_FIRST = booleanPreferencesKey("sms_stop_first")
        // 短信兜底（目标号已列表化；运营商/余额/限频保持全局）
@@ -59,8 +57,9 @@ class SettingsStore(
        // 电邮转发
        val EMAIL_ENABLED = booleanPreferencesKey("email_enabled")
        val EMAIL_SERVERS = stringPreferencesKey("email_servers")
+        // ntfy 转发
+        val NTFY_ENABLED = booleanPreferencesKey("ntfy_enabled")
        val NTFY_SERVERS = stringPreferencesKey("ntfy_servers")
-        val MEOW_SERVERS = stringPreferencesKey("meow_servers")
        // 应用更新
        val UPDATE_CHECK_AUTO = booleanPreferencesKey("update_check_auto")
        val LAST_UPDATE_CHECK = longPreferencesKey("last_update_check")
@@ -90,9 +89,6 @@ class SettingsStore(
    private val _ntfyServers = MutableStateFlow<List<NtfyServer>>(emptyList())
    val ntfyServers = _ntfyServers.asStateFlow()

-    private val _meowServers = MutableStateFlow<List<MeowServer>>(emptyList())
-    val meowServers = _meowServers.asStateFlow()
-
    private val _emailServers = MutableStateFlow<List<EmailServer>>(emptyList())
    val emailServers = _emailServers.asStateFlow()

@@ -110,7 +106,6 @@ class SettingsStore(
    // 各通道「发通一条止 / 全发」
    val barkStopOnFirst = MutableStateFlow(true)
    val ntfyStopOnFirst = MutableStateFlow(false)
-    val meowStopOnFirst = MutableStateFlow(false)
    val emailStopOnFirst = MutableStateFlow(false)
    val smsStopOnFirst = MutableStateFlow(false)

@@ -122,8 +117,9 @@ class SettingsStore(
    val smsSuspended = MutableStateFlow(false)
    val lastSmsSentTime = MutableStateFlow(0L)

-    // 电邮总开关
+    // 电邮/ntfy 总开关
    val emailForwardingEnabled = MutableStateFlow(false)
+    val ntfyEnabled = MutableStateFlow(false)

    // 应用更新
    val updateCheckEnabled = MutableStateFlow(true)
@@ -149,7 +145,6 @@ class SettingsStore(
                // 各通道 stopOnFirst
                barkStopOnFirst.value = p[K.BARK_STOP_FIRST] ?: true
                ntfyStopOnFirst.value = p[K.NTFY_STOP_FIRST] ?: false
-                meowStopOnFirst.value = p[K.MEOW_STOP_FIRST] ?: false
                emailStopOnFirst.value = p[K.EMAIL_STOP_FIRST] ?: false
                smsStopOnFirst.value = p[K.SMS_STOP_FIRST] ?: false
                // 短信兜底全局
@@ -159,8 +154,9 @@ class SettingsStore(
                smsBalance.value = p[K.SMS_BALANCE] ?: -1
                smsSuspended.value = p[K.SMS_SUSPENDED] ?: false
                lastSmsSentTime.value = p[K.SMS_LAST_SENT] ?: 0L
-                // 电邮总开关
+                // 电邮/ntfy 总开关
                emailForwardingEnabled.value = p[K.EMAIL_ENABLED] ?: false
+                ntfyEnabled.value = p[K.NTFY_ENABLED] ?: false
                // 应用更新
                updateCheckEnabled.value = p[K.UPDATE_CHECK_AUTO] ?: true
                lastUpdateCheckTime.value = p[K.LAST_UPDATE_CHECK] ?: 0L
@@ -169,9 +165,6 @@ class SettingsStore(
                _ntfyServers.value = p[K.NTFY_SERVERS]
                    ?.let { runCatching { json.decodeFromString<List<NtfyServer>>(it) }.getOrNull() }
                    ?: emptyList()
-                _meowServers.value = p[K.MEOW_SERVERS]
-                    ?.let { runCatching { json.decodeFromString<List<MeowServer>>(it) }.getOrNull() }
-                    ?: emptyList()
                _emailServers.value = p[K.EMAIL_SERVERS]
                    ?.let { runCatching { json.decodeFromString<List<EmailServer>>(it) }.getOrNull() }
                    ?: emptyList()
@@ -272,22 +265,6 @@ class SettingsStore(
    }
    suspend fun setNtfyEnabled(id: String, enabled: Boolean) = saveNtfyServers(_ntfyServers.value.map { if (it.id == id) it.copy(enabled = enabled) else it })

-    // ---- Meow 服务器 CRUD ----
-    private suspend fun saveMeowServers(list: List<MeowServer>) {
-        edit { it[K.MEOW_SERVERS] = json.encodeToString(list) }
-        _meowServers.value = list
-    }
-    suspend fun addMeow(s: MeowServer) { saveMeowServers(_meowServers.value + s) }
-    suspend fun updateMeow(s: MeowServer) = saveMeowServers(_meowServers.value.map { if (it.id == s.id) s else it })
-    suspend fun deleteMeow(id: String) = saveMeowServers(_meowServers.value.filterNot { it.id == id })
-    suspend fun moveMeow(id: String, up: Boolean) {
-        val list = _meowServers.value.toMutableList()
-        val i = list.indexOfFirst { it.id == id }
-        if (i in 1..list.lastIndex && up) { java.util.Collections.swap(list, i, i - 1); saveMeowServers(list) }
-        else if (i in 0 until list.lastIndex && !up) { java.util.Collections.swap(list, i, i + 1); saveMeowServers(list) }
-    }
-    suspend fun setMeowEnabled(id: String, enabled: Boolean) = saveMeowServers(_meowServers.value.map { if (it.id == id) it.copy(enabled = enabled) else it })
-
    // ---- 电邮服务器 CRUD ----
    private suspend fun saveEmailServers(list: List<EmailServer>) {
        edit { it[K.EMAIL_SERVERS] = json.encodeToString(list) }
@@ -333,7 +310,6 @@ class SettingsStore(

    suspend fun setBarkStopOnFirst(v: Boolean) { edit { it[K.BARK_STOP_FIRST] = v }; barkStopOnFirst.value = v }
    suspend fun setNtfyStopOnFirst(v: Boolean) { edit { it[K.NTFY_STOP_FIRST] = v }; ntfyStopOnFirst.value = v }
-    suspend fun setMeowStopOnFirst(v: Boolean) { edit { it[K.MEOW_STOP_FIRST] = v }; meowStopOnFirst.value = v }
    suspend fun setEmailStopOnFirst(v: Boolean) { edit { it[K.EMAIL_STOP_FIRST] = v }; emailStopOnFirst.value = v }
    suspend fun setSmsStopOnFirst(v: Boolean) { edit { it[K.SMS_STOP_FIRST] = v }; smsStopOnFirst.value = v }

@@ -349,6 +325,7 @@ class SettingsStore(
    suspend fun setIgnoredVersion(v: String) { edit { it[K.IGNORED_VERSION] = v }; ignoredVersion.value = v }

    suspend fun setEmailForwarding(v: Boolean) { edit { it[K.EMAIL_ENABLED] = v }; emailForwardingEnabled.value = v }
+    suspend fun setNtfyEnabled(v: Boolean) { edit { it[K.NTFY_ENABLED] = v }; ntfyEnabled.value = v }

    suspend fun snapshot() = ds.data.first()

@@ -7,7 +7,6 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -69,9 +68,6 @@ fun SectionCard(
    title: String? = null,
    modifier: Modifier = Modifier,
    subtitle: String? = null,
-    titleIcon: ImageVector? = null,
-    titleIconTint: Color = MaterialTheme.colorScheme.primary,
-    headerAction: (@Composable () -> Unit)? = null,
    content: @Composable ColumnScope.() -> Unit,
 ) {
    Card(
@@ -83,19 +79,12 @@ fun SectionCard(
    ) {
        Column(Modifier.padding(16.dp)) {
            if (title != null) {
-                if (headerAction == null) {
-                    Row(verticalAlignment = Alignment.CenterVertically) {
-                        if (titleIcon != null) {
-                            Icon(titleIcon, null, tint = titleIconTint, modifier = Modifier.size(22.dp))
-                            Spacer(Modifier.width(8.dp))
-                        }
                Text(
                    title,
                    style = MaterialTheme.typography.titleMedium,
                    fontWeight = FontWeight.SemiBold,
                    modifier = Modifier.padding(bottom = if (subtitle == null) 10.dp else 2.dp),
                )
-                    }
                if (subtitle != null) {
                    Text(
                        subtitle,
@@ -104,38 +93,6 @@ fun SectionCard(
                        modifier = Modifier.padding(bottom = 10.dp),
                    )
                }
-                } else {
-                    Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(bottom = 10.dp),
-                        verticalAlignment = Alignment.Top,
-                    ) {
-                        Column(Modifier.weight(1f)) {
-                            Row(verticalAlignment = Alignment.CenterVertically) {
-                                if (titleIcon != null) {
-                                    Icon(titleIcon, null, tint = titleIconTint, modifier = Modifier.size(22.dp))
-                                    Spacer(Modifier.width(8.dp))
-                                }
-                                Text(
-                                    title,
-                                    style = MaterialTheme.typography.titleMedium,
-                                    fontWeight = FontWeight.SemiBold,
-                                    modifier = Modifier.padding(bottom = if (subtitle == null) 0.dp else 2.dp),
-                                )
-                            }
-                            if (subtitle != null) {
-                                Text(
-                                    subtitle,
-                                    style = MaterialTheme.typography.bodySmall,
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                                )
-                            }
-                        }
-                        Spacer(Modifier.width(12.dp))
-                        headerAction()
-                    }
-                }
            }
            content()
        }
@@ -1,20 +1,7 @@
 package com.a2i.forwarder.ui.nav

-import androidx.compose.animation.core.RepeatMode
-import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.infiniteRepeatable
-import androidx.compose.animation.core.rememberInfiniteTransition
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.SystemUpdate
 import androidx.compose.material.icons.outlined.Apps
 import androidx.compose.material.icons.outlined.FilterAlt
 import androidx.compose.material.icons.outlined.Notifications
@@ -27,15 +14,8 @@ import androidx.compose.material3.NavigationBarItemDefaults
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavGraph.Companion.findStartDestination
@@ -43,13 +23,11 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import com.a2i.forwarder.A2iApp
 import com.a2i.forwarder.ui.screens.AppManageScreen
 import com.a2i.forwarder.ui.screens.FilterScreen
 import com.a2i.forwarder.ui.screens.HomeScreen
 import com.a2i.forwarder.ui.screens.LogScreen
 import com.a2i.forwarder.ui.screens.SettingsScreen
-import com.a2i.forwarder.ui.screens.UpdateDialog

 private sealed class Tab(val route: String, val label: String, val icon: ImageVector) {
    object Home : Tab("home", "首页", Icons.Outlined.Notifications)
@@ -68,11 +46,6 @@ fun AppRoot() {
    val current = backStack?.destination?.route
    val showBar = current in tabRoutes

-    val app = A2iApp.instance
-    val updateInfo by app.updateChecker.updateInfo.collectAsState()
-    var showUpdateDialog by remember { mutableStateOf(false) }
-
-    Box {
    Scaffold(
        containerColor = MaterialTheme.colorScheme.background,
        bottomBar = {
@@ -123,49 +96,4 @@ fun AppRoot() {
            composable("log") { LogScreen(onBack = { nav.popBackStack() }) }
        }
    }
-
-        // 浮动更新提醒小图标（跨所有页面，缓慢闪烁）
-        if (updateInfo != null) {
-            UpdateBadge(
-                modifier = Modifier.align(Alignment.TopEnd),
-                onClick = { showUpdateDialog = true },
-            )
-        }
-    }
-
-    if (showUpdateDialog && updateInfo != null) {
-        UpdateDialog(updateInfo!!, onDismiss = { showUpdateDialog = false })
-    }
-}
-
-/** 跨页面浮动更新提醒：右上角小圆点 + 缓慢闪烁动画。 */
-@Composable
-private fun UpdateBadge(modifier: Modifier = Modifier, onClick: () -> Unit) {
-    val transition = rememberInfiniteTransition(label = "updateBlink")
-    val pulseAlpha by transition.animateFloat(
-        initialValue = 0.35f,
-        targetValue = 1f,
-        animationSpec = infiniteRepeatable(
-            animation = tween(1200),
-            repeatMode = RepeatMode.Reverse,
-        ),
-        label = "pulseAlpha",
-    )
-
-    Box(
-        modifier = modifier
-            .padding(top = 12.dp, end = 12.dp)
-            .size(40.dp)
-            .alpha(pulseAlpha)
-            .background(MaterialTheme.colorScheme.primary, CircleShape)
-            .clickable(onClick = onClick),
-        contentAlignment = Alignment.Center,
-    ) {
-        Icon(
-            Icons.Filled.SystemUpdate,
-            contentDescription = "发现新版本，点击更新",
-            tint = Color.White,
-            modifier = Modifier.size(22.dp),
-        )
-    }
 }
@@ -61,7 +61,7 @@ fun FilterScreen() {
        modifier = Modifier.fillMaxSize().padding(horizontal = 16.dp),
        verticalArrangement = Arrangement.spacedBy(12.dp),
    ) {
-        item { ScreenTitle("过滤与优化", "减少噪音，保留真正需要转发的通知") }
+        item { ScreenTitle("过滤与优化", "减少噪音，保留真正需要同步到 iOS 的通知") }

        item {
            SectionCard("功能开关", subtitle = "规则按通知处理流水线顺序执行") {
@@ -178,7 +178,7 @@ fun HomeScreen(onOpenLog: () -> Unit, onOpenSettings: () -> Unit) {
                    Column(Modifier.weight(1f)) {
                        Text(if (granted) "通知监听已开启" else "需要授权通知监听", style = MaterialTheme.typography.titleMedium)
                        Text(
-                            if (granted) "系统通知将按规则处理并多通道转发" else "授权后才能读取 Android 通知并转发",
+                            if (granted) "系统通知将按规则处理并推送到 Bark" else "授权后才能读取 Android 通知并转发",
                            style = MaterialTheme.typography.bodySmall,
                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                        )
@@ -202,7 +202,7 @@ fun HomeScreen(onOpenLog: () -> Unit, onOpenSettings: () -> Unit) {
            SectionCard("运行状态", subtitle = "转发能力、目标服务器和日志入口") {
                SwitchRow(
                    title = "通知转发",
-                    subtitle = if (forwarding) "新通知会继续多通道转发" else "当前已暂停所有转发",
+                    subtitle = if (forwarding) "新通知会继续转发到 Bark" else "当前已暂停所有转发",
                    checked = forwarding,
                    icon = Icons.Filled.PowerSettingsNew,
                    tint = if (forwarding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant,
@@ -285,8 +285,8 @@ private fun HomeHero(
                }
                Spacer(Modifier.width(12.dp))
                Column(Modifier.weight(1f)) {
-                    Text("GotMsg", style = MaterialTheme.typography.displaySmall, color = Color.White)
-                    Text("安卓通知多通道转发", style = MaterialTheme.typography.bodyMedium, color = Color.White.copy(alpha = 0.82f))
+                    Text("a2i", style = MaterialTheme.typography.displaySmall, color = Color.White)
+                    Text("安卓通知转发到 iOS Bark", style = MaterialTheme.typography.bodyMedium, color = Color.White.copy(alpha = 0.82f))
                }
                StatusBadge(
                    text = if (granted && forwarding) "运行中" else "待处理",
@@ -295,7 +295,7 @@ private fun HomeHero(
            }
            Spacer(Modifier.size(14.dp))
            Text(
-                if (granted && forwarding) "监听、过滤、提取验证码和推送链路已就绪。" else "完成授权并开启转发后，通知会按规则转发到各通道。",
+                if (granted && forwarding) "监听、过滤、提取验证码和推送链路已就绪。" else "完成授权并开启转发后，通知会按规则推送到 iOS。",
                style = MaterialTheme.typography.bodyMedium,
                color = Color.White.copy(alpha = 0.86f),
            )
@@ -6,17 +6,12 @@ import android.net.Uri
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -27,15 +22,10 @@ import androidx.compose.material.icons.automirrored.filled.Send
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material.icons.filled.Email
 import androidx.compose.material.icons.filled.History
-import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.filled.KeyboardArrowDown
 import androidx.compose.material.icons.filled.KeyboardArrowUp
-import androidx.compose.material.icons.filled.Notifications
-import androidx.compose.material.icons.filled.Pets
 import androidx.compose.material.icons.filled.RestartAlt
-import androidx.compose.material.icons.filled.Sms
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material.icons.filled.SystemUpdateAlt
 import androidx.compose.material.icons.filled.Update
@@ -61,26 +51,18 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.documentfile.provider.DocumentFile
 import com.a2i.forwarder.A2iApp
-import com.a2i.forwarder.R
 import com.a2i.forwarder.core.BarkClient
 import com.a2i.forwarder.core.EmailSender
 import com.a2i.forwarder.core.IconExporter
-import com.a2i.forwarder.core.MeowSender
 import com.a2i.forwarder.core.NtfySender
 import com.a2i.forwarder.model.BarkMessage
 import com.a2i.forwarder.model.BarkServer
 import com.a2i.forwarder.model.EmailServer
-import com.a2i.forwarder.model.MeowServer
 import com.a2i.forwarder.model.NtfyServer
 import com.a2i.forwarder.model.OFFICIAL_BARK_SERVER
 import com.a2i.forwarder.model.SmsTarget
@@ -92,32 +74,19 @@ import com.a2i.forwarder.ui.SwitchRow
 import com.a2i.forwarder.ui.appVersionName
 import kotlinx.coroutines.launch

-private const val BARK_APP_STORE_URL = "https://apps.apple.com/app/bark-custom-notifications/id1403753865"
-private const val BARK_DOCS_URL = "https://bark.day.app/#/"
-private const val BARK_GITHUB_URL = "https://github.com/Finb/Bark"
-private const val BARK_OFFICIAL_SERVER = "https://api.day.app"
-private const val NTFY_OFFICIAL_SERVER = "https://ntfy.sh"
-private const val NTFY_ANDROID_URL = "https://play.google.com/store/apps/details?id=io.heckel.ntfy"
-private const val NTFY_IOS_URL = "https://apps.apple.com/us/app/ntfy/id1625396347"
-private const val NTFY_FDROID_URL = "https://f-droid.org/en/packages/io.heckel.ntfy/"
-private const val NTFY_DOCS_URL = "https://docs.ntfy.sh/subscribe/phone/"
-private const val NTFY_PUBLISH_DOCS_URL = "https://docs.ntfy.sh/publish/"
-private const val NTFY_GITHUB_URL = "https://github.com/binwiederhier/ntfy"
-
@Composable
 fun SettingsScreen(onOpenLog: () -> Unit) {
    val context = LocalContext.current
    val app = A2iApp.instance
    val servers by app.settings.servers.collectAsState()
    val ntfyServers by app.settings.ntfyServers.collectAsState()
-    val meowServers by app.settings.meowServers.collectAsState()
    val emailServers by app.settings.emailServers.collectAsState()
    val smsTargets by app.settings.smsTargets.collectAsState()
    val barkStopFirst by app.settings.barkStopOnFirst.collectAsState()
    val ntfyStopFirst by app.settings.ntfyStopOnFirst.collectAsState()
-    val meowStopFirst by app.settings.meowStopOnFirst.collectAsState()
    val emailStopFirst by app.settings.emailStopOnFirst.collectAsState()
    val smsStopFirst by app.settings.smsStopOnFirst.collectAsState()
+    val ntfyEnabled by app.settings.ntfyEnabled.collectAsState()
    val emailEnabled by app.settings.emailForwardingEnabled.collectAsState()
    val smsFallback by app.settings.smsFallbackEnabled.collectAsState()
    val iconPrefix by app.settings.iconPrefix.collectAsState()
@@ -149,14 +118,9 @@ fun SettingsScreen(onOpenLog: () -> Unit) {

    // 弹窗状态
    var showAddBark by remember { mutableStateOf(false) }
-    var showBarkHelp by remember { mutableStateOf(false) }
    var editingBark by remember { mutableStateOf<BarkServer?>(null) }
    var showAddNtfy by remember { mutableStateOf(false) }
-    var showNtfyHelp by remember { mutableStateOf(false) }
    var editingNtfy by remember { mutableStateOf<NtfyServer?>(null) }
-    var showAddMeow by remember { mutableStateOf(false) }
-    var showMeowHelp by remember { mutableStateOf(false) }
-    var editingMeow by remember { mutableStateOf<MeowServer?>(null) }
    var showAddEmail by remember { mutableStateOf(false) }
    var editingEmail by remember { mutableStateOf<EmailServer?>(null) }
    var showAddSms by remember { mutableStateOf(false) }
@@ -170,19 +134,13 @@ fun SettingsScreen(onOpenLog: () -> Unit) {

        // ===== Bark 服务器 =====
        item {
-            SectionCard {
-                ChannelSectionHeader(
-                    title = "Bark 服务器",
-                    summary = "iPhone / iPad 推送目标",
-                    mark = "B",
-                    markColor = Color(0xFFFF9800),
-                    markLogo = painterResource(R.drawable.ic_bark_logo),
-                    platforms = listOf("iOS"),
-                    stopFirst = barkStopFirst,
-                    onStopFirstChange = { v -> app.appScope.launch { app.settings.setBarkStopOnFirst(v) } },
-                    onHelpClick = { showBarkHelp = true },
-                    helpContentDescription = "Bark 配置帮助",
-                )
+            SectionCard("Bark 服务器", subtitle = "勾选的服务器参与转发；开关切换容错/广播") {
+                SwitchRow(
+                    title = "发通一条就停",
+                    subtitle = if (barkStopFirst) "容错模式：首个成功即止" else "广播模式：每个都发",
+                    checked = barkStopFirst,
+                    icon = Icons.Filled.Settings,
+                ) { v -> app.appScope.launch { app.settings.setBarkStopOnFirst(v) } }
                if (servers.isNotEmpty()) {
                    Spacer(Modifier.size(8.dp))
                    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
@@ -203,32 +161,23 @@ fun SettingsScreen(onOpenLog: () -> Unit) {

        // ===== ntfy =====
        item {
-            SectionCard {
-                ChannelSectionHeader(
-                    title = "ntfy 转发",
-                    summary = "Android / iOS topic 推送",
-                    mark = "n",
-                    markColor = Color(0xFF43A047),
-                    markLogo = painterResource(R.drawable.ic_ntfy_logo),
-                    platforms = listOf("Android", "iOS"),
-                    stopFirst = ntfyStopFirst,
-                    onStopFirstChange = { v -> app.appScope.launch { app.settings.setNtfyStopOnFirst(v) } },
-                    onHelpClick = { showNtfyHelp = true },
-                    helpContentDescription = "ntfy 配置帮助",
-                )
+            SectionCard("ntfy 转发", subtitle = "POST 推送到 ntfy 服务") {
+                SwitchRow(title = "启用 ntfy 转发", subtitle = if (ntfyEnabled) "已开启" else "已关闭", checked = ntfyEnabled) { v -> app.appScope.launch { app.settings.setNtfyEnabled(v) } }
+                if (ntfyEnabled) {
+                    SwitchRow(title = "发通一条就停", subtitle = if (ntfyStopFirst) "容错：首个成功止" else "广播：每个都发", checked = ntfyStopFirst) { v -> app.appScope.launch { app.settings.setNtfyStopOnFirst(v) } }
                    if (ntfyServers.isNotEmpty()) {
                        Spacer(Modifier.size(8.dp))
                        Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
                            ntfyServers.forEachIndexed { i, s ->
-                            NtfyServerRow(
-                                server = s,
-                                isFirst = i == 0,
-                                isLast = i == ntfyServers.lastIndex,
+                                ConfigRow(
+                                    title = s.name.ifBlank { s.topic },
+                                    subtitle = "${s.server} · topic: ${s.topic}${if (s.token.isNotBlank()) " · token已填" else ""}",
+                                    enabled = s.enabled, isFirst = i == 0, isLast = i == ntfyServers.lastIndex,
                                    onToggle = { v -> app.appScope.launch { app.settings.setNtfyEnabled(s.id, v) } },
-                                onEdit = { editingNtfy = s },
-                                onDelete = { app.appScope.launch { app.settings.deleteNtfy(s.id) } },
+                                    onEdit = { editingNtfy = s }, onDelete = { app.appScope.launch { app.settings.deleteNtfy(s.id) } },
                                    onMoveUp = { app.appScope.launch { app.settings.moveNtfy(s.id, true) } },
                                    onMoveDown = { app.appScope.launch { app.settings.moveNtfy(s.id, false) } },
+                                    onTest = { app.appScope.launch { NtfySender.send(s.server, s.topic, s.token, "a2i测试", "ntfy配置测试") } },
                                )
                            }
                        }
@@ -236,69 +185,27 @@ fun SettingsScreen(onOpenLog: () -> Unit) {
                    AddButton { showAddNtfy = true }
                }
            }
-
-        // ===== Meow =====
-        item {
-            SectionCard {
-                ChannelSectionHeader(
-                    title = "Meow 转发",
-                    summary = "鸿蒙手机推送目标",
-                    mark = "M",
-                    markColor = Color(0xFF7E57C2),
-                    markLogo = painterResource(R.drawable.ic_meow_logo),
-                    platforms = listOf("HarmonyOS"),
-                    stopFirst = meowStopFirst,
-                    onStopFirstChange = { v -> app.appScope.launch { app.settings.setMeowStopOnFirst(v) } },
-                    onHelpClick = { showMeowHelp = true },
-                    helpContentDescription = "Meow 配置帮助",
-                )
-                if (meowServers.isNotEmpty()) {
-                    Spacer(Modifier.size(8.dp))
-                    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                        meowServers.forEachIndexed { i, s ->
-                            MeowServerRow(
-                                server = s,
-                                isFirst = i == 0,
-                                isLast = i == meowServers.lastIndex,
-                                onToggle = { v -> app.appScope.launch { app.settings.setMeowEnabled(s.id, v) } },
-                                onEdit = { editingMeow = s },
-                                onDelete = { app.appScope.launch { app.settings.deleteMeow(s.id) } },
-                                onMoveUp = { app.appScope.launch { app.settings.moveMeow(s.id, true) } },
-                                onMoveDown = { app.appScope.launch { app.settings.moveMeow(s.id, false) } },
-                            )
-                        }
-                    }
-                }
-                AddButton { showAddMeow = true }
-            }
        }

        // ===== 电邮 =====
        item {
-            SectionCard {
-                ChannelSectionHeader(
-                    title = "电邮转发",
-                    summary = "SMTP 邮箱推送目标",
-                    mark = "@",
-                    markColor = Color(0xFF1976D2),
-                    markIcon = Icons.Filled.Email,
-                    platforms = listOf("Email"),
-                    stopFirst = emailStopFirst,
-                    onStopFirstChange = { v -> app.appScope.launch { app.settings.setEmailStopOnFirst(v) } },
-                )
+            SectionCard("电邮转发", subtitle = "SMTPS 直发邮件") {
+                SwitchRow(title = "启用电邮转发", subtitle = if (emailEnabled) "已开启" else "已关闭", checked = emailEnabled) { v -> app.appScope.launch { app.settings.setEmailForwarding(v) } }
+                if (emailEnabled) {
+                    SwitchRow(title = "发通一条就停", subtitle = if (emailStopFirst) "容错：首个成功止" else "广播：每个都发", checked = emailStopFirst) { v -> app.appScope.launch { app.settings.setEmailStopOnFirst(v) } }
                    if (emailServers.isNotEmpty()) {
                        Spacer(Modifier.size(8.dp))
                        Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
                            emailServers.forEachIndexed { i, s ->
-                            EmailServerRow(
-                                server = s,
-                                isFirst = i == 0,
-                                isLast = i == emailServers.lastIndex,
+                                ConfigRow(
+                                    title = s.name.ifBlank { s.to },
+                                    subtitle = "${s.host}:${s.port} · ${s.user} → ${s.to}",
+                                    enabled = s.enabled, isFirst = i == 0, isLast = i == emailServers.lastIndex,
                                    onToggle = { v -> app.appScope.launch { app.settings.setEmailEnabled(s.id, v) } },
-                                onEdit = { editingEmail = s },
-                                onDelete = { app.appScope.launch { app.settings.deleteEmail(s.id) } },
+                                    onEdit = { editingEmail = s }, onDelete = { app.appScope.launch { app.settings.deleteEmail(s.id) } },
                                    onMoveUp = { app.appScope.launch { app.settings.moveEmail(s.id, true) } },
                                    onMoveDown = { app.appScope.launch { app.settings.moveEmail(s.id, false) } },
+                                    onTest = { app.appScope.launch { EmailSender.send(s.host, s.port, s.user, s.password, s.from, s.to, "a2i测试", "电邮配置测试") } },
                                )
                            }
                        }
@@ -306,20 +213,14 @@ fun SettingsScreen(onOpenLog: () -> Unit) {
                    AddButton { showAddEmail = true }
                }
            }
+        }

        // ===== 短信兜底 =====
        item {
-            SectionCard {
-                ChannelSectionHeader(
-                    title = "断网短信兜底",
-                    summary = "无网络时发送关键通知",
-                    mark = "S",
-                    markColor = Color(0xFF00897B),
-                    markIcon = Icons.Filled.Sms,
-                    platforms = listOf("SMS"),
-                    stopFirst = smsStopFirst,
-                    onStopFirstChange = { v -> app.appScope.launch { app.settings.setSmsStopOnFirst(v) } },
-                )
+            SectionCard("断网短信兜底", subtitle = "无网络时把验证码/来电用短信发出去") {
+                SwitchRow(title = "启用短信兜底", subtitle = if (smsFallback) "已开启" else "已关闭", checked = smsFallback) { v -> app.appScope.launch { app.settings.setSmsFallback(v) } }
+                if (smsFallback) {
+                    SwitchRow(title = "发通一条就停", subtitle = if (smsStopFirst) "容错：首个成功止" else "广播：每个都发", checked = smsStopFirst) { v -> app.appScope.launch { app.settings.setSmsStopOnFirst(v) } }
                    if (!hasSmsPerm) {
                        Spacer(Modifier.size(4.dp))
                        OutlinedButton(onClick = { smsPermLauncher.launch(android.Manifest.permission.SEND_SMS) }, modifier = Modifier.fillMaxWidth()) { Text("授予短信权限") }
@@ -351,6 +252,7 @@ fun SettingsScreen(onOpenLog: () -> Unit) {
                    Text("运营商：${detectedCarrier.displayName}  ·  余额：$balanceText  ·  手动额度：$smsManualQuota", style = MaterialTheme.typography.bodySmall, color = if (smsSuspended) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.onSurfaceVariant)
                }
            }
+        }

        // ===== 应用图标 =====
        item {
@@ -405,15 +307,10 @@ fun SettingsScreen(onOpenLog: () -> Unit) {
    }

    // 弹窗
-    if (showBarkHelp) BarkHelpDialog(onDismiss = { showBarkHelp = false })
-    if (showNtfyHelp) NtfyHelpDialog(onDismiss = { showNtfyHelp = false })
-    if (showMeowHelp) MeowHelpDialog(onDismiss = { showMeowHelp = false })
    if (showAddBark) ServerDialog(onDismiss = { showAddBark = false }, onConfirm = { n, s, k -> app.appScope.launch { app.settings.addServer(n, s, k) }; showAddBark = false })
    editingBark?.let { srv -> ServerDialog(initial = srv, onDismiss = { editingBark = null }, onConfirm = { n, s, k -> app.appScope.launch { app.settings.updateServer(srv.copy(name = n, server = s, deviceKey = k)) }; editingBark = null }) }
    if (showAddNtfy) NtfyConfigDialog(onDismiss = { showAddNtfy = false }, onConfirm = { n, sv, t, tk -> app.appScope.launch { app.settings.addNtfy(NtfyServer(name = n, server = sv, topic = t, token = tk)) }; showAddNtfy = false })
    editingNtfy?.let { srv -> NtfyConfigDialog(initial = srv, onDismiss = { editingNtfy = null }, onConfirm = { n, sv, t, tk -> app.appScope.launch { app.settings.updateNtfy(srv.copy(name = n, server = sv, topic = t, token = tk)) }; editingNtfy = null }) }
-    if (showAddMeow) MeowConfigDialog(onDismiss = { showAddMeow = false }, onConfirm = { n, sv, k -> app.appScope.launch { app.settings.addMeow(MeowServer(name = n, server = sv, deviceKey = k)) }; showAddMeow = false })
-    editingMeow?.let { srv -> MeowConfigDialog(initial = srv, onDismiss = { editingMeow = null }, onConfirm = { n, sv, k -> app.appScope.launch { app.settings.updateMeow(srv.copy(name = n, server = sv, deviceKey = k)) }; editingMeow = null }) }
    if (showAddEmail) EmailConfigDialog(onDismiss = { showAddEmail = false }, onConfirm = { c -> app.appScope.launch { app.settings.addEmail(c) }; showAddEmail = false })
    editingEmail?.let { srv -> EmailConfigDialog(initial = srv, onDismiss = { editingEmail = null }, onConfirm = { c -> app.appScope.launch { app.settings.updateEmail(c.copy(id = srv.id)) }; editingEmail = null }) }
    if (showAddSms) SmsConfigDialog(onDismiss = { showAddSms = false }, onConfirm = { n, num -> app.appScope.launch { app.settings.addSmsTarget(SmsTarget(name = n, number = num)) }; showAddSms = false })
@@ -429,357 +326,6 @@ private fun AddButton(onClick: () -> Unit) {
    }
 }

-@Composable
-private fun ChannelSectionHeader(
-    title: String,
-    summary: String,
-    mark: String,
-    markColor: Color,
-    markIcon: ImageVector? = null,
-    markLogo: Painter? = null,
-    platforms: List<String>,
-    stopFirst: Boolean,
-    onStopFirstChange: (Boolean) -> Unit,
-    onHelpClick: (() -> Unit)? = null,
-    helpContentDescription: String? = null,
-) {
-    Column(
-        modifier = Modifier.fillMaxWidth().padding(bottom = 4.dp),
-        verticalArrangement = Arrangement.spacedBy(10.dp),
-    ) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            ChannelMark(mark = mark, tint = markColor, icon = markIcon, logoPainter = markLogo)
-            Spacer(Modifier.width(10.dp))
-            Row(
-                modifier = Modifier.weight(1f),
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(
-                    title,
-                    style = MaterialTheme.typography.titleMedium,
-                    fontWeight = FontWeight.SemiBold,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    modifier = Modifier.weight(1f, fill = false),
-                )
-                if (platforms.isNotEmpty()) {
-                    Spacer(Modifier.width(8.dp))
-                    Row(
-                        horizontalArrangement = Arrangement.spacedBy(5.dp),
-                        verticalAlignment = Alignment.CenterVertically,
-                    ) {
-                        platforms.forEach { PlatformBadge(it) }
-                    }
-                }
-            }
-            if (onHelpClick != null) {
-                Spacer(Modifier.width(8.dp))
-                IconButton(onClick = onHelpClick, modifier = Modifier.size(40.dp)) {
-                    Icon(
-                        Icons.Filled.Info,
-                        helpContentDescription,
-                        tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                    )
-                }
-            }
-        }
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Text(
-                summary,
-                style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-                modifier = Modifier.weight(1f),
-            )
-            Spacer(Modifier.width(8.dp))
-            DeliveryModeControl(
-                stopFirst = stopFirst,
-                onStopFirstChange = onStopFirstChange,
-            )
-        }
-    }
-}
-
-@Composable
-private fun ChannelMark(mark: String, tint: Color, icon: ImageVector? = null, logoPainter: Painter? = null) {
-    Surface(
-        modifier = Modifier.size(36.dp),
-        shape = RoundedCornerShape(10.dp),
-        color = tint.copy(alpha = 0.14f),
-        border = BorderStroke(1.dp, tint.copy(alpha = 0.28f)),
-    ) {
-        Row(
-            modifier = Modifier.fillMaxSize(),
-            horizontalArrangement = Arrangement.Center,
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            if (logoPainter != null) {
-                Image(logoPainter, null, modifier = Modifier.size(24.dp))
-            } else if (icon != null) {
-                Icon(icon, null, tint = tint, modifier = Modifier.size(20.dp))
-            } else {
-                Text(mark, style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.Bold, color = tint, maxLines = 1)
-            }
-        }
-    }
-}
-
-@Composable
-private fun PlatformBadge(label: String) {
-    Surface(
-        shape = RoundedCornerShape(999.dp),
-        color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.72f),
-        border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant),
-    ) {
-        Text(
-            label,
-            modifier = Modifier.padding(horizontal = 7.dp, vertical = 3.dp),
-            style = MaterialTheme.typography.labelSmall,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
-            maxLines = 1,
-        )
-    }
-}
-
-@Composable
-private fun DeliveryModeControl(
-    stopFirst: Boolean,
-    onStopFirstChange: (Boolean) -> Unit,
-) {
-    Row(verticalAlignment = Alignment.CenterVertically) {
-        Text(
-            "模式",
-            style = MaterialTheme.typography.labelSmall,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
-            maxLines = 1,
-        )
-        Spacer(Modifier.width(6.dp))
-        DeliveryModeOption(
-            label = "容错",
-            selected = stopFirst,
-            shape = RoundedCornerShape(topStart = 8.dp, topEnd = 0.dp, bottomEnd = 0.dp, bottomStart = 8.dp),
-            onClick = { onStopFirstChange(true) },
-        )
-        DeliveryModeOption(
-            label = "广播",
-            selected = !stopFirst,
-            shape = RoundedCornerShape(topStart = 0.dp, topEnd = 8.dp, bottomEnd = 8.dp, bottomStart = 0.dp),
-            onClick = { onStopFirstChange(false) },
-        )
-    }
-}
-
-@Composable
-private fun DeliveryModeOption(
-    label: String,
-    selected: Boolean,
-    shape: RoundedCornerShape,
-    onClick: () -> Unit,
-) {
-    Surface(
-        modifier = Modifier.clickable(onClick = onClick),
-        shape = shape,
-        color = if (selected) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surface,
-        border = BorderStroke(
-            1.dp,
-            if (selected) MaterialTheme.colorScheme.primary.copy(alpha = 0.50f) else MaterialTheme.colorScheme.outlineVariant,
-        ),
-    ) {
-        Text(
-            label,
-            modifier = Modifier.padding(horizontal = 9.dp, vertical = 5.dp),
-            style = MaterialTheme.typography.labelMedium,
-            fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium,
-            color = if (selected) MaterialTheme.colorScheme.onPrimaryContainer else MaterialTheme.colorScheme.onSurfaceVariant,
-            maxLines = 1,
-        )
-    }
-}
-
-@Composable
-private fun BarkHelpDialog(onDismiss: () -> Unit) {
-    val uriHandler = LocalUriHandler.current
-
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        icon = { Icon(Icons.Filled.Info, null) },
-        title = { Text("Bark 配置帮助") },
-        text = {
-            Column(
-                modifier = Modifier
-                    .heightIn(max = 440.dp)
-                    .verticalScroll(rememberScrollState()),
-                verticalArrangement = Arrangement.spacedBy(10.dp),
-            ) {
-                Text(
-                    "Bark 用来把 a2i 处理后的 Android 通知推送到 iPhone / iPad。第一次使用按下面顺序配置即可。",
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                )
-
-                HelpStep("1", "在 iPhone / iPad 上安装 Bark，首次打开时允许通知权限。")
-                HelpStep("2", "打开 Bark，复制首页显示的推送地址，通常类似 $BARK_OFFICIAL_SERVER/你的Key。")
-                HelpStep("3", "回到 a2i，点击本区域底部的「添加」。服务器地址填 $BARK_OFFICIAL_SERVER，自建服务则填你的自建地址。")
-                HelpStep("4", "Device Key 填推送地址最后一段 Key，不要把完整 URL 都填进去。")
-                HelpStep("5", "保存后点服务器行里的发送按钮测试；iPhone 收到「GotMsg 测试」就说明 Bark 通道已通。")
-                HelpStep("6", "最后回首页开启「通知转发」，并按提示授予系统通知监听权限。")
-
-                Text(
-                    "常用链接",
-                    style = MaterialTheme.typography.titleSmall,
-                    fontWeight = FontWeight.SemiBold,
-                    modifier = Modifier.padding(top = 4.dp),
-                )
-                HelpLink("Bark App Store", BARK_APP_STORE_URL) { uriHandler.openUri(it) }
-                HelpLink("Bark 官方文档", BARK_DOCS_URL) { uriHandler.openUri(it) }
-                HelpLink("Bark GitHub", BARK_GITHUB_URL) { uriHandler.openUri(it) }
-
-                Text(
-                    "提示：如果使用自建 Bark Server，a2i 里的服务器地址要换成自建地址，但 Device Key 仍然来自 Bark App。",
-                    style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    modifier = Modifier.padding(top = 2.dp),
-                )
-            }
-        },
-        confirmButton = { TextButton(onClick = onDismiss) { Text("知道了") } },
-    )
-}
-
-@Composable
-private fun NtfyHelpDialog(onDismiss: () -> Unit) {
-    val uriHandler = LocalUriHandler.current
-
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        icon = { Icon(Icons.Filled.Info, null) },
-        title = { Text("ntfy 配置帮助") },
-        text = {
-            Column(
-                modifier = Modifier
-                    .heightIn(max = 440.dp)
-                    .verticalScroll(rememberScrollState()),
-                verticalArrangement = Arrangement.spacedBy(10.dp),
-            ) {
-                Text(
-                    "ntfy 用来把 a2i 处理后的通知推送到 Android、iOS 或网页版 ntfy。它不需要先建项目，只要接收端和 a2i 使用同一个 server + topic 即可。",
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                )
-
-                HelpStep("1", "在接收端安装 ntfy。Android 可用 Google Play / F-Droid / GitHub APK，iPhone / iPad 可用 App Store。")
-                HelpStep("2", "打开 ntfy，添加订阅。服务器通常填 $NTFY_OFFICIAL_SERVER；Topic 建议用一串不容易猜到的随机名字，例如 a2i_xxxxxxxx。")
-                HelpStep("3", "回到 a2i，点击本区域底部的「添加」。服务器和 Topic 要与接收端订阅完全一致。")
-                HelpStep("4", "Token 是可选项。只有你在 ntfy 账号或自建服务里把 topic 设成需要鉴权时，才填写 access token。")
-                HelpStep("5", "保存后点 topic 行里的发送按钮测试；接收端收到「GotMsg 测试」就说明 ntfy 通道已通。")
-                HelpStep("6", "后续只要这一行左侧保持勾选，它就会参与转发；取消勾选就是停用这个 topic。")
-
-                Text(
-                    "常用链接",
-                    style = MaterialTheme.typography.titleSmall,
-                    fontWeight = FontWeight.SemiBold,
-                    modifier = Modifier.padding(top = 4.dp),
-                )
-                HelpLink("ntfy Android · Google Play", NTFY_ANDROID_URL) { uriHandler.openUri(it) }
-                HelpLink("ntfy Android · F-Droid", NTFY_FDROID_URL) { uriHandler.openUri(it) }
-                HelpLink("ntfy iOS · App Store", NTFY_IOS_URL) { uriHandler.openUri(it) }
-                HelpLink("ntfy 手机端文档", NTFY_DOCS_URL) { uriHandler.openUri(it) }
-                HelpLink("ntfy 发布 API 文档", NTFY_PUBLISH_DOCS_URL) { uriHandler.openUri(it) }
-                HelpLink("ntfy GitHub", NTFY_GITHUB_URL) { uriHandler.openUri(it) }
-
-                Text(
-                    "提示：公共 topic 谁知道名字谁就可能订阅或发送，所以 topic 名不要用手机号、姓名、邮箱等可猜信息。",
-                    style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    modifier = Modifier.padding(top = 2.dp),
-                )
-            }
-        },
-        confirmButton = { TextButton(onClick = onDismiss) { Text("知道了") } },
-    )
-}
-
-@Composable
-private fun MeowHelpDialog(onDismiss: () -> Unit) {
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        icon = { Icon(Icons.Filled.Info, null, tint = Color(0xFFFF9800)) },
-        title = { Text("Meow 配置帮助") },
-        text = {
-            Column(
-                modifier = Modifier
-                    .heightIn(max = 440.dp)
-                    .verticalScroll(rememberScrollState()),
-                verticalArrangement = Arrangement.spacedBy(10.dp),
-            ) {
-                Text(
-                    "Meow 用来把 a2i 处理后的 Android 通知推送到鸿蒙手机。a2i 只负责按你填写的 Meow 接口地址和 Device Key 发出 HTTP 请求。",
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                )
-
-                HelpStep("1", "在鸿蒙手机上安装并打开 Meow，先确认 Meow 自身可以正常接收推送。")
-                HelpStep("2", "在 Meow 里找到推送接口、服务器地址或 API 地址，同时复制对应的 Device Key / Token。")
-                HelpStep("3", "回到 a2i，点击本区域底部的「添加」。名称按你的鸿蒙设备填写，方便以后区分。")
-                HelpStep("4", "服务器地址可以填 Meow 给出的完整 API 地址；如果 Meow 只给了服务根地址，a2i 也会尝试常见的 /push 路径。")
-                HelpStep("5", "Device Key 填 Meow 给你的设备 Key 或 Token，不要填写鸿蒙手机锁屏密码、华为账号密码等敏感账号密码。")
-                HelpStep("6", "保存后点设备行里的发送按钮测试；鸿蒙手机收到「GotMsg 测试」就说明 Meow 通道已通。")
-                HelpStep("7", "后续只要这一行左侧保持勾选，它就会参与转发；取消勾选就是停用这个鸿蒙设备。")
-
-                Text(
-                    "提示：如果测试失败，优先检查 Meow 里的接口地址是否完整、Key 是否复制完整，以及鸿蒙手机是否允许 Meow 通知。",
-                    style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    modifier = Modifier.padding(top = 2.dp),
-                )
-            }
-        },
-        confirmButton = { TextButton(onClick = onDismiss) { Text("知道了") } },
-    )
-}
-
-@Composable
-private fun HelpStep(
-    index: String,
-    text: String,
-) {
-    Row(verticalAlignment = Alignment.Top) {
-        Text(
-            "$index.",
-            style = MaterialTheme.typography.bodyMedium,
-            fontWeight = FontWeight.SemiBold,
-            color = MaterialTheme.colorScheme.primary,
-            modifier = Modifier.width(24.dp),
-        )
-        Text(
-            text,
-            style = MaterialTheme.typography.bodyMedium,
-            modifier = Modifier.weight(1f),
-        )
-    }
-}
-
-@Composable
-private fun HelpLink(
-    title: String,
-    url: String,
-    onOpen: (String) -> Unit,
-) {
-    OutlinedButton(
-        onClick = { onOpen(url) },
-        modifier = Modifier.fillMaxWidth(),
-    ) {
-        Text(title, maxLines = 1, overflow = TextOverflow.Ellipsis)
-    }
-}
-
 /** 通用配置行（ntfy/电邮/短信 共用，仿 ServerRow 简化版）。 */
@Composable
 private fun ConfigRow(
@@ -812,87 +358,7 @@ private fun ConfigRow(
    }
 }

-// ===== ntfy / Bark Row + Dialog =====
-@Composable
-private fun MeowServerRow(
-    server: MeowServer, isFirst: Boolean, isLast: Boolean,
-    onToggle: (Boolean) -> Unit, onEdit: () -> Unit, onDelete: () -> Unit,
-    onMoveUp: () -> Unit, onMoveDown: () -> Unit,
-) {
-    val app = A2iApp.instance
-    var testing by remember { mutableStateOf(false) }
-    var testMsg by remember { mutableStateOf<String?>(null) }
-    Surface(
-        modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(8.dp),
-        color = if (server.enabled) MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.40f) else MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.36f),
-        border = BorderStroke(1.dp, if (server.enabled) MaterialTheme.colorScheme.primary.copy(alpha = 0.30f) else MaterialTheme.colorScheme.outlineVariant),
-    ) {
-        Column(Modifier.padding(start = 4.dp, end = 4.dp, top = 2.dp, bottom = 6.dp)) {
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(checked = server.enabled, onCheckedChange = onToggle)
-                Row(Modifier.weight(1f), verticalAlignment = Alignment.CenterVertically) {
-                    Text(server.name.ifBlank { "鸿蒙手机" }, style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.Medium, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false))
-                    if (!server.enabled) { Spacer(Modifier.width(8.dp)); StatusBadge("停用", MaterialTheme.colorScheme.onSurfaceVariant) }
-                }
-                IconButton(onClick = { if (!testing) app.appScope.launch { testing = true; testMsg = testMeow(server); testing = false } }, enabled = !testing) {
-                    if (testing) CircularProgressIndicator(Modifier.size(18.dp), strokeWidth = 2.dp) else Icon(Icons.AutoMirrored.Filled.Send, "测试")
-                }
-                IconButton(onClick = onEdit) { Icon(Icons.Filled.Edit, "编辑") }
-                IconButton(onClick = onDelete) { Icon(Icons.Filled.Delete, "删除") }
-            }
-            Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(top = 2.dp)) {
-                Column(Modifier.weight(1f).padding(start = 36.dp)) {
-                    Text(server.server.ifBlank { "服务器地址未填" }, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 2, overflow = TextOverflow.Ellipsis)
-                    Text("device key: " + if (server.deviceKey.isBlank()) "未填" else "已填（${server.deviceKey.length} 位）", style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
-                }
-                IconButton(onClick = onMoveUp, enabled = !isFirst) { Icon(Icons.Filled.KeyboardArrowUp, "上移") }
-                IconButton(onClick = onMoveDown, enabled = !isLast) { Icon(Icons.Filled.KeyboardArrowDown, "下移") }
-            }
-            testMsg?.let { Text(it, style = MaterialTheme.typography.bodySmall, color = if (it.startsWith("已发送")) MaterialTheme.colorScheme.tertiary else MaterialTheme.colorScheme.error, modifier = Modifier.padding(start = 48.dp, top = 2.dp)) }
-        }
-    }
-}
-
-@Composable
-private fun NtfyServerRow(
-    server: NtfyServer, isFirst: Boolean, isLast: Boolean,
-    onToggle: (Boolean) -> Unit, onEdit: () -> Unit, onDelete: () -> Unit,
-    onMoveUp: () -> Unit, onMoveDown: () -> Unit,
-) {
-    val app = A2iApp.instance
-    var testing by remember { mutableStateOf(false) }
-    var testMsg by remember { mutableStateOf<String?>(null) }
-    Surface(
-        modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(8.dp),
-        color = if (server.enabled) MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.40f) else MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.36f),
-        border = BorderStroke(1.dp, if (server.enabled) MaterialTheme.colorScheme.primary.copy(alpha = 0.30f) else MaterialTheme.colorScheme.outlineVariant),
-    ) {
-        Column(Modifier.padding(start = 4.dp, end = 4.dp, top = 2.dp, bottom = 6.dp)) {
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(checked = server.enabled, onCheckedChange = onToggle)
-                Row(Modifier.weight(1f), verticalAlignment = Alignment.CenterVertically) {
-                    Text(server.name.ifBlank { server.topic.ifBlank { "未命名" } }, style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.Medium, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false))
-                    if (!server.enabled) { Spacer(Modifier.width(8.dp)); StatusBadge("停用", MaterialTheme.colorScheme.onSurfaceVariant) }
-                }
-                IconButton(onClick = { if (!testing) app.appScope.launch { testing = true; testMsg = testNtfy(server); testing = false } }, enabled = !testing) {
-                    if (testing) CircularProgressIndicator(Modifier.size(18.dp), strokeWidth = 2.dp) else Icon(Icons.AutoMirrored.Filled.Send, "测试")
-                }
-                IconButton(onClick = onEdit) { Icon(Icons.Filled.Edit, "编辑") }
-                IconButton(onClick = onDelete) { Icon(Icons.Filled.Delete, "删除") }
-            }
-            Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(top = 2.dp)) {
-                Column(Modifier.weight(1f).padding(start = 36.dp)) {
-                    Text(server.server, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 2, overflow = TextOverflow.Ellipsis)
-                    Text("topic: " + server.topic.ifBlank { "未填" } + if (server.token.isNotBlank()) " · token已填" else "", style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis)
-                }
-                IconButton(onClick = onMoveUp, enabled = !isFirst) { Icon(Icons.Filled.KeyboardArrowUp, "上移") }
-                IconButton(onClick = onMoveDown, enabled = !isLast) { Icon(Icons.Filled.KeyboardArrowDown, "下移") }
-            }
-            testMsg?.let { Text(it, style = MaterialTheme.typography.bodySmall, color = if (it.startsWith("已发送")) MaterialTheme.colorScheme.tertiary else MaterialTheme.colorScheme.error, modifier = Modifier.padding(start = 48.dp, top = 2.dp)) }
-        }
-    }
-}
-
+// ===== Bark 服务器 Row + Dialog（保留原有） =====
@Composable
 private fun ServerRow(
    server: BarkServer, isFirst: Boolean, isLast: Boolean,
@@ -933,52 +399,6 @@ private fun ServerRow(
    }
 }

-@Composable
-private fun EmailServerRow(
-    server: EmailServer, isFirst: Boolean, isLast: Boolean,
-    onToggle: (Boolean) -> Unit, onEdit: () -> Unit, onDelete: () -> Unit,
-    onMoveUp: () -> Unit, onMoveDown: () -> Unit,
-) {
-    val app = A2iApp.instance
-    var testing by remember { mutableStateOf(false) }
-    var testMsg by remember { mutableStateOf<String?>(null) }
-    Surface(
-        modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(8.dp),
-        color = if (server.enabled) MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.40f) else MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.36f),
-        border = BorderStroke(1.dp, if (server.enabled) MaterialTheme.colorScheme.primary.copy(alpha = 0.30f) else MaterialTheme.colorScheme.outlineVariant),
-    ) {
-        Column(Modifier.padding(start = 4.dp, end = 4.dp, top = 2.dp, bottom = 6.dp)) {
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(checked = server.enabled, onCheckedChange = onToggle)
-                Row(Modifier.weight(1f), verticalAlignment = Alignment.CenterVertically) {
-                    Text(server.name.ifBlank { server.to.ifBlank { "未命名" } }, style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.Medium, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false))
-                    if (!server.enabled) { Spacer(Modifier.width(8.dp)); StatusBadge("停用", MaterialTheme.colorScheme.onSurfaceVariant) }
-                }
-                IconButton(onClick = { if (!testing) app.appScope.launch { testing = true; testMsg = testEmail(server); testing = false } }, enabled = !testing) {
-                    if (testing) CircularProgressIndicator(Modifier.size(18.dp), strokeWidth = 2.dp) else Icon(Icons.AutoMirrored.Filled.Send, "测试")
-                }
-                IconButton(onClick = onEdit) { Icon(Icons.Filled.Edit, "编辑") }
-                IconButton(onClick = onDelete) { Icon(Icons.Filled.Delete, "删除") }
-            }
-            Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(top = 2.dp)) {
-                Column(Modifier.weight(1f).padding(start = 36.dp)) {
-                    Text("${server.host}:${server.port}", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis)
-                    Text(server.to.ifBlank { "收件人未填" }, style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis)
-                }
-                IconButton(onClick = onMoveUp, enabled = !isFirst) { Icon(Icons.Filled.KeyboardArrowUp, "上移") }
-                IconButton(onClick = onMoveDown, enabled = !isLast) { Icon(Icons.Filled.KeyboardArrowDown, "下移") }
-            }
-            testMsg?.let { Text(it, style = MaterialTheme.typography.bodySmall, color = if (it.startsWith("已发送")) MaterialTheme.colorScheme.tertiary else MaterialTheme.colorScheme.error, modifier = Modifier.padding(start = 48.dp, top = 2.dp)) }
-        }
-    }
-}
-
-private suspend fun testEmail(server: EmailServer): String {
-    if (server.host.isBlank() || server.to.isBlank()) return "SMTP 主机或收件人未填"
-    val r = EmailSender.send(server.host, server.port, server.user, server.password, server.from, server.to, "GotMsg 测试", "电邮配置测试")
-    return if (r.isSuccess) "已发送，请查看邮箱" else "发送失败：${r.exceptionOrNull()?.message}"
-}
-
@Composable
 private fun ServerDialog(initial: BarkServer? = null, onDismiss: () -> Unit, onConfirm: (String, String, String) -> Unit) {
    var name by remember { mutableStateOf(initial?.name ?: "") }
@@ -996,7 +416,7 @@ private fun ServerDialog(initial: BarkServer? = null, onDismiss: () -> Unit, onC
@Composable
 private fun NtfyConfigDialog(initial: NtfyServer? = null, onDismiss: () -> Unit, onConfirm: (String, String, String, String) -> Unit) {
    var name by remember { mutableStateOf(initial?.name ?: "") }
-    var server by remember { mutableStateOf(initial?.server ?: NTFY_OFFICIAL_SERVER) }
+    var server by remember { mutableStateOf(initial?.server ?: "https://ntfy.sh") }
    var topic by remember { mutableStateOf(initial?.topic ?: "") }
    var token by remember { mutableStateOf(initial?.token ?: "") }
    ConfigDialogSkeleton(title = if (initial == null) "添加 ntfy" else "编辑 ntfy", onDismiss = onDismiss, onConfirm = { onConfirm(name.trim(), server.trim().removeSuffix("/"), topic.trim(), token.trim()) }) {
@@ -1010,20 +430,6 @@ private fun NtfyConfigDialog(initial: NtfyServer? = null, onDismiss: () -> Unit,
    }
 }

-@Composable
-private fun MeowConfigDialog(initial: MeowServer? = null, onDismiss: () -> Unit, onConfirm: (String, String, String) -> Unit) {
-    var name by remember { mutableStateOf(initial?.name ?: "") }
-    var server by remember { mutableStateOf(initial?.server ?: "") }
-    var key by remember { mutableStateOf(initial?.deviceKey ?: "") }
-    ConfigDialogSkeleton(title = if (initial == null) "添加 Meow" else "编辑 Meow", onDismiss = onDismiss, onConfirm = { onConfirm(name.trim(), server.trim().removeSuffix("/"), key.trim()) }) {
-        OutlinedTextField(name, { name = it }, label = { Text("名称") }, singleLine = true, modifier = Modifier.fillMaxWidth())
-        Spacer(Modifier.size(8.dp))
-        OutlinedTextField(server, { server = it }, label = { Text("服务器 / API 地址") }, singleLine = true, modifier = Modifier.fillMaxWidth(), supportingText = { Text("填写 Meow 提供的完整 API 地址或服务根地址") })
-        Spacer(Modifier.size(8.dp))
-        OutlinedTextField(key, { key = it }, label = { Text("Device Key / Token") }, singleLine = true, modifier = Modifier.fillMaxWidth())
-    }
-}
-
@Composable
 private fun EmailConfigDialog(initial: EmailServer? = null, onDismiss: () -> Unit, onConfirm: (EmailServer) -> Unit) {
    var name by remember { mutableStateOf(initial?.name ?: "") }
@@ -1076,20 +482,7 @@ private fun ConfigDialogSkeleton(title: String, onDismiss: () -> Unit, onConfirm

 private suspend fun testPush(app: A2iApp, server: BarkServer): String {
    if (server.deviceKey.isBlank()) return "未填写 device key"
-    val msg = BarkMessage(deviceKey = server.deviceKey, title = "GotMsg 测试", body = "如果你在 iOS 看到这条推送，说明配置成功", level = "active")
+    val msg = BarkMessage(deviceKey = server.deviceKey, title = "a2i 测试", body = "如果你在 iOS 看到这条推送，说明配置成功", level = "active")
    val r = BarkClient(server).push(msg)
    return if (r.isSuccess) "已发送，请查看 iOS 端" else "发送失败：${r.exceptionOrNull()?.message}"
 }
-
-private suspend fun testNtfy(server: NtfyServer): String {
-    if (server.topic.isBlank()) return "未填写 topic"
-    val r = NtfySender.send(server.server, server.topic, server.token, "GotMsg 测试", "如果你在 ntfy 看到这条推送，说明配置成功")
-    return if (r.isSuccess) "已发送，请查看 ntfy 接收端" else "发送失败：${r.exceptionOrNull()?.message}"
-}
-
-private suspend fun testMeow(server: MeowServer): String {
-    if (server.server.isBlank()) return "未填写服务器地址"
-    if (server.deviceKey.isBlank()) return "未填写 Device Key"
-    val r = MeowSender.send(server.server, server.deviceKey, "GotMsg 测试", "如果你在鸿蒙 Meow 看到这条推送，说明配置成功")
-    return if (r.isSuccess) "已发送，请查看鸿蒙 Meow" else "发送失败：${r.exceptionOrNull()?.message}"
-}
@@ -55,11 +55,7 @@ fun UpdateDialog(info: UpdateInfo, onDismiss: () -> Unit) {
                        .heightIn(max = 240.dp)
                        .verticalScroll(rememberScrollState()),
                ) {
-                    val notes = info.releaseNotes
-                        .lineSequence()
-                        .filterNot { it.contains("update-source") }
-                        .joinToString("\n")
-                        .ifBlank { "（作者未提供更新说明）" }
+                    val notes = info.releaseNotes.ifBlank { "（作者未提供更新说明）" }
                    Text(notes, style = MaterialTheme.typography.bodyMedium)
                }
                if (downloading) {
@@ -70,7 +66,7 @@ fun UpdateDialog(info: UpdateInfo, onDismiss: () -> Unit) {
                    )
                    Spacer(Modifier.size(4.dp))
                    Text(
-                        "正在下载更新…",
+                        "$progress%",
                        style = MaterialTheme.typography.bodySmall,
                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                    )
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">GotMsg 有消息</string>
+    <string name="app_name">a2i</string>
 </resources>
Author	SHA1	Message	Date
song	6b718cac8c	feat: multi-config lists for ntfy/email/sms + per-channel stopOnFirst All four forwarding channels now support multiple configurations (add/ edit/delete/reorder/enable per item, matching Bark server UX): - model: NtfyServer, EmailServer, SmsTarget data classes - SettingsStore: ntfyServers/emailServers/smsTargets as List; full CRUD (add/update/delete/move/setEnabled); legacy single-config auto-migrated to list via config_version; 4 stopOnFirst toggles (bark=true, others false) - BarkSender/NtfySender/EmailSender: pushToEnabled(configs, stopOnFirst) — stopOnFirst=true: first success stops; false: send to all - SmsFallbackForwarder: forward iterates smsTargets per stopOnFirst - UI: each channel SectionCard has toggle + stopOnFirst switch + config list + add button; ConfigRow + ConfigDialog reusable components - version 1.7.3 -> 1.8.0 (code 16 -> 17) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 21:16:23 +08:00
song	9985719f87	fix: startup always checks + dual-source (Gitea+GitHub) take highest - start(): check on every launch (no 24h throttle) so the banner shows after restart even if checked manually moments ago; plus a 24h loop while app is resident - check both Gitea and GitHub release APIs, skip whichever is unreachable, notify the higher version - version 1.7.2 -> 1.7.3 (code 15 -> 16) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 20:48:16 +08:00
song	94422fbd76	fix: ntfy use JSON publish API (raw body was treated as attachment) ntfy.sh now treats any request body (PUT/POST, text/plain) as a file attachment, so messages never showed in the app. Switch to ntfy's JSON publish API: POST / with {topic,title,message}. version 1.7.1 -> 1.7.2 (code 14 -> 15) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 20:32:26 +08:00
song	0238b5dd8d	feat: eye-catching update banner + cross-channel notify + periodic check - HomeScreen update banner: gradient background (tertiary→primary), white text, large version number, rocket emoji CTA button - UpdateChecker now auto-notifies via all enabled channels (Bark/ntfy/ email) when a new version is discovered, with version/size/notes - Periodic check every 24h via coroutine delay loop (replaces one-shot startup check only); also honors updateCheckEnabled toggle - version 1.7.0 -> 1.7.1 (code 13 -> 14) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 18:03:42 +08:00
song	81dfdcb0bd	feat: ntfy forwarding support Parallel push channel alongside Bark and email: POST {server}/{topic} with optional Bearer auth. Same fire-and-forget pattern as email. - core/NtfySender: OkHttp PUT to ntfy; retry 3x on IOException - SettingsStore: ntfyEnabled/server/topic/token (default server ntfy.sh) - NotifyListenerService + PhoneCallMonitor: NtfySender.trySend after bark - UI: "ntfy 转发" SectionCard (Bark → ntfy → Email → SMS) - version 1.6.2 -> 1.7.0 (code 12 -> 13) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 17:49:15 +08:00
song	4536c82959	chore: gitignore CLAUDE.md — local reference only CLAUDE.md is now regenerated from memory, no need to track in repo. Remove from remote tracking. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 17:16:41 +08:00
song	72f5d256ae	chore: bump to 1.6.2 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 17:04:53 +08:00
song	7eb2d71795	ui: collapse SMS fallback fields when disabled (matching email) SMS fields (number / quota / carrier / balance) are now hidden when the toggle is off. Previously entered values are preserved, just hidden. Email forwarding already had this pattern. Settings page stays compact. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 17:02:58 +08:00
song	4c55366fec	fix: SMTP default port 465 + corrupt port recovery + click feedback on save buttons - default SMTP port 587 -> 465 (SMTPS implicit TLS) - init-collector: auto-correct port < 25 to 465 (previous bug stored 3) - save-email fallback 587 -> 465 - email / SMS-number / SMS-quota save buttons show "✓ 已保存" for 2s Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 16:54:26 +08:00
song	0c6b730115	ui: reorder & rename settings sections Bark → E-mail → SMS-fallback → Icons → Update → Maintenance Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 16:34:23 +08:00
song	d9308552a0	feat: email forwarding via SMTPS Parallel to Bark: when email forwarding is enabled and a recipient is set, notifications are also sent via SMTP over SSL (port 465, SMTPS). Works standalone — no Bark server required. - core/EmailSender: SMTP over SSL (implicit TLS, port 465), AUTH LOGIN, UTF-8 subject/body via Base64/MIME; trySend() fire-and-forget helper - SettingsStore: 7 email settings (enabled, host, port, user, password, from, to) - NotifyListenerService + PhoneCallMonitor: call EmailSender.trySend in parallel with Bark forwarding; fires even if no Bark servers configured - UI: new "电邮转发" SectionCard in settings (toggle + host/port/user/ password/from/to fields + save button) - version 1.6.0 -> 1.6.1 (code 10 -> 11); CLAUDE.md synced Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 16:17:10 +08:00
song	6e09262538	ui: move server test button to top row, free address space Row 1: checkbox + name + test/edit/delete. Row 2: full URL + key + move-up/move-down only — more room for the link. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 15:16:33 +08:00
song	c908634043	ui: two-line Bark server rows for full address Row 1: checkbox + name + edit/delete. Row 2: full server URL + key status + test/move-up/move-down. Stops the address/key from being truncated and feels far less cramped. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 15:06:23 +08:00
song	795c50f329	fix: silence Milink (设备互联) UniversalClipboardService notices com.milink.service posts empty/high-frequency cross-device clipboard notices. Add to silentPackages so they're dropped silently (no forward, no log entry). CLAUDE.md synced. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 14:59:04 +08:00
song	97cc6b8b11	feat: multi-server failover forwarding + reorder/enable Bark servers now form an ordered failover chain: forwarding tries each enabled server in list order, stopping at the first success. - model: BarkServer.enabled (defaults true; legacy JSON compatible) - core/BarkSender.pushToFirst: ordered try-until-success helper, shared by NotifyListenerService / PhoneCallMonitor / RetryWorker - BarkClient.push uses msg.copy(deviceKey=server.deviceKey) so each server pushes its own key - SettingsStore: drop currentServer/setCurrent; add moveServer + setServerEnabled; NotificationProcessor no longer sources deviceKey - UI: ServerRow RadioButton -> Checkbox + per-row test/move-up/move-down; remove top "send test push" button; HomeScreen shows enabled count - version 1.5.1 -> 1.6.0 (code 9 -> 10); CLAUDE.md synced Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 14:51:48 +08:00
song	e7a7e1c2a5	chore: gitignore gitea-token.txt Token for Gitea release API; never commit. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 14:08:49 +08:00
song	4fcafeaf0d	feat: check updates from self-hosted Gitea (CN-reachable) Switch UpdateChecker source from api.github.com (flaky in CN) to the self-hosted Gitea at git.sunlunfan.com. Releases must now be published to Gitea too (github stays as mirror). parseRelease unchanged — Gitea API fields are GitHub-compatible. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 14:05:06 +08:00
song	5b54309124	revert: default icon prefix back to github raw Prefer github as default; the self-hosted Gitea (now at https://git.sunlunfan.com) stays available as a manually-entered alternative. Drops the github->gitea migration added earlier. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-09 13:05:20 +08:00
song	510adfde4d	feat: default icon prefix to self-hosted Gitea (CN-reachable) Switch DEFAULT_ICON_PREFIX from github raw (flaky in CN) to the self-hosted Gitea at 45.143.131.159:3000/song/a2i. Auto-migrate existing users whose stored prefix is the old github default; custom values kept. Icons are already mirrored to Gitea via every push. CLAUDE.md synced. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 19:59:05 +08:00
song	23d218ca4a	chore: add Gmail (com.google.android.gm) icon Extracted from the app's product_logo_gmail_2026_launcher_color_48 (xxxhdpi, 192x192). Existing icons are 192x192, size matches. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 19:50:01 +08:00
song	fe6390337f	fix: silence Mijia "设备状态" notices, keep door-lock alerts com.xiaomi.smarthome posts both generic status updates (title=米家, content=设备状态) and concrete events (e.g. 智能门锁开锁). Silence only the generic "设备状态" ones; door-lock/security alerts still forward. Filtered silently before the blacklist. CLAUDE.md synced. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 19:37:20 +08:00
song	fa2fa1dbb0	fix: silently filter VPN client persistent notifications Surfboard (and other VPN/proxy clients) post a high-frequency persistent notification showing up/down traffic. Once day.app direct-routing was configured, these got forwarded to Bark and spammed the log (300 entries). Add silentPackages (Surfboard / Clash Meta / Clash for Android / v2rayNG) to NotificationProcessor, filtered silently (no log, no forward) right after the ongoing-notification check. CLAUDE.md synced. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 19:12:41 +08:00
song	76c316783a	fix: blacklist call-status noise (telecom / AI-call) via bl v3 Incoming calls are already handled by PhoneCallMonitor (pkg=phone_call); com.android.server.telecom and com.xiaomi.aiasst.service emit redundant in-call status notices. Add them to default blacklist (bl_version 3), migrated into existing users' blacklist (add-only). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 15:59:51 +08:00
song	c2fba02048	fix: retry transient push failures + blacklist noisy apps Investigated 9 failed forwards on device: all "connection closed" to api.day.app, while ping/curl to the server succeed -> not network-blocked, but OkHttp transient connection drops that aren't retried (POST read-phase connection close is not covered by retryOnConnectionFailure). - BarkClient.push: manual retry up to 3x (600/1200ms backoff) on IOException (connection closed/timeout/TLS reset); HTTP 4xx/5xx not retried. - AppRulesStore: add recorder/gallery/find-device/password-manager to default blacklist; versioned migration (bl_version) merges the new entries into existing users' blacklist (add-only). - version 1.5.0 -> 1.5.1 (code 8 -> 9); CLAUDE.md synced. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 15:52:18 +08:00
song	bd15424c5f	docs: sync CLAUDE.md to v1.5.0 - version 1.2.0/code 3 -> 1.5.0/code 8 (was badly stale) - package table: add PhoneCallMonitor/ConnectivityMonitor/CarrierDetector/ CarrierBalanceQuery/SmsFallbackForwarder/UpdateChecker; fix A2iApp holders - core data flow: add offline SMS-fallback branch + phone/update side paths - pipeline: 12 -> 14 steps (sent-SMS filter, carrier-balance interception) - release flow: actual python+gh-token.txt process (no gh CLI) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 15:21:59 +08:00
song	610ac094ed	chore: gitignore gh-token.txt and *.token secrets Local credential file used for release uploads; must never be committed. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 14:49:39 +08:00
song	f364ae55d3	feat: in-app update check + download + install Auto-check GitHub Releases latest on launch (24h throttle), show an update banner on the home screen, download the APK in-app with progress, and trigger the system installer via FileProvider + REQUEST_INSTALL_PACKAGES. - core/UpdateChecker: fetch releases/latest, semver compare, stream APK to externalFilesDir, install via FileProvider (handles MIUI unknown-sources). - SettingsStore: updateCheckEnabled / lastUpdateCheckTime / ignoredVersion. - HomeScreen: update banner + UpdateDialog. - SettingsScreen: "关于与更新" card with auto-check toggle and manual check. - manifest: REQUEST_INSTALL_PACKAGES + FileProvider; new res/xml/file_paths.xml. - version 1.4.2 -> 1.5.0 (versionCode 7 -> 8). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 13:54:53 +08:00
song	036b4d3201	docs: 新增「自建 Bark 服务」章节（Vercel/Cloudflare/VPS 三方案） Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 12:40:00 +08:00
song	392620e0f1	feat: add icons for Telegram, Alipay, DingTalk, Mijia, AITO - org.telegram.messenger (Telegram) - com.eg.android.AlipayGphone (支付宝) - com.alibaba.android.rimet (钉钉) - com.xiaomi.smarthome (米家) - app.huawei.auto (鸿蒙智行/AITO 问界) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 12:30:20 +08:00
song	561d0460e3	feat: 清空日志弹窗选择范围（仅日志 / 日志+计数器） Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 10:33:50 +08:00
song	15e27db04a	fix: 清空日志时同步重置首页计数器 clearLogs() 同时归零 sent/filtered/failed 三个累计计数器版本 1.4.1 → 1.4.2 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 10:30:01 +08:00
song	d1afbd2425	feat: silent-filter ongoing notifications (no log entry) 持续性通知(音乐/下载/通话中等)不再写日志，静默丢弃 Decision 新增 silent 字段，NotifyListenerService 跳过静默过滤的日志版本 1.4.0 → 1.4.1 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 10:17:28 +08:00
song	c7efd8d2be	docs: README 标题改为 A2i ·安到果（按倒过） Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 09:09:48 +08:00
song	e99da175b5	feat: offline SMS fallback for important notifications 断网时把验证码、来电用短信发到 iPhone： - ConnectivityMonitor: NetworkCallback 监听在线状态 - CarrierDetector: SIM MCC+MNC 映射移动/联通/电信/广电 - CarrierBalanceQuery: 发免费查询短信拿套餐短信余量，解析回执 - SmsFallbackForwarder: 限频(5min)/余额(≤5挂起)/紧要性检查 - NotificationProcessor 拦截运营商回执(10086/10010/10001/10099) - 设置页新增短信兜底卡片，首页余额耗尽警告版本 1.3.0 → 1.4.0 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 08:54:37 +08:00
song	0bf759ae64	feat: phone call monitoring + SMS sent filter + icon prefix default - 新增 PhoneCallMonitor：通过轮询 getCallState() 感知来电/未接（绕过 MIUI 对系统电话通知的限制，需 READ_PHONE_STATE 权限） - 短信仅收不发：过滤"发送中"/"已发送"等关键词 - 图标 URL 前缀默认值：GitHub raw 图床 - 从黑名单移除 com.android.phone/com.android.incallui - 默认黑名单新增三星剪贴板/GMS 等噪音包名 - 版本 1.2.0 → 1.3.0 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-07 13:52:40 +08:00
song	3ef69bc56f	feat: add app icons for WeChat, QQ, SMS, Phone Icon prefix for a2i settings: https://raw.githubusercontent.com/lsxf/a2i/main/icons/ Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-07 09:25:51 +08:00
song	ab113e5691	docs: a2i · 安到果 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-06 21:24:05 +08:00
SJZ	bcc7ed298f	Update README.md	2026-07-06 20:41:16 +08:00