From e55d57c587ae5abb6a191c442492d16c33ef75dc Mon Sep 17 00:00:00 2001
From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
Date: Thu, 9 Mar 2017 22:38:24 +0100
Subject: [PATCH] dbus: add DeviceRevocationEnded signal
Tuleap: #1457
Change-Id: I57aad9c3b9eab884f11ca67474b0cdfbb4db3983
---
.../cx.ring.Ring.ConfigurationManager.xml | 19 +++++++++++++++++++
bin/dbus/dbusclient.cpp | 1 +
2 files changed, 20 insertions(+)
diff --git a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
index f1cf90e3a6..c49e743d91 100644
--- a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
+++ b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
@@ -208,6 +208,25 @@
</tp:docstring>
</arg>
</method>
+ <signal name="deviceRevocationEnded" tp:name-for-bindings="deviceRevocationEnded">
+ <tp:docstring>
+ Notify clients when the revokeDevice operation ended.
+ </tp:docstring>
+ <arg type="s" name="accountID">
+ </arg>
+ <arg type="s" name="deviceId">
+ </arg>
+ <arg type="i" name="status">
+ <tp:docstring>
+ Status code: 0 for success
+ <ul>
+ <li>SUCCESS = 0 everything went fine. Device is now revoked.</li>
+ <li>WRONG_PASSWORD = 1 revocation failed: wrong password.</li>
+ <li>UNKNOWN_DEVICE = 2 revocation failed: unknown device.</li>
+ </ul>
+ </tp:docstring>
+ </arg>
+ </signal>
<signal name="knownDevicesChanged" tp:name-for-bindings="knownDevicesChanged">
<tp:docstring>
diff --git a/bin/dbus/dbusclient.cpp b/bin/dbus/dbusclient.cpp
index edcf3249fc..b9dbf27f72 100644
--- a/bin/dbus/dbusclient.cpp
+++ b/bin/dbus/dbusclient.cpp
@@ -182,6 +182,7 @@ DBusClient::initLibrary(int flags)
exportable_callback<ConfigurationSignal::KnownDevicesChanged>(bind(&DBusConfigurationManager::knownDevicesChanged, confM, _1, _2 )),
exportable_callback<ConfigurationSignal::NameRegistrationEnded>(bind(&DBusConfigurationManager::nameRegistrationEnded, confM, _1, _2, _3 )),
exportable_callback<ConfigurationSignal::RegisteredNameFound>(bind(&DBusConfigurationManager::registeredNameFound, confM, _1, _2, _3, _4 )),
+ exportable_callback<ConfigurationSignal::DeviceRevocationEnded>(bind(&DBusConfigurationManager::deviceRevocationEnded, confM, _1, _2, _3)),
exportable_callback<ConfigurationSignal::CertificatePinned>(bind(&DBusConfigurationManager::certificatePinned, confM, _1 )),
exportable_callback<ConfigurationSignal::CertificatePathPinned>(bind(&DBusConfigurationManager::certificatePathPinned, confM, _1, _2 )),
exportable_callback<ConfigurationSignal::CertificateExpired>(bind(&DBusConfigurationManager::certificateExpired, confM, _1 )),
--
GitLab