1 files changed, 77 insertions, 36 deletions

diff --git a/src/corelib/platform/android/qandroidextras.cpp b/src/corelib/platform/android/qandroidextras.cpp
index 414374d1e0..aa0c3fd093 100644
--- a/src/corelib/platform/android/qandroidextras.cpp
+++ b/src/corelib/platform/android/qandroidextras.cpp
@@ -126,6 +126,8 @@ QAndroidBinder QAndroidParcelPrivate::readBinder() const
     \l {https://developer.android.com/reference/android/os/Parcel.html}{Android Parcel}
     methods.
 
+    \include qtcore.qdoc qtcoreprivate-usage
+
     \since 6.2
 */
 
@@ -243,6 +245,8 @@ QJniObject QAndroidParcel::handle() const
     \l {https://developer.android.com/reference/android/os/Binder.html}{Android Binder}
     methods.
 
+    \include qtcore.qdoc qtcoreprivate-usage
+
     \since 6.2
 */
 
@@ -383,6 +387,8 @@ QJniObject QAndroidBinder::handle() const
 
     It is useful when you perform a QtAndroidPrivate::bindService operation.
 
+    \include qtcore.qdoc qtcoreprivate-usage
+
     \since 6.2
 */
 
@@ -507,6 +513,8 @@ public:
 
   Create a subclass of this class to be notified of the results when using the
   \c QtAndroidPrivate::startActivity() and \c QtAndroidPrivate::startIntentSender() APIs.
+
+  \include qtcore.qdoc qtcoreprivate-usage
  */
 
 /*!
@@ -604,6 +612,8 @@ public:
     \l {https://developer.android.com/reference/android/app/Service.html}{Android Service}
     methods.
 
+    \include qtcore.qdoc qtcoreprivate-usage
+
     \since 6.2
 */
 
@@ -662,6 +672,45 @@ QAndroidBinder* QAndroidService::onBind(const QAndroidIntent &/*intent*/)
     return nullptr;
 }
 
+static jboolean onTransact(JNIEnv */*env*/, jclass /*cls*/, jlong id, jint code, jobject data,
+                           jobject reply, jint flags)
+{
+    if (!id)
+        return false;
+
+    return reinterpret_cast<QAndroidBinder*>(id)->onTransact(
+            code, QAndroidParcel(data), QAndroidParcel(reply), QAndroidBinder::CallType(flags));
+}
+
+static void onServiceConnected(JNIEnv */*env*/, jclass /*cls*/, jlong id, jstring name,
+                               jobject service)
+{
+    if (!id)
+        return;
+
+    return reinterpret_cast<QAndroidServiceConnection *>(id)->onServiceConnected(
+            QJniObject(name).toString(), QAndroidBinder(service));
+}
+
+static void onServiceDisconnected(JNIEnv */*env*/, jclass /*cls*/, jlong id, jstring name)
+{
+    if (!id)
+        return;
+
+    return reinterpret_cast<QAndroidServiceConnection *>(id)->onServiceDisconnected(
+            QJniObject(name).toString());
+}
+
+bool QtAndroidPrivate::registerExtrasNatives(QJniEnvironment &env)
+{
+    static const JNINativeMethod methods[] = {
+        {"onTransact", "(JILandroid/os/Parcel;Landroid/os/Parcel;I)Z", (void *)onTransact},
+        {"onServiceConnected", "(JLjava/lang/String;Landroid/os/IBinder;)V", (void *)onServiceConnected},
+        {"onServiceDisconnected", "(JLjava/lang/String;)V", (void *)onServiceDisconnected}
+    };
+
+    return env.registerNativeMethods("org/qtproject/qt/android/extras/QtNative", methods, 3);
+}
 
 /*!
     \class QAndroidIntent
@@ -674,6 +723,8 @@ QAndroidBinder* QAndroidService::onBind(const QAndroidIntent &/*intent*/)
     \l {https://developer.android.com/reference/android/content/Intent.html}{Android Intent}
     methods.
 
+    \include qtcore.qdoc qtcoreprivate-usage
+
     \since 6.2
 */
 
@@ -799,6 +850,8 @@ QJniObject QAndroidIntent::handle() const
     \brief The QtAndroidPrivate namespace provides miscellaneous functions
            to aid Android development.
     \inheaderfile QtCore/private/qandroidextras_p.h
+
+    \include qtcore.qdoc qtcoreprivate-usage
 */
 
 /*!
@@ -1069,29 +1122,29 @@ static void sendRequestPermissionsResult(JNIEnv *env, jobject *obj, jint request
 QFuture<QtAndroidPrivate::PermissionResult>
 requestPermissionsInternal(const QStringList &permissions)
 {
-    QSharedPointer<QPromise<QtAndroidPrivate::PermissionResult>> promise;
-    promise.reset(new QPromise<QtAndroidPrivate::PermissionResult>());
-    QFuture<QtAndroidPrivate::PermissionResult> future = promise->future();
-    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;
+        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::makeReadyRangeFuture(result);
     }
 
-    if (!QtAndroidPrivate::acquireAndroidDeadlockProtector()) {
-        promise->addResult(QtAndroidPrivate::Denied);
-        promise->finish();
-        return future;
-    }
+    if (!QtAndroidPrivate::acquireAndroidDeadlockProtector())
+        return QtFuture::makeReadyValueFuture(QtAndroidPrivate::Denied);
+
+    QSharedPointer<QPromise<QtAndroidPrivate::PermissionResult>> promise;
+    promise.reset(new QPromise<QtAndroidPrivate::PermissionResult>());
+    QFuture<QtAndroidPrivate::PermissionResult> future = promise->future();
+    promise->start();
 
     const int requestCode = nextRequestCode();
     QMutexLocker locker(&g_pendingPermissionRequestsMutex);
     g_pendingPermissionRequests->insert(requestCode, promise);
+    locker.unlock();
 
     QNativeInterface::QAndroidApplication::runOnAndroidMainThread([permissions, requestCode] {
         QJniEnvironment env;
@@ -1130,15 +1183,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::makeReadyValueFuture(QtAndroidPrivate::Denied);
+    return requestPermissionsInternal(permissions);
 }
 
 /*!
@@ -1152,25 +1199,18 @@ 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::makeReadyValueFuture(result);
 }
 
-bool QtAndroidPrivate::registerPermissionNatives()
+bool QtAndroidPrivate::registerPermissionNatives(QJniEnvironment &env)
 {
     if (QtAndroidPrivate::androidSdkVersion() < 23)
         return true;
@@ -1180,8 +1220,9 @@ bool QtAndroidPrivate::registerPermissionNatives()
          reinterpret_cast<void *>(sendRequestPermissionsResult)
         }};
 
-    QJniEnvironment env;
     return env.registerNativeMethods(qtNativeClassName, methods, 1);
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qandroidextras_p.cpp"