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

Android: requestPermissionsInternal(): use more makeReadyFuture()

Browse Source 
Only use an actual QPromise when the calculation will be async.

Change-Id: I5900c6498f56721dd04c4da204c0270492f52eee
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Marc Mutz 2022-12-29 07:10:33 +01:00
parent 5761f254a0
commit 91f18c92d7
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1083,26 +1083,25 @@ static void sendRequestPermissionsResult(JNIEnv *env, jobject *obj, jint request
QFuture<QtAndroidPrivate::PermissionResult> QFuture<QtAndroidPrivate::PermissionResult>
requestPermissionsInternal(const QStringList &permissions) requestPermissionsInternal(const QStringList &permissions)
{ {
// No mechanism to request permission for SDK version below 23, because
// permissions defined in the manifest are granted at install time.
if (QtAndroidPrivate::androidSdkVersion() < 23) {
QList<QtAndroidPrivate::PermissionResult> result;
result.reserve(permissions.size());
// ### can we kick off all checkPermission()s, and whenAll() collect results?
for (const QString &permission : permissions)
result.push_back(QtAndroidPrivate::checkPermission(permission).result());
return QtFuture::makeReadyFuture(std::as_const(result)); // as_const d/t QTBUG-109677
}
if (!QtAndroidPrivate::acquireAndroidDeadlockProtector())
return QtFuture::makeReadyFuture(QtAndroidPrivate::Denied);
QSharedPointer<QPromise<QtAndroidPrivate::PermissionResult>> promise; QSharedPointer<QPromise<QtAndroidPrivate::PermissionResult>> promise;
promise.reset(new QPromise<QtAndroidPrivate::PermissionResult>()); promise.reset(new QPromise<QtAndroidPrivate::PermissionResult>());
QFuture<QtAndroidPrivate::PermissionResult> future = promise->future(); QFuture<QtAndroidPrivate::PermissionResult> future = promise->future();
promise->start(); promise->start();
// No mechanism to request permission for SDK version below 23, because
// permissions defined in the manifest are granted at install time.
if (QtAndroidPrivate::androidSdkVersion() < 23) {
for (int i = 0; i < permissions.size(); ++i)
promise->addResult(QtAndroidPrivate::checkPermission(permissions.at(i)).result(), i);
promise->finish();
return future;
}
if (!QtAndroidPrivate::acquireAndroidDeadlockProtector()) {
promise->addResult(QtAndroidPrivate::Denied);
promise->finish();
return future;
}
const int requestCode = nextRequestCode(); const int requestCode = nextRequestCode();
QMutexLocker locker(&g_pendingPermissionRequestsMutex); QMutexLocker locker(&g_pendingPermissionRequestsMutex);
g_pendingPermissionRequests->insert(requestCode, promise); g_pendingPermissionRequests->insert(requestCode, promise);