fix: Android, try sync clipboard on connecting (#10218)

* fix: Android, try sync clipboard on connecting Signed-off-by: fufesou <linlong1266@gmail.com> * Android, clipboard, more clear skip check Signed-off-by: fufesou <linlong1266@gmail.com> * comments Signed-off-by: fufesou <linlong1266@gmail.com> * comment todo: Android clipboard listener, callback twice Signed-off-by: fufesou <linlong1266@gmail.com> * Android, clipboard, remove listner Signed-off-by: fufesou <linlong1266@gmail.com> --------- Signed-off-by: fufesou <linlong1266@gmail.com>
2026-03-07 12:20:03 +03:00 · 2024-12-07 15:12:15 +08:00
parent 8f44787ba3
commit 3c838e7a92
12 changed files with 41 additions and 118 deletions
--- a/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/FloatingWindowService.kt
+++ b/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/FloatingWindowService.kt
@@ -306,7 +306,7 @@ class FloatingWindowService : Service(), View.OnTouchListener {
         popupMenu.menu.add(0, idShowRustDesk, 0, translate("Show RustDesk"))
         // For host side, clipboard sync
         val idSyncClipboard = 1
-         val isClipboardListenerEnabled = MainActivity.rdClipboardManager?.isListening ?: false
+         val isClipboardListenerEnabled = MainActivity.rdClipboardManager?.isCaptureStarted ?: false
         if (isClipboardListenerEnabled) {
             popupMenu.menu.add(0, idSyncClipboard, 0, translate("Update client clipboard"))
         }
--- a/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/MainActivity.kt
+++ b/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/MainActivity.kt
@@ -103,7 +103,6 @@ class MainActivity : FlutterActivity() {
        mainService?.let {
            unbindService(serviceConnection)
        }
-        rdClipboardManager?.rustEnableServiceClipboard(false)
        super.onDestroy()
    }

@@ -221,6 +220,10 @@ class MainActivity : FlutterActivity() {
                    result.success(true)

                }
+                "try_sync_clipboard" -> {
+                    rdClipboardManager?.syncClipboard(true)
+                    result.success(true)
+                }
                GET_START_ON_BOOT_OPT -> {
                    val prefs = getSharedPreferences(KEY_SHARED_PREFERENCES, MODE_PRIVATE)
                    result.success(prefs.getBoolean(KEY_START_ON_BOOT_OPT, false))
@@ -402,13 +405,4 @@ class MainActivity : FlutterActivity() {
        super.onStart()
        stopService(Intent(this, FloatingWindowService::class.java))
    }
-
-    // For client side
-    // When swithing from other app to this app, try to sync clipboard.
-    override fun onWindowFocusChanged(hasFocus: Boolean) {
-        super.onWindowFocusChanged(hasFocus)
-        if (hasFocus) {
-            rdClipboardManager?.syncClipboard(true)
-        }
-    }
 }
--- a/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/MainService.kt
+++ b/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/MainService.kt
@@ -433,6 +433,7 @@ class MainService : Service() {
        checkMediaPermission()
        _isStart = true
        FFI.setFrameRawEnable("video",true)
+        MainActivity.rdClipboardManager?.setCaptureStarted(_isStart)
        return true
    }

@@ -441,6 +442,7 @@ class MainService : Service() {
        Log.d(logTag, "Stop Capture")
        FFI.setFrameRawEnable("video",false)
        _isStart = false
+        MainActivity.rdClipboardManager?.setCaptureStarted(_isStart)
        // release video
        if (reuseVirtualDisplay) {
            // The virtual display video projection can be paused by calling `setSurface(null)`.
--- a/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/RdClipboardManager.kt
+++ b/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/RdClipboardManager.kt
@@ -36,19 +36,19 @@ class RdClipboardManager(private val clipboardManager: ClipboardManager) {
    // though the `lastUpdatedClipData` will be set to null once.
    private var lastUpdatedClipData: ClipData? = null
    private var isClientEnabled = true;
-    private var _isListening = false;
-    val isListening: Boolean
-        get() = _isListening
+    private var _isCaptureStarted = false;

-    fun checkPrimaryClip(isClient: Boolean, isSync: Boolean) {
+    val isCaptureStarted: Boolean
+        get() = _isCaptureStarted
+
+    fun checkPrimaryClip(isClient: Boolean) {
        val clipData = clipboardManager.primaryClip
        if (clipData != null && clipData.itemCount > 0) {
            // Only handle the first item in the clipboard for now.
            val clip = clipData.getItemAt(0)
-            val isHostSync = !isClient && isSync
-            // Ignore the `isClipboardDataEqual()` check if it's a host sync operation.
-            // Because it's a action manually triggered by the user.
-            if (!isHostSync) {
+            // Ignore the `isClipboardDataEqual()` check if it's a host operation.
+            // Because it's an action manually triggered by the user.
+            if (isClient) {
                if (lastUpdatedClipData != null && isClipboardDataEqual(clipData, lastUpdatedClipData!!)) {
                    Log.d(logTag, "Clipboard data is the same as last update, ignore")
                    return
@@ -95,13 +95,6 @@ class RdClipboardManager(private val clipboardManager: ClipboardManager) {
        }
    }

-    private val clipboardListener = object : ClipboardManager.OnPrimaryClipChangedListener {
-        override fun onPrimaryClipChanged() {
-            Log.d(logTag, "onPrimaryClipChanged")
-            checkPrimaryClip(true, false)
-        }
-    }
-
    private fun isSupportedMimeType(mimeType: String): Boolean {
        return supportedMimeTypes.contains(mimeType)
    }
@@ -136,43 +129,23 @@ class RdClipboardManager(private val clipboardManager: ClipboardManager) {
        return true
    }

-    @Keep
-    fun rustEnableServiceClipboard(enable: Boolean) {
-        Log.d(logTag, "rustEnableServiceClipboard: enable: $enable, _isListening: $_isListening")
-        if (enable) {
-            if (!_isListening) {
-                clipboardManager.addPrimaryClipChangedListener(clipboardListener)
-                _isListening = true
-            }
-        } else {
-            if (_isListening) {
-                clipboardManager.removePrimaryClipChangedListener(clipboardListener)
-                _isListening = false
-                lastUpdatedClipData = null
-            }
-        }
+    fun setCaptureStarted(started: Boolean) {
+        _isCaptureStarted = started
    }

    @Keep
    fun rustEnableClientClipboard(enable: Boolean) {
        Log.d(logTag, "rustEnableClientClipboard: enable: $enable")
        isClientEnabled = enable
-        if (enable) {
-            lastUpdatedClipData = clipboardManager.primaryClip
-        } else {
-            lastUpdatedClipData = null
-        }
+        lastUpdatedClipData = null
    }

    fun syncClipboard(isClient: Boolean) {
-        Log.d(logTag, "syncClipboard: isClient: $isClient, isClientEnabled: $isClientEnabled, _isListening: $_isListening")
+        Log.d(logTag, "syncClipboard: isClient: $isClient, isClientEnabled: $isClientEnabled")
        if (isClient && !isClientEnabled) {
            return
        }
-        if (!isClient && !_isListening) {
-            return
-        }
-        checkPrimaryClip(isClient, true)
+        checkPrimaryClip(isClient)
    }

    @Keep