AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: checkPermission/s(): use makeReadyFuture()

Browse Source 
... instead of manual QPromise handling.

QtFuture::makeReadyFuture() is both more efficient and more readable.

As a drive-by, replace size() > 0 checks with !isEmpty().

Change-Id: I299fbe8e6be10d8f65b8f86fcc6b586ac3cbd9d2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Sona Kurazyan <kurazyan.sona@gmail.com>
This commit is contained in:
Marc Mutz 2022-12-28 15:42:38 +01:00
parent 080e1b6011
commit 7eff78e8a5
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1145,15 +1145,9 @@ QFuture<QtAndroidPrivate::PermissionResult>
QtAndroidPrivate::requestPermissions(const QStringList &permissions)
{
// avoid the uneccessary call and response to an empty permission string
if (permissions.size() > 0)
return requestPermissionsInternal(permissions);
QPromise<QtAndroidPrivate::PermissionResult> promise;
QFuture<QtAndroidPrivate::PermissionResult> future = promise.future();
promise.start();
promise.addResult(QtAndroidPrivate::Denied);
promise.finish();
return future;
if (permissions.isEmpty())
return QtFuture::makeReadyFuture(QtAndroidPrivate::Denied);
return requestPermissionsInternal(permissions);
}
/*!
@ -1167,22 +1161,15 @@ QtAndroidPrivate::requestPermissions(const QStringList &permissions)
QFuture<QtAndroidPrivate::PermissionResult>
QtAndroidPrivate::checkPermission(const QString &permission)
{
QPromise<QtAndroidPrivate::PermissionResult> promise;
QFuture<QtAndroidPrivate::PermissionResult> future = promise.future();
promise.start();
if (permission.size() > 0) {
QtAndroidPrivate::PermissionResult result = Denied;
if (!permission.isEmpty()) {
auto res = QJniObject::callStaticMethod<jint>(qtNativeClassName,
"checkSelfPermission",
"(Ljava/lang/String;)I",
QJniObject::fromString(permission).object());
promise.addResult(resultFromAndroid(res));
} else {
promise.addResult(QtAndroidPrivate::Denied);
result = resultFromAndroid(res);
}
promise.finish();
return future;
return QtFuture::makeReadyFuture(result);
}
bool QtAndroidPrivate::registerPermissionNatives()