From ae24e41ad4da78b029fd42ea317e4d2be73b015e Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 11 May 2021 12:49:40 +0300 Subject: Remove QtAndroidExtras module and add note about its state in Qt 6 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 --- src/androidextras/android/qandroidparcel.cpp | 245 --------------------------- 1 file changed, 245 deletions(-) delete mode 100644 src/androidextras/android/qandroidparcel.cpp (limited to 'src/androidextras/android/qandroidparcel.cpp') diff --git a/src/androidextras/android/qandroidparcel.cpp b/src/androidextras/android/qandroidparcel.cpp deleted file mode 100644 index 6923f87..0000000 --- a/src/androidextras/android/qandroidparcel.cpp +++ /dev/null @@ -1,245 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 BogDan Vatra -** 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$ -** -****************************************************************************/ - -#include "qandroidparcel.h" - -#include "qandroidbinder.h" -#include "qandroidbinder_p.h" -#include "qandroidparcel_p.h" - -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -struct FileDescriptor -{ - explicit FileDescriptor(int fd = -1) - : handle("java/io/FileDescriptor") - { - QAndroidJniExceptionCleaner cleaner; - setFileDescriptor(fd); - } - - inline void setFileDescriptor(int fd) - { - QAndroidJniExceptionCleaner cleaner; - handle.setField("descriptor", fd); - } - - QAndroidJniObject handle; -}; - -QAndroidParcelPrivate::QAndroidParcelPrivate() - : handle(QAndroidJniObject::callStaticObjectMethod("android/os/Parcel","obtain", "()Landroid/os/Parcel;").object()) -{} - -QAndroidParcelPrivate::QAndroidParcelPrivate(const QAndroidJniObject &parcel) - : handle(parcel) -{} - -void QAndroidParcelPrivate::writeData(const QByteArray &data) const -{ - if (data.isEmpty()) - return; - - QAndroidJniExceptionCleaner cleaner; - QAndroidJniEnvironment env; - jbyteArray array = env->NewByteArray(data.size()); - env->SetByteArrayRegion(array, 0, data.length(), reinterpret_cast(data.constData())); - handle.callMethod("writeByteArray", "([B)V", array); - env->DeleteLocalRef(array); -} - -void QAndroidParcelPrivate::writeBinder(const QAndroidBinder &binder) const -{ - QAndroidJniExceptionCleaner cleaner; - handle.callMethod("writeStrongBinder", "(Landroid/os/IBinder;)V", binder.handle().object()); -} - -void QAndroidParcelPrivate::writeFileDescriptor(int fd) const -{ - QAndroidJniExceptionCleaner cleaner; - handle.callMethod("writeFileDescriptor", "(Ljava/io/FileDescriptor;)V", FileDescriptor(fd).handle.object()); -} - -QByteArray QAndroidParcelPrivate::readData() const -{ - QAndroidJniExceptionCleaner cleaner; - auto array = handle.callObjectMethod("createByteArray", "()[B"); - QAndroidJniEnvironment env; - auto sz = env->GetArrayLength(jbyteArray(array.object())); - QByteArray res(sz, Qt::Initialization::Uninitialized); - env->GetByteArrayRegion(jbyteArray(array.object()), 0, sz, reinterpret_cast(res.data())); - return res; -} - -int QAndroidParcelPrivate::readFileDescriptor() const -{ - QAndroidJniExceptionCleaner cleaner; - auto parcelFD = handle.callObjectMethod("readFileDescriptor", "()Landroid/os/ParcelFileDescriptor;"); - if (parcelFD.isValid()) - return parcelFD.callMethod("getFd", "()I"); - return -1; -} - -QAndroidBinder QAndroidParcelPrivate::readBinder() const -{ - QAndroidJniExceptionCleaner cleaner; - auto strongBinder = handle.callObjectMethod("readStrongBinder", "()Landroid/os/IBinder;"); - return QAndroidBinder(strongBinder.object()); -} - -/*! - \class QAndroidParcel - \inmodule QtAndroidExtras - \brief Wraps the most important methods of Android Parcel class. - - The QAndroidParcel is a convenience class that wraps the most important - \l {https://developer.android.com/reference/android/os/Parcel.html}{Android Parcel} - methods. - - \since 5.10 -*/ - -/*! - Creates a new object. - */ -QAndroidParcel::QAndroidParcel() - : d(new QAndroidParcelPrivate()) -{ -} - -/*! - Wraps the \a parcel object. - */ -QAndroidParcel::QAndroidParcel(const QAndroidJniObject& parcel) - : d(new QAndroidParcelPrivate(parcel)) -{ - -} - -QAndroidParcel::~QAndroidParcel() -{ -} - -/*! - Writes the provided \a data as a byte array - */ -void QAndroidParcel::writeData(const QByteArray &data) const -{ - d->writeData(data); -} - -/*! - Writes the provided \a value. The value is converted into a - QByteArray before is written. - */ -void QAndroidParcel::writeVariant(const QVariant &value) const -{ - QByteArray buff; - QDataStream stream(&buff, QIODevice::WriteOnly); - stream << value; - d->writeData(buff); -} - -/*! - Writes a \a binder object. This is useful for a client to - send to a server a binder which can be used by the server callback the client. - */ -void QAndroidParcel::writeBinder(const QAndroidBinder &binder) const -{ - d->writeBinder(binder); -} - -/*! - Writes the provided \a fd. - */ -void QAndroidParcel::writeFileDescriptor(int fd) const -{ - d->writeFileDescriptor(fd); -} - -/*! - Returns the data as a QByteArray - */ -QByteArray QAndroidParcel::readData() const -{ - return d->readData(); -} - -/*! - Returns the data as a QVariant - */ -QVariant QAndroidParcel::readVariant() const -{ - QDataStream stream(d->readData()); - QVariant res; - stream >> res; - return res; -} - -/*! - Returns the binder as a QAndroidBinder - */ -QAndroidBinder QAndroidParcel::readBinder() const -{ - return d->readBinder(); -} - -/*! - Returns the file descriptor - */ -int QAndroidParcel::readFileDescriptor() const -{ - return d->readFileDescriptor(); -} - -/*! - The return value is useful to call other Java API which are not covered by this wrapper - */ -QAndroidJniObject QAndroidParcel::handle() const -{ - return d->handle; -} - -QT_END_NAMESPACE -- cgit v1.2.3