From 6ed7d30430faf1b220d02eed7b80694c8bdd83b6 Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
Date: Thu, 23 Apr 2015 16:30:31 -0400
Subject: [PATCH] api: Bump XML API
Refs #71318 #71525
---
src/certificate.cpp | 4 +-
src/daemoncertificatecollection.cpp | 8 +--
src/tlsmethodmodel.cpp | 31 ++++++----
src/tlsmethodmodel.h | 9 +--
xml/callmanager-introspec.xml | 36 +++++++++++
xml/configurationmanager-introspec.xml | 84 --------------------------
6 files changed, 67 insertions(+), 105 deletions(-)
diff --git a/src/certificate.cpp b/src/certificate.cpp
index c53a49b7..199a3912 100644
--- a/src/certificate.cpp
+++ b/src/certificate.cpp
@@ -363,7 +363,7 @@ bool Certificate::pin()
if (hasRemote())
return true;
- switch(d_ptr->m_LoadingType) {
+ /*switch(d_ptr->m_LoadingType) {
case LoadingType::FROM_PATH:
DBus::ConfigurationManager::instance().addCertificate(d_ptr->m_Id); //FIXME wrong function, wait for daemon implementation
break;
@@ -374,7 +374,7 @@ bool Certificate::pin()
// return DBus::ConfigurationManager::instance().addCertificateRemote(d_ptr->m_Id); //FIXME
break;
}
- //TODO use the new pinning API
+ //TODO use the new pinning API*/
return false;
}
diff --git a/src/daemoncertificatecollection.cpp b/src/daemoncertificatecollection.cpp
index ac7f3da6..f29c85de 100644
--- a/src/daemoncertificatecollection.cpp
+++ b/src/daemoncertificatecollection.cpp
@@ -59,8 +59,8 @@ public Q_SLOTS:
DaemonCertificateCollectionPrivate::DaemonCertificateCollectionPrivate(DaemonCertificateCollection* parent) : QObject(), q_ptr(parent)
{
ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
- connect(&configurationManager,&ConfigurationManagerInterface::certificateAdded ,this,&DaemonCertificateCollectionPrivate::slotCertificateAdded );
- connect(&configurationManager,&ConfigurationManagerInterface::certificateExpired,this,&DaemonCertificateCollectionPrivate::slotCertificateExpired);
+// connect(&configurationManager,&ConfigurationManagerInterface::certificateAdded ,this,&DaemonCertificateCollectionPrivate::slotCertificateAdded );
+// connect(&configurationManager,&ConfigurationManagerInterface::certificateExpired,this,&DaemonCertificateCollectionPrivate::slotCertificateExpired);
}
DaemonCertificateCollection::DaemonCertificateCollection(CollectionMediator<Certificate>* mediator, const QString& path) :
@@ -88,8 +88,8 @@ void DaemonCertificateCollectionPrivate::slotCertificateExpired(const QString& i
bool DaemonCertificateCollection::load()
{
- ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
- qDebug() << QStringList(configurationManager.getCertificateList());
+// ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
+// qDebug() << QStringList(configurationManager.getCertificateList());
return false;
}
diff --git a/src/tlsmethodmodel.cpp b/src/tlsmethodmodel.cpp
index cce2a58f..028b08ec 100644
--- a/src/tlsmethodmodel.cpp
+++ b/src/tlsmethodmodel.cpp
@@ -38,16 +38,19 @@ public:
public:
static const QString DEFAULT ;
constexpr static const char* TLSv1 = "TLSv1" ;
+ constexpr static const char* TLSv1_1 = "TLSv1.1";
+ constexpr static const char* TLSv1_2 = "TLSv1.2";
constexpr static const char* SSLv3 = "SSLv3" ;
- constexpr static const char* SSLv23 = "SSLv23" ;
};
+
class DaemonName {
public:
constexpr static const char* DEFAULT = "Default";
constexpr static const char* TLSv1 = "TLSv1" ;
+ constexpr static const char* TLSv1_1 = "TLSv1.1";
+ constexpr static const char* TLSv1_2 = "TLSv1.2";
constexpr static const char* SSLv3 = "SSLv3" ;
- constexpr static const char* SSLv23 = "SSLv23" ;
};
static const char* toDaemonName(TlsMethodModel::Type type);
@@ -98,12 +101,14 @@ QVariant TlsMethodModel::data( const QModelIndex& index, int role) const
switch (method) {
case TlsMethodModel::Type::DEFAULT:
return TlsMethodModelPrivate::Name::DEFAULT;
- case TlsMethodModel::Type::TLSv1:
+ case TlsMethodModel::Type::TLSv1_0:
return TlsMethodModelPrivate::Name::TLSv1;
+ case TlsMethodModel::Type::TLSv1_1:
+ return TlsMethodModelPrivate::Name::TLSv1_1;
+ case TlsMethodModel::Type::TLSv1_2:
+ return TlsMethodModelPrivate::Name::TLSv1_2;
case TlsMethodModel::Type::SSLv3:
return TlsMethodModelPrivate::Name::SSLv3;
- case TlsMethodModel::Type::SSLv23:
- return TlsMethodModelPrivate::Name::SSLv23;
};
}
return QVariant();
@@ -165,12 +170,14 @@ const char* TlsMethodModelPrivate::toDaemonName(TlsMethodModel::Type type)
switch (type) {
case TlsMethodModel::Type::DEFAULT:
return TlsMethodModelPrivate::DaemonName::DEFAULT;
- case TlsMethodModel::Type::TLSv1:
+ case TlsMethodModel::Type::TLSv1_0:
return TlsMethodModelPrivate::DaemonName::TLSv1;
+ case TlsMethodModel::Type::TLSv1_1:
+ return TlsMethodModelPrivate::DaemonName::TLSv1_1;
+ case TlsMethodModel::Type::TLSv1_2:
+ return TlsMethodModelPrivate::DaemonName::TLSv1_2;
case TlsMethodModel::Type::SSLv3:
return TlsMethodModelPrivate::DaemonName::SSLv3;
- case TlsMethodModel::Type::SSLv23:
- return TlsMethodModelPrivate::DaemonName::SSLv23;
};
return TlsMethodModelPrivate::DaemonName::DEFAULT;
}
@@ -181,11 +188,13 @@ TlsMethodModel::Type TlsMethodModelPrivate::fromDaemonName(const QString& name)
if (name.isEmpty() || name == TlsMethodModelPrivate::DaemonName::DEFAULT)
return TlsMethodModel::Type::DEFAULT;
else if (name == TlsMethodModelPrivate::DaemonName::TLSv1)
- return TlsMethodModel::Type::TLSv1;
+ return TlsMethodModel::Type::TLSv1_0;
+ else if (name == TlsMethodModelPrivate::DaemonName::TLSv1_1)
+ return TlsMethodModel::Type::TLSv1_1;
+ else if (name == TlsMethodModelPrivate::DaemonName::TLSv1_2)
+ return TlsMethodModel::Type::TLSv1_2;
else if (name == TlsMethodModelPrivate::DaemonName::SSLv3)
return TlsMethodModel::Type::SSLv3;
- else if (name == TlsMethodModelPrivate::DaemonName::SSLv23)
- return TlsMethodModel::Type::SSLv23;
qDebug() << "Unknown TLS method" << name;
return TlsMethodModel::Type::DEFAULT;
}
diff --git a/src/tlsmethodmodel.h b/src/tlsmethodmodel.h
index e1afec2b..fda458fb 100644
--- a/src/tlsmethodmodel.h
+++ b/src/tlsmethodmodel.h
@@ -43,10 +43,11 @@ class LIB_EXPORT TlsMethodModel : public QAbstractListModel {
public:
///@enum Type Every supported encryption types
enum class Type {
- DEFAULT = 0,
- TLSv1 = 1,
- SSLv3 = 2,
- SSLv23 = 3,
+ DEFAULT = 0,
+ TLSv1_0 = 1,
+ TLSv1_1 = 2,
+ TLSv1_2 = 3,
+ SSLv3 = 4,
};
//Private constructor, can only be called by 'Account'
diff --git a/xml/callmanager-introspec.xml b/xml/callmanager-introspec.xml
index 11c2a9be..2fb551ce 100644
--- a/xml/callmanager-introspec.xml
+++ b/xml/callmanager-introspec.xml
@@ -99,6 +99,31 @@
<arg type="b" name="unHoldSucceeded" direction="out"/>
</method>
+ <method name="muteLocalMedia" tp:name-for-bindings="muteLocalMedia">
+ <arg type="s" name="callid" direction="in">
+ <tp:docstring>
+ The callid to mute
+ </tp:docstring>
+ </arg>
+ <arg type="s" name="mediaType" direction="in">
+ <tp:docstring>
+ The type of media (AUDIO or VIDEO)
+ </tp:docstring>
+ </arg>
+ <arg type="b" name="mute" direction="in">
+ <tp:docstring>
+ True to mute audio capture, false to unmute.
+ </tp:docstring>
+ </arg>
+ <arg type="b" name="res" direction="out">
+ <tp:docstring>
+ True if mute succeed. False otherwise
+ </tp:docstring>
+ </arg>
+ </method>
+
+
+
<method name="transfer" tp:name-for-bindings="transfer">
<tp:docstring>
Transfer a call to the given phone number.
@@ -786,5 +811,16 @@
<arg type="b" name="peerHolding" />
</signal>
+ <signal name="audioMuted" tp:name-for-bindings="audioMuted">
+ <tp:added version="2.1.0"/>
+ <arg type="s" name="callID" />
+ <arg type="b" name="audioMuted" />
+ </signal>
+
+ <signal name="videoMuted" tp:name-for-bindings="videoMuted">
+ <tp:added version="2.1.0"/>
+ <arg type="s" name="callID" />
+ <arg type="b" name="videoMuted" />
+ </signal>
</interface>
</node>
diff --git a/xml/configurationmanager-introspec.xml b/xml/configurationmanager-introspec.xml
index dfd10eeb..4b6cd1b9 100644
--- a/xml/configurationmanager-introspec.xml
+++ b/xml/configurationmanager-introspec.xml
@@ -635,18 +635,6 @@
</arg>
</method>
- <method name="getTlsSettings" tp:name-for-bindings="getTlsSettings">
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
- <arg type="a{ss}" name="details" direction="out">
- </arg>
- </method>
-
- <method name="setTlsSettings" tp:name-for-bindings="setTlsSettings">
- <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MapStringString"/>
- <arg type="a{ss}" name="details" direction="in">
- </arg>
- </method>
-
<method name="validateCertificate" tp:name-for-bindings="validateCertificate">
<arg type="s" name="accountId" direction="in"></arg>
<arg type="s" name="certificatePath" direction="in">
@@ -714,78 +702,6 @@
</arg>
</method>
- <method name="getCertificateList" tp:name-for-bindings="getCertificateList">
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
- <arg type="as" name="details" direction="out">
- <tp:docstring>
- <p>A list of all certificate IDs</p>
- </tp:docstring>
- </arg>
- </method>
-
- <method name="addCertificate" tp:name-for-bindings="addCertificate">
- <arg type="ay" name="certificateRaw" direction="in">
- <tp:docstring>
- <p>A raw certificate</p>
- </tp:docstring>
- </arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="String"/>
- <arg type="s" name="details" direction="out">
- <tp:docstring>
- <p>ID of the inserted certificate</p>
- </tp:docstring>
- </arg>
- </method>
-
- <method name="addCertificateRemote" tp:name-for-bindings="addCertificateRemote">
- <arg type="s" name="accountId" direction="in">
- <tp:docstring>
- <p>An account ID</p>
- </tp:docstring>
- </arg>
- <arg type="s" name="certificateId" direction="in">
- <tp:docstring>
- <p>A certificate ID</p>
- </tp:docstring>
- </arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="Boolean"/>
- <arg type="b" name="details" direction="out">
- <tp:docstring>
- <p>True if the search started</p>
- </tp:docstring>
- </arg>
- </method>
-
- <method name="banCertificate" tp:name-for-bindings="banCertificate">
- <arg type="s" name="certificateId" direction="in">
- <tp:docstring>
- <p>A certificate ID</p>
- </tp:docstring>
- </arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="Boolean"/>
- <arg type="b" name="details" direction="out">
- <tp:docstring>
- <p>True if the certificate was actually banned.</p>
- </tp:docstring>
- </arg>
- </method>
-
- <signal name="certificateAdded" tp:name-for-bindings="certificateAdded">
- <tp:docstring>
- Notify clients that a certificate have been added to the store.
- </tp:docstring>
- <arg type="s" name="certId">
- </arg>
- </signal>
-
- <signal name="certificateExpired" tp:name-for-bindings="certificateExpired">
- <tp:docstring>
- Notify clients that a certificate expired.
- </tp:docstring>
- <arg type="s" name="certId">
- </arg>
- </signal>
-
<method name="getAddrFromInterfaceName" tp:name-for-bindings="getAddrFromInterfaceName">
<arg type="s" name="interface" direction="in">
</arg>
--
GitLab