From a17b1ecec0d4378e174e224989956ac3595533ed Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 4 Aug 2023 11:24:49 +0200 Subject: [PATCH] [client,android] use 'text/plain' to access clipboard --- .../Android/Studio/freeRDPCore/src/main/cpp/android_cliprdr.c | 2 +- client/Android/Studio/freeRDPCore/src/main/cpp/android_event.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/Android/Studio/freeRDPCore/src/main/cpp/android_cliprdr.c b/client/Android/Studio/freeRDPCore/src/main/cpp/android_cliprdr.c index 62bb1e1de..abef37bae 100644 --- a/client/Android/Studio/freeRDPCore/src/main/cpp/android_cliprdr.c +++ b/client/Android/Studio/freeRDPCore/src/main/cpp/android_cliprdr.c @@ -422,7 +422,7 @@ android_cliprdr_server_format_data_response(CliprdrClientContext* cliprdr, JNIEnv* env; jstring jdata; jboolean attached; - formatId = ClipboardRegisterFormat(afc->clipboard, "UTF8_STRING"); + formatId = ClipboardRegisterFormat(afc->clipboard, "text/plain"); data = (void*)ClipboardGetData(afc->clipboard, formatId, &size); attached = jni_attach_thread(&env); size = strnlen(data, size); diff --git a/client/Android/Studio/freeRDPCore/src/main/cpp/android_event.c b/client/Android/Studio/freeRDPCore/src/main/cpp/android_event.c index 1004e197d..c72622981 100644 --- a/client/Android/Studio/freeRDPCore/src/main/cpp/android_event.c +++ b/client/Android/Studio/freeRDPCore/src/main/cpp/android_event.c @@ -124,7 +124,7 @@ static BOOL android_process_event(ANDROID_EVENT_QUEUE* queue, freerdp* inst) case EVENT_TYPE_CLIPBOARD: { ANDROID_EVENT_CLIPBOARD* clipboard_event = (ANDROID_EVENT_CLIPBOARD*)event; - UINT32 formatId = ClipboardRegisterFormat(afc->clipboard, "UTF8_STRING"); + UINT32 formatId = ClipboardRegisterFormat(afc->clipboard, "text/plain"); UINT32 size = clipboard_event->data_length; if (size)