diff --git a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml index b07c3ce7756adbb113bb484e3b3fea61bfab3685..d7122b934fd4f5f753201380183b056f3e1556d4 100644 --- a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml +++ b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml @@ -1420,7 +1420,7 @@ <method name="dataTransferInfo" tp:name-for-bindings="dataTransferInfo"> <tp:added version="4.2.0"/> <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="DataTransferInfo"/> - <arg type="(buttss)" name="DataTransferInfo" direction="out"> + <arg type="(buttssss)" name="DataTransferInfo" direction="out"> </arg> <arg type="t" name="DataTransferId" direction="in"> </arg> diff --git a/bin/dbus/dbusconfigurationmanager.cpp b/bin/dbus/dbusconfigurationmanager.cpp index 13acf8fbf46b9e0d05a0b5c3174898d4fdce1eae..09e621ba59d590462ad4781d5c21e501c703c18f 100644 --- a/bin/dbus/dbusconfigurationmanager.cpp +++ b/bin/dbus/dbusconfigurationmanager.cpp @@ -621,10 +621,10 @@ DBusConfigurationManager::sendFile(const std::string& account_id, const std::str return DRing::sendFile(account_id, peer_uri, file_path, display_name); } -DBus::Struct<bool, uint32_t, uint64_t, uint64_t, std::string, std::string> +DBus::Struct<bool, uint32_t, uint64_t, uint64_t, std::string, std::string, std::string, std::string> DBusConfigurationManager::dataTransferInfo(const DRing::DataTransferId& id) { - DBus::Struct<bool, uint32_t, uint64_t, uint64_t, std::string, std::string> out; + DBus::Struct<bool, uint32_t, uint64_t, uint64_t, std::string, std::string, std::string, std::string> out; auto info = DRing::dataTransferInfo(id); out._1 = info.isOutgoing; out._2 = uint32_t(info.lastEvent); @@ -632,6 +632,8 @@ DBusConfigurationManager::dataTransferInfo(const DRing::DataTransferId& id) out._4 = info.bytesProgress; out._5 = info.displayName; out._6 = info.path; + out._7 = info.accountId; + out._8 = info.peer; return out; } diff --git a/bin/dbus/dbusconfigurationmanager.h b/bin/dbus/dbusconfigurationmanager.h index 4ef1f7be8fdf92daa9dd6b8ace3f7b0e90a05b2e..6f060139a60be727d240f8299beba2b95c9f8b94 100644 --- a/bin/dbus/dbusconfigurationmanager.h +++ b/bin/dbus/dbusconfigurationmanager.h @@ -155,7 +155,7 @@ class DBusConfigurationManager : void connectivityChanged(); 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); + DBus::Struct<bool, uint32_t, uint64_t, uint64_t, std::string, std::string, std::string, std::string> dataTransferInfo(const DRing::DataTransferId& id); uint64_t dataTransferBytesProgress(const uint64_t& id); std::vector<uint64_t> dataTransferList(); void acceptFileTransfer(const uint64_t& id, const std::string& file_path, const uint64_t& offset); diff --git a/src/dring/datatransfer_interface.h b/src/dring/datatransfer_interface.h index b47ec6f3b5c5297d699f8518bcc5575c4e181f72..80bf1d74b9eb42b2216f01b0c6dcc91fcb0919c1 100644 --- a/src/dring/datatransfer_interface.h +++ b/src/dring/datatransfer_interface.h @@ -56,6 +56,8 @@ struct DataTransferInfo std::streamsize bytesProgress {0}; ///< Number of bytes sent/received std::string displayName; ///< Human oriented transfer name std::string path; ///< associated local file path if supported (empty, if not) + std::string accountId; ///< Identifier of the emiter/receiver account + std::string peer; ///< Identifier of the remote peer (in the semantic of the associated account) }; std::vector<DataTransferId> dataTransferList();