diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2021-07-19 18:23:19 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-22 14:09:49 +0000 |
| commit | 2da43e2e5462d452292050e4461cb5ef6305c7c8 (patch) | |
| tree | a62ebc655d3836f9b1ad4ecd2d132cf18b4186e1 | |
| parent | 0995d4a7f6c51e2a2a19f1fe4b6bc42980f8d6bb (diff) | |
Android: stop making throwing promises
No Qt API throws exceptions, ever. Kill the throwing paths, leaving the
normal paths in which a permission request is denied.
Change-Id: I6bebaf155c5232444bf5014e25e9c469d5dccfa6
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 21782bdc048a76a8b3f85f7633741f565312f1b6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_android.cpp | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/corelib/kernel/qcoreapplication_android.cpp b/src/corelib/kernel/qcoreapplication_android.cpp index f44b202475..671db805e3 100644 --- a/src/corelib/kernel/qcoreapplication_android.cpp +++ b/src/corelib/kernel/qcoreapplication_android.cpp @@ -53,12 +53,6 @@ QT_BEGIN_NAMESPACE static const char qtNativeClassName[] = "org/qtproject/qt/android/QtNative"; -#ifndef QT_NO_EXCEPTIONS -static const char emptyPermissionExcept[] = "The permission cannot be an empty string."; -static const char invalidNativePermissionExcept[] = - "Coudn't convert the provided permission type to a native Android permission string."; -#endif - QApplicationPermission::PermissionResult resultFromAndroid(jint value) { return value == 0 ? QApplicationPermission::Authorized : QApplicationPermission::Denied; @@ -208,11 +202,7 @@ QCoreApplicationPrivate::requestPermission(const QString &permission) QPromise<QApplicationPermission::PermissionResult> promise; QFuture<QApplicationPermission::PermissionResult> future = promise.future(); promise.start(); -#ifndef QT_NO_EXCEPTIONS - promise.setException(std::make_exception_ptr(std::runtime_error(emptyPermissionExcept))); -#else promise.addResult(QApplicationPermission::Denied); -#endif promise.finish(); return future; } @@ -251,12 +241,7 @@ QCoreApplicationPrivate::requestPermission(QApplicationPermission::PermissionTyp return future; } -#ifndef QT_NO_EXCEPTIONS - promise->setException(std::make_exception_ptr( - std::runtime_error(invalidNativePermissionExcept))); -#else - promise.addResult(QApplicationPermission::Denied); -#endif + promise->addResult(QApplicationPermission::Denied); promise->finish(); return future; } @@ -275,11 +260,7 @@ QCoreApplicationPrivate::checkPermission(const QString &permission) QJniObject::fromString(permission).object()); promise.addResult(resultFromAndroid(res)); } else { -#ifndef QT_NO_EXCEPTIONS - promise.setException(std::make_exception_ptr(std::runtime_error(emptyPermissionExcept))); -#else promise.addResult(QApplicationPermission::Denied); -#endif } promise.finish(); @@ -297,12 +278,7 @@ QCoreApplicationPrivate::checkPermission(QApplicationPermission::PermissionType QPromise<QApplicationPermission::PermissionResult> promise; QFuture<QApplicationPermission::PermissionResult> future = promise.future(); promise.start(); -#ifndef QT_NO_EXCEPTIONS - promise.setException(std::make_exception_ptr( - std::runtime_error(invalidNativePermissionExcept))); -#else promise.addResult(QApplicationPermission::Denied); -#endif promise.finish(); return future; } |