Made the external D-Bus interfaces a compile time option

Running qmake -config disable-external-dbus-interfaces will now compile out the
support for all the external interfaces (ApplicationManager, WindowManager,
ApplicationInstaller and NotificationManager). This also cleans up the
implementation of these singletons, since we are now using a custom "2 step"
DBus adaptor to get around the QtDBus limitation that requires the original
object to derive from QDBusContext (although this violates every layering
rule).
In any case, this will not affect the private P2P Bus between the AM and the
apps.

Change-Id: I53d9c3b6d3a010ed7d65e3a80005bd18a7bb9c23
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>

1 files changed, 98 insertions, 0 deletions

diff --git a/src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp b/src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp
new file mode 100644
index 00000000..f6c2da2c
--- /dev/null
+++ b/src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Pelagicore Application Manager.
+**
+** $QT_BEGIN_LICENSE:LGPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite 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$
+**
+** SPDX-License-Identifier: LGPL-3.0
+**
+****************************************************************************/
+
+#include <qplatformdefs.h>
+#if defined(Q_OS_UNIX)
+#  include <unistd.h>
+#endif
+
+#include "notificationmanagerdbuscontextadaptor.h"
+#include "notificationmanager.h"
+#include "org.freedesktop.notifications_adaptor.h"
+
+QT_BEGIN_NAMESPACE_AM
+
+NotificationManagerDBusContextAdaptor::NotificationManagerDBusContextAdaptor(NotificationManager *nm)
+    : AbstractDBusContextAdaptor(nm)
+{
+    m_adaptor = new NotificationsAdaptor(this);
+}
+
+QT_END_NAMESPACE_AM
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+QT_USE_NAMESPACE_AM
+
+NotificationsAdaptor::NotificationsAdaptor(QObject *parent)
+    : QDBusAbstractAdaptor(parent)
+{
+    auto nm = NotificationManager::instance();
+
+    connect(nm, &NotificationManager::ActionInvoked,
+            this, &NotificationsAdaptor::ActionInvoked);
+    connect(nm, &NotificationManager::NotificationClosed,
+            this, &NotificationsAdaptor::NotificationClosed);
+}
+
+NotificationsAdaptor::~NotificationsAdaptor()
+{ }
+
+void NotificationsAdaptor::CloseNotification(uint id)
+{
+    NotificationManager::instance()->CloseNotification(id);
+}
+
+QStringList NotificationsAdaptor::GetCapabilities()
+{
+    return NotificationManager::instance()->GetCapabilities();
+}
+
+QString NotificationsAdaptor::GetServerInformation(QString &vendor, QString &version, QString &spec_version)
+{
+    return NotificationManager::instance()->GetServerInformation(vendor, version, spec_version);
+}
+
+uint NotificationsAdaptor::Notify(const QString &app_name, uint replaces_id, const QString &app_icon, const QString &summary, const QString &body, const QStringList &actions, const QVariantMap &hints, int timeout)
+{
+    return NotificationManager::instance()->Notify(app_name, replaces_id, app_icon, summary, body, actions, hints, timeout);
+}
+