From 6f9f93b384597970384f63b6dd27939718e0756c Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@kdab.com>
Date: Tue, 15 Jan 2019 10:38:20 +0100
Subject: [PATCH] Overload QtAndroid::startActivity with a callback
The current way of handling activity results by inheriting from QAndroidActivityResultReceiver
is very un-Qt. This patch allows handling activity results by passing a std::function/lambda
expression to the startActivity function.
Change-Id: Ie9dc91cd02dfcdb16a9ad0cb7858387e75159815
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
---
src/androidextras/android/android.pri | 3 +-
...qandroidactivitycallbackresultreceiver.cpp | 66 +++++++++++++++++
...qandroidactivitycallbackresultreceiver_p.h | 72 +++++++++++++++++++
.../android/qandroidfunctions.cpp | 19 +++++
src/androidextras/android/qandroidfunctions.h | 3 +
5 files changed, 162 insertions(+), 1 deletion(-)
create mode 100644 src/androidextras/android/qandroidactivitycallbackresultreceiver.cpp
create mode 100644 src/androidextras/android/qandroidactivitycallbackresultreceiver_p.h
diff --git a/src/androidextras/android/android.pri b/src/androidextras/android/android.pri
index 4f99c14..956ac08 100644
--- a/src/androidextras/android/android.pri
+++ b/src/androidextras/android/android.pri
@@ -6,7 +6,8 @@ SOURCES += \
$$PWD/qandroidparcel.cpp \
$$PWD/qandroidintent.cpp \
$$PWD/qjnionload.cpp \
- $$PWD/qandroidserviceconnection.cpp
+ $$PWD/qandroidserviceconnection.cpp \
+ $$PWD/qandroidactivitycallbackresultreceiver.cpp
HEADERS += \
$$PWD/qandroidfunctions.h \
diff --git a/src/androidextras/android/qandroidactivitycallbackresultreceiver.cpp b/src/androidextras/android/qandroidactivitycallbackresultreceiver.cpp
new file mode 100644
index 0000000..e32916f
--- /dev/null
+++ b/src/androidextras/android/qandroidactivitycallbackresultreceiver.cpp
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qandroidactivitycallbackresultreceiver_p.h"
+
+QAndroidActivityCallbackResultReceiver * QAndroidActivityCallbackResultReceiver::s_instance = nullptr;
+
+QAndroidActivityCallbackResultReceiver::QAndroidActivityCallbackResultReceiver()
+ : QAndroidActivityResultReceiver()
+ , callbackMap()
+{
+}
+
+void QAndroidActivityCallbackResultReceiver::handleActivityResult(int receiverRequestCode, int resultCode, const QAndroidJniObject &intent)
+{
+ callbackMap[receiverRequestCode](receiverRequestCode, resultCode, intent);
+ callbackMap.remove(receiverRequestCode);
+}
+
+QAndroidActivityCallbackResultReceiver * QAndroidActivityCallbackResultReceiver::instance() {
+ if (!s_instance) {
+ s_instance = new QAndroidActivityCallbackResultReceiver();
+ }
+ return s_instance;
+}
+
+void QAndroidActivityCallbackResultReceiver::registerCallback(int receiverRequestCode, std::function<void(int, int, const QAndroidJniObject &data)> callbackFunc)
+{
+ callbackMap.insert(receiverRequestCode, callbackFunc);
+}
diff --git a/src/androidextras/android/qandroidactivitycallbackresultreceiver_p.h b/src/androidextras/android/qandroidactivitycallbackresultreceiver_p.h
new file mode 100644
index 0000000..8232b53
--- /dev/null
+++ b/src/androidextras/android/qandroidactivitycallbackresultreceiver_p.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QANDROIDACTIVITYCALLBACKRESULTRECEIVER_P_H
+#define QANDROIDACTIVITYCALLBACKRESULTRECEIVER_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QMap>
+
+#include "qandroidactivityresultreceiver.h"
+
+class QAndroidActivityCallbackResultReceiver: public QAndroidActivityResultReceiver
+{
+public:
+ QAndroidActivityCallbackResultReceiver();
+ void handleActivityResult(int receiverRequestCode, int resultCode, const QAndroidJniObject &intent) override;
+ void registerCallback(int receiverRequestCode, std::function<void(int, int, const QAndroidJniObject &)> callbackFunc);
+
+ static QAndroidActivityCallbackResultReceiver *instance();
+private:
+ QMap<int, std::function<void(int, int, const QAndroidJniObject &data)>> callbackMap;
+
+ static QAndroidActivityCallbackResultReceiver *s_instance;
+};
+
+#endif
diff --git a/src/androidextras/android/qandroidfunctions.cpp b/src/androidextras/android/qandroidfunctions.cpp
index 651cf32..1d1aa44 100644
--- a/src/androidextras/android/qandroidfunctions.cpp
+++ b/src/androidextras/android/qandroidfunctions.cpp
@@ -43,6 +43,7 @@
#include "qandroidactivityresultreceiver_p.h"
#include "qandroidintent.h"
#include "qandroidserviceconnection.h"
+#include "qandroidactivitycallbackresultreceiver_p.h"
#include <QtCore/private/qjni_p.h>
#include <QtCore/private/qjnihelpers_p.h>
@@ -201,6 +202,24 @@ void QtAndroid::startActivity(const QAndroidIntent &intent,
startActivity(intent.handle(), receiverRequestCode, resultReceiver);
}
+/*!
+ \since 5.13
+
+ Starts the activity given by \a intent using \c startActivityForResult() and provides the result by calling callbackFunc.
+
+ The \a receiverRequestCode is a request code unique to the \a resultReceiver, and will be
+ returned along with the result, making it possible to use the same receiver for more than
+ one intent.
+*/
+void QtAndroid::startActivity(const QAndroidJniObject &intent,
+ int receiverRequestCode,
+ std::function<void(int, int, const QAndroidJniObject &data)> callbackFunc)
+{
+ QAndroidJniObject activity = androidActivity();
+ QAndroidActivityCallbackResultReceiver::instance()->registerCallback(receiverRequestCode, callbackFunc);
+ startActivity(intent, receiverRequestCode, QAndroidActivityCallbackResultReceiver::instance());
+}
+
/*!
\since 5.3
diff --git a/src/androidextras/android/qandroidfunctions.h b/src/androidextras/android/qandroidfunctions.h
index c6802e8..224c8b5 100644
--- a/src/androidextras/android/qandroidfunctions.h
+++ b/src/androidextras/android/qandroidfunctions.h
@@ -71,6 +71,9 @@ namespace QtAndroid
Q_ANDROIDEXTRAS_EXPORT void startActivity(const QAndroidIntent &intent,
int receiverRequestCode,
QAndroidActivityResultReceiver *resultReceiver = nullptr);
+ Q_ANDROIDEXTRAS_EXPORT void startActivity(const QAndroidJniObject &intent,
+ int receiverRequestCode,
+ std::function<void(int, int, const QAndroidJniObject &data)> callbackFunc);
enum class BindFlag {
None = 0x00000000,
--
GitLab