1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: simplify array handling code

Browse Source 
Change-Id: I75bc745bbeabcd332d475428daf3d82e1b077aa6
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Volker Hilsheimer 2024-10-09 10:18:31 +02:00
parent 094f7cab54
commit 115ab2c553
1 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/corelib/platform/android/qandroidextras.cpp
View File

@ -63,13 +63,7 @@ void QAndroidParcelPrivate::writeData(const QByteArray &data) const
if (data.isEmpty())
return;
QJniEnvironment().checkAndClearExceptions();
QJniEnvironment env;
jbyteArray array = env->NewByteArray(data.size());
env->SetByteArrayRegion(array, 0, data.length(),
reinterpret_cast<const jbyte*>(data.constData()));
handle.callMethod<void>("writeByteArray", "([B)V", array);
env->DeleteLocalRef(array);
handle.callMethod<void>("writeByteArray", data);
}
void QAndroidParcelPrivate::writeBinder(const QAndroidBinder &binder) const
@ -768,15 +762,7 @@ QAndroidIntent::QAndroidIntent(const QJniObject &packageContext, const char *cla
*/
void QAndroidIntent::putExtra(const QString &key, const QByteArray &data)
{
QJniEnvironment().checkAndClearExceptions();
QJniEnvironment env;
jbyteArray array = env->NewByteArray(data.size());
env->SetByteArrayRegion(array, 0, data.length(),
reinterpret_cast<const jbyte*>(data.constData()));
m_handle.callObjectMethod("putExtra", "(Ljava/lang/String;[B)Landroid/content/Intent;",
QJniObject::fromString(key).object(), array);
env->DeleteLocalRef(array);
QJniEnvironment().checkAndClearExceptions();
m_handle.callMethod<QtJniTypes::Intent>("putExtra", key, data);
}
/*!
@ -784,19 +770,7 @@ void QAndroidIntent::putExtra(const QString &key, const QByteArray &data)
*/
QByteArray QAndroidIntent::extraBytes(const QString &key)
{
QJniEnvironment().checkAndClearExceptions();
auto array = m_handle.callObjectMethod("getByteArrayExtra", "(Ljava/lang/String;)[B",
QJniObject::fromString(key).object());
if (!array.isValid() || !array.object())
return QByteArray();
QJniEnvironment env;
auto sz = env->GetArrayLength(jarray(array.object()));
QByteArray res(sz, Qt::Initialization::Uninitialized);
env->GetByteArrayRegion(jbyteArray(array.object()), 0, sz,
reinterpret_cast<jbyte *>(res.data()));
QJniEnvironment().checkAndClearExceptions();
return res;
return m_handle.callMethod<QByteArray>("getByteArrayExtra", key);
}
/*!