From 1286a635079ff2b4207d886c176610309b0fb709 Mon Sep 17 00:00:00 2001
From: Misaka <pengqiangqiang@gmail.com>
Date: Sun, 17 May 2026 14:21:09 +0800
Subject: [PATCH] Detect desktop disconnects on Android

---
 .../ConnectionService.kt                      | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/kotlin/com/wirelesstextsyncer/wireless_text_syncer_android/ConnectionService.kt b/android/app/src/main/kotlin/com/wirelesstextsyncer/wireless_text_syncer_android/ConnectionService.kt
index f1f7dcb..78fd083 100644
--- a/android/app/src/main/kotlin/com/wirelesstextsyncer/wireless_text_syncer_android/ConnectionService.kt
+++ b/android/app/src/main/kotlin/com/wirelesstextsyncer/wireless_text_syncer_android/ConnectionService.kt
@@ -18,10 +18,13 @@ import okhttp3.Response
 import okhttp3.WebSocket
 import okhttp3.WebSocketListener
 import org.json.JSONObject
+import java.util.concurrent.TimeUnit
 
 class ConnectionService : Service() {
     private val tag = "WTS"
-    private val client = OkHttpClient()
+    private val client = OkHttpClient.Builder()
+        .pingInterval(5, TimeUnit.SECONDS)
+        .build()
 
     override fun onBind(intent: Intent?): IBinder? = null
 
@@ -103,6 +106,7 @@ class ConnectionService : Service() {
                     Log.d(tag, "Ignoring stale WebSocket onClosed")
                     return
                 }
+                currentSocket = null
                 updateState(connected = false, connecting = false, host = host, port = port, lastError = null)
                 Handler(Looper.getMainLooper()).post {
                     stopForeground(STOP_FOREGROUND_REMOVE)
@@ -115,12 +119,18 @@ class ConnectionService : Service() {
                     Log.d(tag, "Ignoring stale WebSocket onFailure")
                     return
                 }
+                currentSocket = null
+                val errorMessage = if (state.connected) {
+                    "桌面端服务已断开"
+                } else {
+                    t.message ?: "连接失败"
+                }
                 updateState(
                     connected = false,
                     connecting = false,
                     host = host,
                     port = port,
-                    lastError = t.message ?: "连接失败"
+                    lastError = errorMessage
                 )
                 Handler(Looper.getMainLooper()).post {
                     stopForeground(STOP_FOREGROUND_REMOVE)
@@ -243,7 +253,17 @@ class ConnectionService : Service() {
                     }
                 }
                 .toString()
-            return socket.send(payload)
+            val sent = socket.send(payload)
+            if (!sent && currentSocket == socket) {
+                currentSocket = null
+                updateState(
+                    connected = false,
+                    connecting = false,
+                    lastError = "连接已断开"
+                )
+            }
+
+            return sent
         }
 
         fun stateMap(): Map<String, Any?> {