diff options
Diffstat (limited to 'src/corelib/kernel/qjnihelpers_p.h')
-rw-r--r-- | src/corelib/kernel/qjnihelpers_p.h | 99 |
1 files changed, 14 insertions, 85 deletions
diff --git a/src/corelib/kernel/qjnihelpers_p.h b/src/corelib/kernel/qjnihelpers_p.h index f858240602..b5e05fcaf1 100644 --- a/src/corelib/kernel/qjnihelpers_p.h +++ b/src/corelib/kernel/qjnihelpers_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QJNIHELPERS_H #define QJNIHELPERS_H @@ -54,12 +18,12 @@ #include <jni.h> #include <functional> #include <QtCore/private/qglobal_p.h> -#include <QHash> -#include <QMetaType> +#include <QtCore/qcoreapplication_platform.h> QT_BEGIN_NAMESPACE -class QRunnable; +Q_DECLARE_JNI_CLASS(Activity, "android/app/Activity") +Q_DECLARE_JNI_CLASS(Service, "android/app/Service") namespace QtAndroidPrivate { @@ -85,20 +49,6 @@ namespace QtAndroidPrivate virtual void handleResume(); }; - class Q_CORE_EXPORT GenericMotionEventListener - { - public: - virtual ~GenericMotionEventListener(); - virtual bool handleGenericMotionEvent(jobject event) = 0; - }; - - class Q_CORE_EXPORT KeyEventListener - { - public: - virtual ~KeyEventListener(); - virtual bool handleKeyEvent(jobject event) = 0; - }; - class Q_CORE_EXPORT OnBindListener { public: @@ -106,31 +56,18 @@ namespace QtAndroidPrivate virtual jobject onBind(jobject intent) = 0; }; - enum class PermissionsResult { - Granted, - Denied - }; - typedef QHash<QString, QtAndroidPrivate::PermissionsResult> PermissionsHash; - typedef std::function<void()> Runnable; - typedef std::function<void(const PermissionsHash &)> PermissionsResultFunc; - - Q_CORE_EXPORT jobject activity(); - Q_CORE_EXPORT jobject service(); - Q_CORE_EXPORT jobject context(); + Q_CORE_EXPORT QtJniTypes::Activity activity(); + Q_CORE_EXPORT QtJniTypes::Service service(); + Q_CORE_EXPORT QtJniTypes::Context context(); Q_CORE_EXPORT JavaVM *javaVM(); Q_CORE_EXPORT jint initJNI(JavaVM *vm, JNIEnv *env); Q_CORE_EXPORT jclass findClass(const char *className, JNIEnv *env); jobject classLoader(); Q_CORE_EXPORT jint androidSdkVersion(); - Q_CORE_EXPORT void runOnAndroidThread(const Runnable &runnable, JNIEnv *env); - Q_CORE_EXPORT void runOnAndroidThreadSync(const Runnable &runnable, JNIEnv *env, int timeoutMs = INT_MAX); - Q_CORE_EXPORT void requestPermissions(JNIEnv *env, const QStringList &permissions, const PermissionsResultFunc &callbackFunc, bool directCall = false); - Q_CORE_EXPORT PermissionsHash requestPermissionsSync(JNIEnv *env, const QStringList &permissions, int timeoutMs = INT_MAX); - Q_CORE_EXPORT PermissionsResult checkPermission(const QString &permission); - Q_CORE_EXPORT bool shouldShowRequestPermissionRationale(const QString &permission); - bool registerPermissionNatives(); - bool registerNativeInterfaceNatives(); + bool registerPermissionNatives(QJniEnvironment &env); + bool registerNativeInterfaceNatives(QJniEnvironment &env); + bool registerExtrasNatives(QJniEnvironment &env); Q_CORE_EXPORT void handleActivityResult(jint requestCode, jint resultCode, jobject data); Q_CORE_EXPORT void registerActivityResultListener(ActivityResultListener *listener); @@ -145,19 +82,13 @@ namespace QtAndroidPrivate Q_CORE_EXPORT void registerResumePauseListener(ResumePauseListener *listener); Q_CORE_EXPORT void unregisterResumePauseListener(ResumePauseListener *listener); - Q_CORE_EXPORT void registerGenericMotionEventListener(GenericMotionEventListener *listener); - Q_CORE_EXPORT void unregisterGenericMotionEventListener(GenericMotionEventListener *listener); - - Q_CORE_EXPORT void registerKeyEventListener(KeyEventListener *listener); - Q_CORE_EXPORT void unregisterKeyEventListener(KeyEventListener *listener); - - // TODO: Remove once other modules refectoring is done and androidextras is not needed. - Q_CORE_EXPORT void hideSplashScreen(JNIEnv *env, int duration = 0); - Q_CORE_EXPORT void waitForServiceSetup(); Q_CORE_EXPORT int acuqireServiceSetup(int flags); Q_CORE_EXPORT void setOnBindListener(OnBindListener *listener); Q_CORE_EXPORT jobject callOnBindListener(jobject intent); + + Q_CORE_EXPORT bool acquireAndroidDeadlockProtector(); + Q_CORE_EXPORT void releaseAndroidDeadlockProtector(); } #define Q_JNI_FIND_AND_CHECK_CLASS(CLASS_NAME) \ @@ -201,6 +132,4 @@ namespace QtAndroidPrivate QT_END_NAMESPACE -Q_DECLARE_METATYPE(QtAndroidPrivate::PermissionsHash) - #endif // QJNIHELPERS_H |