From acb85472a51a2fbfbed09f366f3bafbfc3f3c043 Mon Sep 17 00:00:00 2001 From: Christian Beier Date: Sun, 26 Jan 2025 22:11:59 +0100 Subject: [PATCH] Android: VncCanvasActivity: fix cuttext sending mClipboardManager.hasText() would return false on non-antique Android versions. onWindowFocusChange() is the right place, see https://developer.android.com/reference/android/content/ClipboardManager#hasPrimaryClip() re #252 --- .../multivnc/ui/VncCanvasActivity.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/android/app/src/main/java/com/coboltforge/dontmind/multivnc/ui/VncCanvasActivity.java b/android/app/src/main/java/com/coboltforge/dontmind/multivnc/ui/VncCanvasActivity.java index bdd05aec..7eae87ef 100644 --- a/android/app/src/main/java/com/coboltforge/dontmind/multivnc/ui/VncCanvasActivity.java +++ b/android/app/src/main/java/com/coboltforge/dontmind/multivnc/ui/VncCanvasActivity.java @@ -487,17 +487,6 @@ protected void onResume() { super.onResume(); // needed for the GLSurfaceView vncCanvas.onResume(); - - // get Android clipboard contents - if (mClipboardManager.hasText()) { - try { - vncCanvas.vncConn.sendCutText(mClipboardManager.getText().toString()); - } - catch(NullPointerException e) { - //unused - } - } - } /** @@ -840,6 +829,16 @@ public void onWindowFocusChanged(boolean hasFocus) { super.onWindowFocusChanged(hasFocus); if (hasFocus) { hideSystemUI(); + + // get Android clipboard contents + if (mClipboardManager.hasText()) { + try { + vncCanvas.vncConn.sendCutText(mClipboardManager.getText().toString()); + } + catch(NullPointerException e) { + //unused + } + } } }