diff options
Diffstat (limited to 'src/dbus-lib')
17 files changed, 248 insertions, 242 deletions
diff --git a/src/dbus-lib/abstractdbuscontextadaptor.cpp b/src/dbus-lib/abstractdbuscontextadaptor.cpp index 0716b3e4..aee9a521 100644 --- a/src/dbus-lib/abstractdbuscontextadaptor.cpp +++ b/src/dbus-lib/abstractdbuscontextadaptor.cpp @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/src/dbus-lib/abstractdbuscontextadaptor.h b/src/dbus-lib/abstractdbuscontextadaptor.h index 683dc04f..4753e636 100644 --- a/src/dbus-lib/abstractdbuscontextadaptor.h +++ b/src/dbus-lib/abstractdbuscontextadaptor.h @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/src/dbus-lib/applicationinstallerdbuscontextadaptor.cpp b/src/dbus-lib/applicationinstallerdbuscontextadaptor.cpp deleted file mode 100644 index de5097cd..00000000 --- a/src/dbus-lib/applicationinstallerdbuscontextadaptor.cpp +++ /dev/null @@ -1,204 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 Luxoft Sweden AB -** Copyright (C) 2018 Pelagicore AG -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Luxoft 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 "applicationinstallerdbuscontextadaptor.h" -#include "applicationinstaller.h" -#include "io.qt.applicationinstaller_adaptor.h" -#include "dbuspolicy.h" -#include "exception.h" -#include "logging.h" - - -QT_BEGIN_NAMESPACE_AM - -static QString taskStateToString(AsynchronousTask::TaskState state) -{ - const char *cstr = QMetaEnum::fromType<AsynchronousTask::TaskState>().valueToKey(state); - return QString::fromUtf8(cstr); -} - -ApplicationInstallerDBusContextAdaptor::ApplicationInstallerDBusContextAdaptor(ApplicationInstaller *ai) - : AbstractDBusContextAdaptor(ai) -{ - m_adaptor = new ApplicationInstallerAdaptor(this); -} - -QT_END_NAMESPACE_AM - -///////////////////////////////////////////////////////////////////////////////////// - -QT_USE_NAMESPACE_AM - -ApplicationInstallerAdaptor::ApplicationInstallerAdaptor(QObject *parent) - : QDBusAbstractAdaptor(parent) -{ - auto ai = ApplicationInstaller::instance(); - - connect(ai, &ApplicationInstaller::taskBlockingUntilInstallationAcknowledge, - this, &ApplicationInstallerAdaptor::taskBlockingUntilInstallationAcknowledge); - connect(ai, &ApplicationInstaller::taskFailed, - this, &ApplicationInstallerAdaptor::taskFailed); - connect(ai, &ApplicationInstaller::taskFinished, - this, &ApplicationInstallerAdaptor::taskFinished); - connect(ai, &ApplicationInstaller::taskProgressChanged, - this, &ApplicationInstallerAdaptor::taskProgressChanged); - connect(ai, &ApplicationInstaller::taskRequestingInstallationAcknowledge, - this, &ApplicationInstallerAdaptor::taskRequestingInstallationAcknowledge); - connect(ai, &ApplicationInstaller::taskStarted, - this, &ApplicationInstallerAdaptor::taskStarted); - connect(ai, &ApplicationInstaller::taskStateChanged, - [this](const QString &taskId, AsynchronousTask::TaskState newState) { - emit taskStateChanged(taskId, taskStateToString(newState)); - }); -} - -ApplicationInstallerAdaptor::~ApplicationInstallerAdaptor() -{ } - -bool ApplicationInstallerAdaptor::allowInstallationOfUnsignedPackages() const -{ - return ApplicationInstaller::instance()->allowInstallationOfUnsignedPackages(); -} - -bool ApplicationInstallerAdaptor::applicationUserIdSeparation() const -{ - return ApplicationInstaller::instance()->isApplicationUserIdSeparationEnabled(); -} - -uint ApplicationInstallerAdaptor::commonApplicationGroupId() const -{ - return ApplicationInstaller::instance()->commonApplicationGroupId(); -} - -bool ApplicationInstallerAdaptor::developmentMode() const -{ - return ApplicationInstaller::instance()->developmentMode(); -} - -void ApplicationInstallerAdaptor::acknowledgePackageInstallation(const QString &taskId) -{ - AM_AUTHENTICATE_DBUS(void) - return ApplicationInstaller::instance()->acknowledgePackageInstallation(taskId); -} - -bool ApplicationInstallerAdaptor::cancelTask(const QString &taskId) -{ - AM_AUTHENTICATE_DBUS(bool) - return ApplicationInstaller::instance()->cancelTask(taskId); -} - -int ApplicationInstallerAdaptor::compareVersions(const QString &version1, const QString &version2) -{ - AM_AUTHENTICATE_DBUS(int) - return ApplicationInstaller::instance()->compareVersions(version1, version2); -} - -QVariantMap ApplicationInstallerAdaptor::getInstallationLocation(const QString &installationLocationId) -{ - AM_AUTHENTICATE_DBUS(QVariantMap) - return ApplicationInstaller::instance()->getInstallationLocation(installationLocationId); -} - -QString ApplicationInstallerAdaptor::installationLocationIdFromApplication(const QString &id) -{ - AM_AUTHENTICATE_DBUS(QString) - return ApplicationInstaller::instance()->installationLocationIdFromApplication(id); -} - -QStringList ApplicationInstallerAdaptor::installationLocationIds() -{ - AM_AUTHENTICATE_DBUS(QStringList) - return ApplicationInstaller::instance()->installationLocationIds(); -} - -qlonglong ApplicationInstallerAdaptor::installedApplicationSize(const QString &id) -{ - AM_AUTHENTICATE_DBUS(qlonglong) - return ApplicationInstaller::instance()->installedApplicationSize(id); -} - -QVariantMap ApplicationInstallerAdaptor::installedApplicationExtraMetaData(const QString &id) -{ - AM_AUTHENTICATE_DBUS(QVariantMap) - return ApplicationInstaller::instance()->installedApplicationExtraMetaData(id); -} - -QVariantMap ApplicationInstallerAdaptor::installedApplicationExtraSignedMetaData(const QString &id) -{ - AM_AUTHENTICATE_DBUS(QVariantMap) - return ApplicationInstaller::instance()->installedApplicationExtraSignedMetaData(id); -} - -QString ApplicationInstallerAdaptor::removePackage(const QString &id, bool keepDocuments) -{ - return removePackage(id, keepDocuments, false); -} - -QString ApplicationInstallerAdaptor::removePackage(const QString &id, bool keepDocuments, bool force) -{ - AM_AUTHENTICATE_DBUS(QString) - return ApplicationInstaller::instance()->removePackage(id, keepDocuments, force); -} - -QString ApplicationInstallerAdaptor::startPackageInstallation(const QString &installationLocationId, const QString &sourceUrl) -{ - AM_AUTHENTICATE_DBUS(QString) - return ApplicationInstaller::instance()->startPackageInstallation(installationLocationId, sourceUrl); -} - -QString ApplicationInstallerAdaptor::taskState(const QString &taskId) -{ - AM_AUTHENTICATE_DBUS(QString) - return taskStateToString(ApplicationInstaller::instance()->taskState(taskId)); -} - -QString ApplicationInstallerAdaptor::taskApplicationId(const QString &taskId) -{ - AM_AUTHENTICATE_DBUS(QString) - return ApplicationInstaller::instance()->taskApplicationId(taskId); -} - -QStringList ApplicationInstallerAdaptor::activeTaskIds() -{ - AM_AUTHENTICATE_DBUS(QStringList) - return ApplicationInstaller::instance()->activeTaskIds(); -} diff --git a/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp b/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp index 3ca02d65..5794e79a 100644 --- a/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp +++ b/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/src/dbus-lib/applicationmanagerdbuscontextadaptor.h b/src/dbus-lib/applicationmanagerdbuscontextadaptor.h index 073697cd..02a2a805 100644 --- a/src/dbus-lib/applicationmanagerdbuscontextadaptor.h +++ b/src/dbus-lib/applicationmanagerdbuscontextadaptor.h @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/src/dbus-lib/dbus-lib.pro b/src/dbus-lib/dbus-lib.pro index 567fb0f3..5635fdf0 100644 --- a/src/dbus-lib/dbus-lib.pro +++ b/src/dbus-lib/dbus-lib.pro @@ -32,10 +32,9 @@ ADAPTORS_XML = \ org.freedesktop.notifications.xml \ !disable-installer { - QT *= appman_installer-private - HEADERS += applicationinstallerdbuscontextadaptor.h - SOURCES += applicationinstallerdbuscontextadaptor.cpp - ADAPTORS_XML += io.qt.applicationinstaller.xml + HEADERS += packagemanagerdbuscontextadaptor.h + SOURCES += packagemanagerdbuscontextadaptor.cpp + ADAPTORS_XML += io.qt.packagemanager.xml } !headless{ @@ -46,7 +45,7 @@ ADAPTORS_XML = \ } OTHER_FILES = \ - io.qt.applicationinstaller.xml \ + io.qt.packagemanager.xml \ io.qt.applicationmanager.applicationinterface.xml \ io.qt.applicationmanager.runtimeinterface.xml \ io.qt.applicationmanager.intentinterface.xml \ @@ -59,8 +58,8 @@ qtPrepareTool(QDBUSCPP2XML, qdbuscpp2xml) recreate-applicationmanager-dbus-xml.CONFIG = phony recreate-applicationmanager-dbus-xml.commands = $$QDBUSCPP2XML -a $$PWD/../manager-lib/applicationmanager.h -o $$PWD/io.qt.applicationmanager.xml -recreate-applicationinstaller-dbus-xml.CONFIG = phony -recreate-applicationinstaller-dbus-xml.commands = $$QDBUSCPP2XML -a $$PWD/../installer-lib/applicationinstaller.h -o $$PWD/io.qt.applicationinstaller.xml +recreate-packagemanager-dbus-xml.CONFIG = phony +recreate-packagemanager-dbus-xml.commands = $$QDBUSCPP2XML -a $$PWD/../installer-lib/packagemanager.h -o $$PWD/io.qt.packagemanager.xml recreate-windowmanager-dbus-xml.CONFIG = phony recreate-windowmanager-dbus-xml.commands = $$QDBUSCPP2XML -a $$PWD/../manager/windowmanager.h -o $$PWD/io.qt.windowmanager.xml @@ -70,7 +69,7 @@ recreate-dbus-xml.depends = recreate-applicationmanager-dbus-xml recreate-applic QMAKE_EXTRA_TARGETS += \ recreate-dbus-xml \ recreate-applicationmanager-dbus-xml \ - recreate-applicationinstaller-dbus-xml \ + recreate-packagemanager-dbus-xml \ recreate-windowmanager-dbus-xml \ load(qt_module) diff --git a/src/dbus-lib/dbusdaemon.cpp b/src/dbus-lib/dbusdaemon.cpp index 94533c3e..0e0117f7 100644 --- a/src/dbus-lib/dbusdaemon.cpp +++ b/src/dbus-lib/dbusdaemon.cpp @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/src/dbus-lib/dbusdaemon.h b/src/dbus-lib/dbusdaemon.h index 34569bc3..ca3fdd4b 100644 --- a/src/dbus-lib/dbusdaemon.h +++ b/src/dbus-lib/dbusdaemon.h @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/src/dbus-lib/dbuspolicy.cpp b/src/dbus-lib/dbuspolicy.cpp index bf1a66b5..ef6214f6 100644 --- a/src/dbus-lib/dbuspolicy.cpp +++ b/src/dbus-lib/dbuspolicy.cpp @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/src/dbus-lib/dbuspolicy.h b/src/dbus-lib/dbuspolicy.h index fcdeed9c..e32c03d4 100644 --- a/src/dbus-lib/dbuspolicy.h +++ b/src/dbus-lib/dbuspolicy.h @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/src/dbus-lib/io.qt.applicationinstaller.xml b/src/dbus-lib/io.qt.packagemanager.xml index 913ce760..37e41b9d 100644 --- a/src/dbus-lib/io.qt.applicationinstaller.xml +++ b/src/dbus-lib/io.qt.packagemanager.xml @@ -1,10 +1,16 @@ <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> <node> - <interface name="io.qt.ApplicationInstaller"> + <interface name="io.qt.PackageManager"> <property name="allowInstallationOfUnsignedPackages" type="b" access="read"/> <property name="developmentMode" type="b" access="read"/> <property name="applicationUserIdSeparation" type="b" access="read"/> <property name="commonApplicationGroupId" type="u" access="read"/> + <property name="installationLocation" type="v" access="read"> + <annotation name="org.qtproject.QtDBus.QtTypeName" value="QVariantMap"/> + </property> + <property name="documentLocation" type="v" access="read"> + <annotation name="org.qtproject.QtDBus.QtTypeName" value="QVariantMap"/> + </property> <signal name="taskStarted"> <arg name="taskId" type="s" direction="out"/> </signal> @@ -26,7 +32,7 @@ </signal> <signal name="taskRequestingInstallationAcknowledge"> <arg name="taskId" type="s" direction="out"/> - <arg name="applicationAsVariantMap" type="a{sv}" direction="out"/> + <arg name="packageAsVariantMap" type="a{sv}" direction="out"/> <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/> <arg name="packageExtraMetaData" type="a{sv}" direction="out"/> <annotation name="org.qtproject.QtDBus.QtTypeName.Out2" value="QVariantMap"/> @@ -36,21 +42,16 @@ <signal name="taskBlockingUntilInstallationAcknowledge"> <arg name="taskId" type="s" direction="out"/> </signal> - <method name="installationLocationIds"> + <method name="packageIds"> <arg type="as" direction="out"/> </method> - <method name="installationLocationIdFromApplication"> - <arg type="s" direction="out"/> - <arg name="id" type="s" direction="in"/> - </method> - <method name="getInstallationLocation"> + <method name="get"> <arg type="a{sv}" direction="out"/> <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/> - <arg name="installationLocationId" type="s" direction="in"/> + <arg name="id" type="s" direction="in"/> </method> <method name="startPackageInstallation"> <arg type="s" direction="out"/> - <arg name="installationLocationId" type="s" direction="in"/> <arg name="sourceUrl" type="s" direction="in"/> </method> <method name="acknowledgePackageInstallation"> @@ -71,7 +72,7 @@ <arg type="s" direction="out"/> <arg name="taskId" type="s" direction="in"/> </method> - <method name="taskApplicationId"> + <method name="taskPackageId"> <arg type="s" direction="out"/> <arg name="taskId" type="s" direction="in"/> </method> @@ -87,16 +88,16 @@ <arg name="version1" type="s" direction="in"/> <arg name="version2" type="s" direction="in"/> </method> - <method name="installedApplicationSize"> + <method name="installedPackageSize"> <arg type="x" direction="out"/> <arg name="id" type="s" direction="in"/> </method> - <method name="installedApplicationExtraMetaData"> + <method name="installedPackageExtraMetaData"> <arg type="a{sv}" direction="out"/> <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/> <arg name="id" type="s" direction="in"/> </method> - <method name="installedApplicationExtraSignedMetaData"> + <method name="installedPackageExtraSignedMetaData"> <arg type="a{sv}" direction="out"/> <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/> <arg name="id" type="s" direction="in"/> diff --git a/src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp b/src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp index eeaefaff..ed80d6a5 100644 --- a/src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp +++ b/src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/src/dbus-lib/notificationmanagerdbuscontextadaptor.h b/src/dbus-lib/notificationmanagerdbuscontextadaptor.h index bcced38f..6f71bdbe 100644 --- a/src/dbus-lib/notificationmanagerdbuscontextadaptor.h +++ b/src/dbus-lib/notificationmanagerdbuscontextadaptor.h @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/src/dbus-lib/packagemanagerdbuscontextadaptor.cpp b/src/dbus-lib/packagemanagerdbuscontextadaptor.cpp new file mode 100644 index 00000000..b423389c --- /dev/null +++ b/src/dbus-lib/packagemanagerdbuscontextadaptor.cpp @@ -0,0 +1,210 @@ +/**************************************************************************** +** +** Copyright (C) 2019 Luxoft Sweden AB +** Copyright (C) 2018 Pelagicore AG +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt 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 "packagemanagerdbuscontextadaptor.h" +#include "packagemanager.h" +#include "io.qt.packagemanager_adaptor.h" +#include "dbuspolicy.h" +#include "exception.h" +#include "logging.h" + + +QT_BEGIN_NAMESPACE_AM + +static QString taskStateToString(AsynchronousTask::TaskState state) +{ + const char *cstr = QMetaEnum::fromType<AsynchronousTask::TaskState>().valueToKey(state); + return QString::fromUtf8(cstr); +} + +PackageManagerDBusContextAdaptor::PackageManagerDBusContextAdaptor(PackageManager *pm) + : AbstractDBusContextAdaptor(pm) +{ + m_adaptor = new PackageManagerAdaptor(this); +} + +QT_END_NAMESPACE_AM + +///////////////////////////////////////////////////////////////////////////////////// + +QT_USE_NAMESPACE_AM + +PackageManagerAdaptor::PackageManagerAdaptor(QObject *parent) + : QDBusAbstractAdaptor(parent) +{ + auto ai = PackageManager::instance(); + + connect(ai, &PackageManager::taskBlockingUntilInstallationAcknowledge, + this, &PackageManagerAdaptor::taskBlockingUntilInstallationAcknowledge); + connect(ai, &PackageManager::taskFailed, + this, &PackageManagerAdaptor::taskFailed); + connect(ai, &PackageManager::taskFinished, + this, &PackageManagerAdaptor::taskFinished); + connect(ai, &PackageManager::taskProgressChanged, + this, &PackageManagerAdaptor::taskProgressChanged); + connect(ai, &PackageManager::taskRequestingInstallationAcknowledge, + this, &PackageManagerAdaptor::taskRequestingInstallationAcknowledge); + connect(ai, &PackageManager::taskStarted, + this, &PackageManagerAdaptor::taskStarted); + connect(ai, &PackageManager::taskStateChanged, + [this](const QString &taskId, AsynchronousTask::TaskState newState) { + emit taskStateChanged(taskId, taskStateToString(newState)); + }); +} + +PackageManagerAdaptor::~PackageManagerAdaptor() +{ } + +bool PackageManagerAdaptor::allowInstallationOfUnsignedPackages() const +{ + return PackageManager::instance()->allowInstallationOfUnsignedPackages(); +} + +bool PackageManagerAdaptor::applicationUserIdSeparation() const +{ + return PackageManager::instance()->isApplicationUserIdSeparationEnabled(); +} + +uint PackageManagerAdaptor::commonApplicationGroupId() const +{ + return PackageManager::instance()->commonApplicationGroupId(); +} + +bool PackageManagerAdaptor::developmentMode() const +{ + return PackageManager::instance()->developmentMode(); +} + +QDBusVariant PackageManagerAdaptor::installationLocation() const +{ + return QDBusVariant(PackageManager::instance()->installationLocation()); +} + +QDBusVariant PackageManagerAdaptor::documentLocation() const +{ + return QDBusVariant(PackageManager::instance()->documentLocation()); +} + +void PackageManagerAdaptor::acknowledgePackageInstallation(const QString &taskId) +{ + AM_AUTHENTICATE_DBUS(void) + return PackageManager::instance()->acknowledgePackageInstallation(taskId); +} + +bool PackageManagerAdaptor::cancelTask(const QString &taskId) +{ + AM_AUTHENTICATE_DBUS(bool) + return PackageManager::instance()->cancelTask(taskId); +} + +int PackageManagerAdaptor::compareVersions(const QString &version1, const QString &version2) +{ + AM_AUTHENTICATE_DBUS(int) + return PackageManager::instance()->compareVersions(version1, version2); +} + +QStringList PackageManagerAdaptor::packageIds() +{ + AM_AUTHENTICATE_DBUS(QStringList) + return PackageManager::instance()->packageIds(); +} + +QVariantMap PackageManagerAdaptor::get(const QString &id) +{ + AM_AUTHENTICATE_DBUS(QVariantMap) + auto map = PackageManager::instance()->get(id); + map.remove(qSL("package")); // cannot marshall QObject * + return map; +} + +qlonglong PackageManagerAdaptor::installedPackageSize(const QString &packageId) +{ + AM_AUTHENTICATE_DBUS(qlonglong) + return PackageManager::instance()->installedPackageSize(packageId); +} + +QVariantMap PackageManagerAdaptor::installedPackageExtraMetaData(const QString &packageId) +{ + AM_AUTHENTICATE_DBUS(QVariantMap) + return PackageManager::instance()->installedPackageExtraMetaData(packageId); +} + +QVariantMap PackageManagerAdaptor::installedPackageExtraSignedMetaData(const QString &packageId) +{ + AM_AUTHENTICATE_DBUS(QVariantMap) + return PackageManager::instance()->installedPackageExtraSignedMetaData(packageId); +} + +QString PackageManagerAdaptor::removePackage(const QString &packageId, bool keepDocuments) +{ + return removePackage(packageId, keepDocuments, false); +} + +QString PackageManagerAdaptor::removePackage(const QString &packageId, bool keepDocuments, bool force) +{ + AM_AUTHENTICATE_DBUS(QString) + return PackageManager::instance()->removePackage(packageId, keepDocuments, force); +} + +QString PackageManagerAdaptor::startPackageInstallation(const QString &sourceUrl) +{ + AM_AUTHENTICATE_DBUS(QString) + return PackageManager::instance()->startPackageInstallation(sourceUrl); +} + +QString PackageManagerAdaptor::taskState(const QString &taskId) +{ + AM_AUTHENTICATE_DBUS(QString) + return taskStateToString(PackageManager::instance()->taskState(taskId)); +} + +QString PackageManagerAdaptor::taskPackageId(const QString &taskId) +{ + AM_AUTHENTICATE_DBUS(QString) + return PackageManager::instance()->taskPackageId(taskId); +} + +QStringList PackageManagerAdaptor::activeTaskIds() +{ + AM_AUTHENTICATE_DBUS(QStringList) + return PackageManager::instance()->activeTaskIds(); +} diff --git a/src/dbus-lib/applicationinstallerdbuscontextadaptor.h b/src/dbus-lib/packagemanagerdbuscontextadaptor.h index 98cac67d..8eb30e88 100644 --- a/src/dbus-lib/applicationinstallerdbuscontextadaptor.h +++ b/src/dbus-lib/packagemanagerdbuscontextadaptor.h @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage @@ -46,12 +46,12 @@ QT_BEGIN_NAMESPACE_AM -class ApplicationInstaller; +class PackageManager; -class ApplicationInstallerDBusContextAdaptor : public AbstractDBusContextAdaptor +class PackageManagerDBusContextAdaptor : public AbstractDBusContextAdaptor { public: - explicit ApplicationInstallerDBusContextAdaptor(ApplicationInstaller *am); + explicit PackageManagerDBusContextAdaptor(PackageManager *pm); }; QT_END_NAMESPACE_AM diff --git a/src/dbus-lib/windowmanagerdbuscontextadaptor.cpp b/src/dbus-lib/windowmanagerdbuscontextadaptor.cpp index cf18f049..b6b1b5a2 100644 --- a/src/dbus-lib/windowmanagerdbuscontextadaptor.cpp +++ b/src/dbus-lib/windowmanagerdbuscontextadaptor.cpp @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/src/dbus-lib/windowmanagerdbuscontextadaptor.h b/src/dbus-lib/windowmanagerdbuscontextadaptor.h index 8d749a3d..a78907bc 100644 --- a/src/dbus-lib/windowmanagerdbuscontextadaptor.h +++ b/src/dbus-lib/windowmanagerdbuscontextadaptor.h @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage |