diff options
author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-05-11 12:49:40 +0300 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-06-29 14:08:24 +0300 |
commit | ae24e41ad4da78b029fd42ea317e4d2be73b015e (patch) | |
tree | 3f2d8c44dbf5a3eb666a7782bb5c1dfd62481c8e /src/androidextras/android/qandroidfunctions.h | |
parent | ede82024b08842e9599b9bdbd00b7498601a921f (diff) |
The JNI utilities (i.e. QJniObject, QJniEnvironment) are already under
qtbase as public APIs.
Permission handling is now under QCoreApplication::{check,request}Permission
and QPermission namespace.
Some of the QtAndroid namespace functions are now under QNativeInterface's
QAndroidApplication, this includes:
* sdkVersion()
* hideSplashScreen()
* context() and isActivityContext()
* runOnAndroidMainThread()
The remaining APIs are now moved as private APIs under qtbase
ee05af296f65e240f64db6470cdddafbddbf2fa3. That is until we add
new cross-platform APIs to replace their functionalities like
Intents handling, starting activites and working with Services.
Task-number: QTBUG-83251
Task-number: QTBUG-84382
Pick-to: 6.2
Change-Id: Id077f8cbbe223a987916f737fad6088fb58e470d
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Diffstat (limited to 'src/androidextras/android/qandroidfunctions.h')
-rw-r--r-- | src/androidextras/android/qandroidfunctions.h | 118 |
1 files changed, 0 insertions, 118 deletions
diff --git a/src/androidextras/android/qandroidfunctions.h b/src/androidextras/android/qandroidfunctions.h deleted file mode 100644 index 0433d21..0000000 --- a/src/androidextras/android/qandroidfunctions.h +++ /dev/null @@ -1,118 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part 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$ -** -****************************************************************************/ - -#ifndef QANDROIDFUNCTIONS_H -#define QANDROIDFUNCTIONS_H - -#if 0 -#pragma qt_class(QtAndroid) -#endif - -#include <QtAndroidExtras/qandroidextrasglobal.h> -#include <QtAndroidExtras/qandroidjniobject.h> - -#include <functional> - -QT_BEGIN_NAMESPACE - -class QAndroidActivityResultReceiver; -class QAndroidServiceConnection; -class QAndroidIntent; - -namespace QtAndroid -{ - Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject androidActivity(); - Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject androidService(); - Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject androidContext(); - Q_ANDROIDEXTRAS_EXPORT int androidSdkVersion(); - - Q_ANDROIDEXTRAS_EXPORT void startIntentSender(const QAndroidJniObject &intentSender, - int receiverRequestCode, - QAndroidActivityResultReceiver *resultReceiver = nullptr); - Q_ANDROIDEXTRAS_EXPORT void startActivity(const QAndroidJniObject &intent, - int receiverRequestCode, - QAndroidActivityResultReceiver *resultReceiver = nullptr); - Q_ANDROIDEXTRAS_EXPORT void startActivity(const QAndroidIntent &intent, - int receiverRequestCode, - QAndroidActivityResultReceiver *resultReceiver = nullptr); - Q_ANDROIDEXTRAS_EXPORT void startActivity(const QAndroidJniObject &intent, - int receiverRequestCode, - std::function<void(int, int, const QAndroidJniObject &data)> callbackFunc); - - enum class BindFlag { - None = 0x00000000, - AutoCreate = 0x00000001, - DebugUnbind = 0x00000002, - NotForeground = 0x00000004, - AboveClient = 0x00000008, - AllowOomManagement = 0x00000010, - WaivePriority = 0x00000020, - Important = 0x00000040, - AdjustWithActivity = 0x00000080, - ExternalService = -2147483648 // 0x80000000 - - }; - Q_DECLARE_FLAGS(BindFlags, BindFlag) - - Q_ANDROIDEXTRAS_EXPORT bool bindService(const QAndroidIntent &serviceIntent, - const QAndroidServiceConnection &serviceConnection, - BindFlags flags = BindFlag::None); - - typedef std::function<void()> Runnable; - Q_ANDROIDEXTRAS_EXPORT void runOnAndroidThread(const Runnable &runnable); - Q_ANDROIDEXTRAS_EXPORT void runOnAndroidThreadSync(const Runnable &runnable, int timeoutMs = INT_MAX); - - Q_ANDROIDEXTRAS_EXPORT void hideSplashScreen(); // ### Qt6: merge with next overload - Q_ANDROIDEXTRAS_EXPORT void hideSplashScreen(int duration); - - enum class PermissionResult { - Denied = -1, - Granted = 0 - }; - typedef QHash<QString, PermissionResult> PermissionResultMap; - typedef std::function<void(const PermissionResultMap &)> PermissionResultCallback; - Q_ANDROIDEXTRAS_EXPORT void requestPermissions(const QStringList &permissions, const PermissionResultCallback &callbackFunc); - Q_ANDROIDEXTRAS_EXPORT PermissionResultMap requestPermissionsSync(const QStringList &permissions, int timeoutMs = INT_MAX); - Q_ANDROIDEXTRAS_EXPORT PermissionResult checkPermission(const QString &permission); - Q_ANDROIDEXTRAS_EXPORT bool shouldShowRequestPermissionRationale(const QString &permission); -} - -QT_END_NAMESPACE - -#endif // QANDROIDFUNCTIONS_H |