From e6c7666a657dda8689e3caa9b0ae324fceb6b8ba Mon Sep 17 00:00:00 2001 From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com> Date: Tue, 9 Jan 2018 11:07:45 -0500 Subject: [PATCH] datatransfer: add bytes progress DBus API Add ConfigurationManager::dataTransferBytesSent() DBus method access. Change-Id: I74fc22f42faeb5c352059831150b6c8b7e813fd8 Reviewed-by: Olivier Soldano <olivier.soldano@savoirfairelinux.com> --- bin/dbus/cx.ring.Ring.ConfigurationManager.xml | 8 ++++++++ bin/dbus/dbusconfigurationmanager.cpp | 6 ++++++ bin/dbus/dbusconfigurationmanager.h | 1 + 3 files changed, 15 insertions(+) diff --git a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml index 28d972dca2..a1af941c61 100644 --- a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml +++ b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml @@ -1419,6 +1419,14 @@ </arg> </method> + <method name="dataTransferBytesSent" tp:name-for-bindings="dataTransferBytesSent"> + <tp:added version="4.2.0"/> + <arg type="t" name="BytesProgress" direction="out"> + </arg> + <arg type="t" name="DataTransferId" direction="in"> + </arg> + </method> + <signal name="mediaParametersChanged" tp:name-for-bindings="mediaParametersChanged"> <tp:added version="2.3.0"/> <tp:docstring> diff --git a/bin/dbus/dbusconfigurationmanager.cpp b/bin/dbus/dbusconfigurationmanager.cpp index 2af4275bf5..be041d502f 100644 --- a/bin/dbus/dbusconfigurationmanager.cpp +++ b/bin/dbus/dbusconfigurationmanager.cpp @@ -634,3 +634,9 @@ DBusConfigurationManager::dataTransferInfo(const DRing::DataTransferId& id) out._6 = info.path; return out; } + +uint64_t +DBusConfigurationManager::dataTransferBytesSent(const uint64_t& id) +{ + return DRing::dataTransferBytesSent(id);; +} diff --git a/bin/dbus/dbusconfigurationmanager.h b/bin/dbus/dbusconfigurationmanager.h index b7786b8f29..35478b24ff 100644 --- a/bin/dbus/dbusconfigurationmanager.h +++ b/bin/dbus/dbusconfigurationmanager.h @@ -156,6 +156,7 @@ class DBusConfigurationManager : DRing::DataTransferId sendFile(const std::string& account_id, const std::string& peer_uri, const std::string& file_path, const std::string& display_name); DBus::Struct<bool, uint32_t, uint64_t, uint64_t, std::string, std::string> dataTransferInfo(const DRing::DataTransferId& id); + uint64_t dataTransferBytesSent(const uint64_t& id); }; #endif // __RING_DBUSCONFIGURATIONMANAGER_H__ -- GitLab