Android: Add support for setting/getting html and uris from clipboard

This also updates the used API to use ClipData and not the deprecated
ClipboardManager API.

[ChangeLog][Platform Specific Changes][Android] QClipboard now supports
HTML and URI data.

Fixes: QTBUG-47835
Fixes: QTBUG-71503
Change-Id: I43f82bfc63b3d159087c0fb6c840c186a370e20c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

4 files changed, 59 insertions, 30 deletions

diff --git a/src/plugins/platforms/android/androidjniclipboard.cpp b/src/plugins/platforms/android/androidjniclipboard.cpp
index d169035339..671d0b56d0 100644
--- a/src/plugins/platforms/android/androidjniclipboard.cpp
+++ b/src/plugins/platforms/android/androidjniclipboard.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "androidjniclipboard.h"
+#include <QtCore/QUrl>
 #include <QtCore/private/qjni_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -62,27 +63,60 @@ namespace QtAndroidClipboard
             return;
         }
     }
-
-    void setClipboardText(const QString &text)
+    void setClipboardMimeData(QMimeData *data)
     {
-        QJNIObjectPrivate::callStaticMethod<void>(applicationClass(),
-                                                  "setClipboardText",
-                                                  "(Ljava/lang/String;)V",
-                                                  QJNIObjectPrivate::fromString(text).object());
-    }
-
-    bool hasClipboardText()
-    {
-        return QJNIObjectPrivate::callStaticMethod<jboolean>(applicationClass(),
-                                                             "hasClipboardText");
+        QJNIObjectPrivate::callStaticMethod<void>(applicationClass(), "clearClipData");
+        if (data->hasText()) {
+            QJNIObjectPrivate::callStaticMethod<void>(applicationClass(),
+                                                      "setClipboardText", "(Ljava/lang/String;)V",
+                                                      QJNIObjectPrivate::fromString(data->text()).object());
+        }
+        if (data->hasHtml()) {
+            QJNIObjectPrivate::callStaticMethod<void>(applicationClass(),
+                                                      "setClipboardHtml",
+                                                      "(Ljava/lang/String;Ljava/lang/String;)V",
+                                                      QJNIObjectPrivate::fromString(data->text()).object(),
+                                                      QJNIObjectPrivate::fromString(data->html()).object());
+        }
+        if (data->hasUrls()) {
+            QList<QUrl> urls = data->urls();
+            for (const auto &u : qAsConst(urls)) {
+                QJNIObjectPrivate::callStaticMethod<void>(applicationClass(), "setClipboardUri",
+                                                          "(Ljava/lang/String;)V",
+                                                          QJNIObjectPrivate::fromString(u.toEncoded()).object());
+            }
+        }
     }
 
-    QString clipboardText()
+    QMimeData *getClipboardMimeData()
     {
-        QJNIObjectPrivate text = QJNIObjectPrivate::callStaticObjectMethod(applicationClass(),
-                                                                           "getClipboardText",
-                                                                           "()Ljava/lang/String;");
-        return text.toString();
+        QMimeData *data = new QMimeData;
+        if (QJNIObjectPrivate::callStaticMethod<jboolean>(applicationClass(), "hasClipboardText")) {
+            data->setText(QJNIObjectPrivate::callStaticObjectMethod(applicationClass(),
+                                                                    "getClipboardText",
+                                                                    "()Ljava/lang/String;").toString());
+        }
+        if (QJNIObjectPrivate::callStaticMethod<jboolean>(applicationClass(), "hasClipboardHtml")) {
+            data->setHtml(QJNIObjectPrivate::callStaticObjectMethod(applicationClass(),
+                                                                    "getClipboardHtml",
+                                                                    "()Ljava/lang/String;").toString());
+        }
+        if (QJNIObjectPrivate::callStaticMethod<jboolean>(applicationClass(), "hasClipboardUri")) {
+            QJNIObjectPrivate uris = QJNIObjectPrivate::callStaticObjectMethod(applicationClass(),
+                                                                               "getClipboardUris",
+                                                                               "()[Ljava/lang/String;");
+            if (uris.isValid()) {
+                QList<QUrl> urls;
+                QJNIEnvironmentPrivate env;
+                jobjectArray juris = static_cast<jobjectArray>(uris.object());
+                const jint nUris = env->GetArrayLength(juris);
+                urls.reserve(static_cast<int>(nUris));
+                for (int i = 0; i < nUris; ++i)
+                    urls << QUrl(QJNIObjectPrivate(env->GetObjectArrayElement(juris, i)).toString());
+                data->setUrls(urls);
+            }
+        }
+        return data;
     }
 
     void onClipboardDataChanged(JNIEnv */*env*/, jobject /*thiz*/)
diff --git a/src/plugins/platforms/android/androidjniclipboard.h b/src/plugins/platforms/android/androidjniclipboard.h
index 2ec566e729..e83e6b555c 100644
--- a/src/plugins/platforms/android/androidjniclipboard.h
+++ b/src/plugins/platforms/android/androidjniclipboard.h
@@ -51,9 +51,8 @@ namespace QtAndroidClipboard
 {
     // Clipboard support
     void setClipboardManager(QAndroidPlatformClipboard *manager);
-    void setClipboardText(const QString &text);
-    bool hasClipboardText();
-    QString clipboardText();
+    void setClipboardMimeData(QMimeData *data);
+    QMimeData *getClipboardMimeData();
     void onClipboardDataChanged(JNIEnv */*env*/, jobject /*thiz*/);
     // Clipboard support
 }
diff --git a/src/plugins/platforms/android/qandroidplatformclipboard.cpp b/src/plugins/platforms/android/qandroidplatformclipboard.cpp
index dc5147b259..17dfe27d12 100644
--- a/src/plugins/platforms/android/qandroidplatformclipboard.cpp
+++ b/src/plugins/platforms/android/qandroidplatformclipboard.cpp
@@ -52,16 +52,15 @@ QMimeData *QAndroidPlatformClipboard::mimeData(QClipboard::Mode mode)
 {
     Q_UNUSED(mode);
     Q_ASSERT(supportsMode(mode));
-    m_mimeData.setText(QtAndroidClipboard::hasClipboardText()
-                       ? QtAndroidClipboard::clipboardText()
-                       : QString());
-    return &m_mimeData;
+    QMimeData *data = QtAndroidClipboard::getClipboardMimeData();
+    data->setParent(this);
+    return data;
 }
 
 void QAndroidPlatformClipboard::setMimeData(QMimeData *data, QClipboard::Mode mode)
 {
-    if (supportsMode(mode))
-        QtAndroidClipboard::setClipboardText(data != 0 && data->hasText() ? data->text() : QString());
+    if (data && supportsMode(mode))
+        QtAndroidClipboard::setClipboardMimeData(data);
     if (data != 0)
         data->deleteLater();
 }
diff --git a/src/plugins/platforms/android/qandroidplatformclipboard.h b/src/plugins/platforms/android/qandroidplatformclipboard.h
index dfc3629c10..3ed9d323f8 100644
--- a/src/plugins/platforms/android/qandroidplatformclipboard.h
+++ b/src/plugins/platforms/android/qandroidplatformclipboard.h
@@ -46,7 +46,7 @@
 #ifndef QT_NO_CLIPBOARD
 QT_BEGIN_NAMESPACE
 
-class QAndroidPlatformClipboard: public QPlatformClipboard
+class QAndroidPlatformClipboard : public QObject, public QPlatformClipboard
 {
 public:
     QAndroidPlatformClipboard();
@@ -54,9 +54,6 @@ public:
     QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override;
     void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) override;
     bool supportsMode(QClipboard::Mode mode) const override;
-
-private:
-    QMimeData m_mimeData;
 };
 
 QT_END_NAMESPACE