Android: Move clipboard management to own class

Move all clipboard management logic outside of QtNative and
to own QtClipboardManager class. Also, don't keep any keep
Activity objects under it to avoid memory leaks, the native
c++ clipboard manager should be responsible of passing a
context when needed instead.

As a pass-by, use newer JNI APIs for C++ QtAndroidClipboard
code.

Task-number: QTBUG-118077
Change-Id: I61726e84a75918d80329f753e9e1c6ebde179bf4
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>

1 files changed, 0 insertions, 96 deletions

diff --git a/src/plugins/platforms/android/androidjniclipboard.cpp b/src/plugins/platforms/android/androidjniclipboard.cpp
deleted file mode 100644
index d510f43049..0000000000
--- a/src/plugins/platforms/android/androidjniclipboard.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (C) 2012 BogDan Vatra <bogdan@kde.org>
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-#include "androidjniclipboard.h"
-#include <QtCore/QUrl>
-#include <QtCore/QJniObject>
-#include <QtCore/QJniEnvironment>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QtAndroid;
-namespace QtAndroidClipboard
-{
-    QAndroidPlatformClipboard *m_manager = nullptr;
-
-    static JNINativeMethod methods[] = {
-        {"onClipboardDataChanged", "()V", (void *)onClipboardDataChanged}
-    };
-
-    void setClipboardManager(QAndroidPlatformClipboard *manager)
-    {
-        m_manager = manager;
-        QJniObject::callStaticMethod<void>(applicationClass(), "registerClipboardManager");
-        jclass appClass = QtAndroid::applicationClass();
-        QJniEnvironment env;
-        if (env->RegisterNatives(appClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) {
-            __android_log_print(ANDROID_LOG_FATAL,"Qt", "RegisterNatives failed");
-            return;
-        }
-    }
-    void clearClipboardData()
-    {
-        QJniObject::callStaticMethod<void>(applicationClass(), "clearClipData");
-    }
-    void setClipboardMimeData(QMimeData *data)
-    {
-        clearClipboardData();
-        if (data->hasUrls()) {
-            QList<QUrl> urls = data->urls();
-            for (const auto &u : std::as_const(urls)) {
-                QJniObject::callStaticMethod<void>(applicationClass(),
-                                                   "setClipboardUri",
-                                                   "(Ljava/lang/String;)V",
-                                                   QJniObject::fromString(u.toEncoded()).object());
-            }
-        } else if (data->hasHtml()) { // html can contain text
-            QJniObject::callStaticMethod<void>(applicationClass(),
-                                               "setClipboardHtml",
-                                               "(Ljava/lang/String;Ljava/lang/String;)V",
-                                               QJniObject::fromString(data->text()).object(),
-                                               QJniObject::fromString(data->html()).object());
-        } else if (data->hasText()) { // hasText must be the last (the order matter here)
-            QJniObject::callStaticMethod<void>(applicationClass(),
-                                               "setClipboardText", "(Ljava/lang/String;)V",
-                                               QJniObject::fromString(data->text()).object());
-        }
-    }
-
-    QMimeData *getClipboardMimeData()
-    {
-        QMimeData *data = new QMimeData;
-        if (QJniObject::callStaticMethod<jboolean>(applicationClass(), "hasClipboardText")) {
-            data->setText(QJniObject::callStaticObjectMethod(applicationClass(),
-                                                             "getClipboardText",
-                                                             "()Ljava/lang/String;").toString());
-        }
-        if (QJniObject::callStaticMethod<jboolean>(applicationClass(), "hasClipboardHtml")) {
-            data->setHtml(QJniObject::callStaticObjectMethod(applicationClass(),
-                                                             "getClipboardHtml",
-                                                             "()Ljava/lang/String;").toString());
-        }
-        if (QJniObject::callStaticMethod<jboolean>(applicationClass(), "hasClipboardUri")) {
-            QJniObject uris = QJniObject::callStaticObjectMethod(applicationClass(),
-                                                                 "getClipboardUris",
-                                                                 "()[Ljava/lang/String;");
-            if (uris.isValid()) {
-                QList<QUrl> urls;
-                QJniEnvironment env;
-                jobjectArray juris = uris.object<jobjectArray>();
-                const jint nUris = env->GetArrayLength(juris);
-                urls.reserve(static_cast<int>(nUris));
-                for (int i = 0; i < nUris; ++i)
-                    urls << QUrl(QJniObject(env->GetObjectArrayElement(juris, i)).toString());
-                data->setUrls(urls);
-            }
-        }
-        return data;
-    }
-
-    void onClipboardDataChanged(JNIEnv */*env*/, jobject /*thiz*/)
-    {
-        m_manager->emitChanged(QClipboard::Clipboard);
-    }
-}
-
-QT_END_NAMESPACE