certificate: Turn off some user visible changes and prints

 * Fix the OS X build
 * Remove some prints
 * Bump daemon xml API to the latest revision
 * Prepare for merge

Refs #68196

src/daemoncertificatecollection.cpp

@@ -85,26 +85,26 @@ DaemonCertificateCollection::~DaemonCertificateCollection()
 
 void DaemonCertificateCollectionPrivate::slotCertificatePinned(const QString& id)
 {
-   qDebug() << "\n\nCERTIFICATE ADDED" << id;
+   //qDebug() << "\n\nCERTIFICATE ADDED" << id;
    Certificate* cert = CertificateModel::instance()->getCertificateFromId(id);
    q_ptr->editor<Certificate>()->addExisting(cert);
 }
 
 void DaemonCertificateCollectionPrivate::slotCertificateExpired(const QString& id)
 {
-   qDebug() << "\n\nCERTIFICATE EXPIRED" << id;
+   //qDebug() << "\n\nCERTIFICATE EXPIRED" << id;
 }
 
 void DaemonCertificateCollectionPrivate::slotCertificatePathPinned(const QString& path, const QStringList& certIds)
 {
    //Create a new collection if it is a directory or size > 1
-   qDebug() << "\n\nCERTIFICATE PATH PINNING" << path << certIds;
+   //qDebug() << "\n\nSIGNAL CERTIFICATE PATH PINNING" << path << certIds;
 }
 
 bool DaemonCertificateCollection::load()
 {
    ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
-   qDebug() << "\n\nLOADING CERTS" << QStringList(configurationManager.getPinnedCertificates());
+   //qDebug() << "\n\nLOADING CERTS" << QStringList(configurationManager.getPinnedCertificates());
    return false;
 }
 

src/foldercertificatecollection.cpp

@@ -30,6 +30,9 @@
 #include "certificatemodel.h"
 #include "delegates/pixmapmanipulationdelegate.h"
 
+//Dring
+#include "dbus/configurationmanager.h"
+
 class FallbackLocalCertificateEditor : public CollectionEditor<Certificate>
 {
 public:
@@ -214,6 +217,12 @@ FlagPack<CollectionInterface::SupportedFeatures> FolderCertificateCollection::su
 }
 
 
+QUrl FolderCertificateCollection::path() const
+{
+   return QUrl(d_ptr->m_Path);
+}
+
+
 /*******************************************************************************
  *                                                                             *
  *                                   Editor                                    *
@@ -336,6 +345,10 @@ void BackgroundLoader::run()
          Certificate* cert = CertificateModel::instance()->getCertificateFromContent(loadCertificate(id),m_pCurrentFolder->name(),false);
          m_pCurrentFolder->editor<Certificate>()->addExisting(cert);
       }
+
+      ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
+      //qDebug() << "\n\nPINING PATH TODO remove extra /" << m_pCurrentFolder->path();
+      configurationManager.pinCertificatePath(m_pCurrentFolder->path().path()+'/');
    }
    FolderCertificateCollectionPrivate::m_spLoader = nullptr;
    QThread::exit(0);

src/foldercertificatecollection.h

@@ -54,6 +54,7 @@ public:
 
    virtual ~FolderCertificateCollection();
 
+   //Re-implementation
    virtual bool load  () override;
    virtual bool reload() override;
    virtual bool clear () override;
@@ -64,9 +65,11 @@ public:
    virtual bool           isEnabled() const override;
    virtual QByteArray     id       () const override;
    virtual QList<Element> listId   () const override;
-
    virtual FlagPack<SupportedFeatures> supportedFeatures() const override;
 
+   //Getter
+   QUrl path() const;
+
 private:
    FolderCertificateCollectionPrivate* d_ptr;
    Q_DECLARE_PRIVATE(FolderCertificateCollection)

src/private/certificatemodel_p.h

@@ -20,6 +20,7 @@
 
 #include "matrixutils.h"
 
+#include <QtCore/QMutex>
 struct CertificateNode;
 class Account;
 class Certificate;

src/qtwrapper/instancemanager.cpp

@@ -48,7 +48,7 @@ InstanceInterface::InstanceInterface() : m_pTimer(nullptr)
 #ifdef Q_OS_WIN
    connect(m_pTimer,SIGNAL(timeout()),this,SLOT(pollEvents()));
 #else
-   connect(m_pTimer,&QTimer:timeout,this,&InstanceInterface::pollEvents);
+   connect(m_pTimer,&QTimer::timeout,this,&InstanceInterface::pollEvents);
 #endif
    m_pTimer->start();
    ringFlags |= DRing::DRING_FLAG_DEBUG;

src/uri.cpp

@@ -200,7 +200,7 @@ URI::SchemeType URI::schemeType() const
  */
 bool URIPrivate::checkIp(const QString& str, bool &isHash, const URI::SchemeType& scheme)
 {
-   char* raw = str.toLatin1().data();
+   const QByteArray raw = str.toLatin1();
    ushort max = str.size();
 
    if (max < 3 || max > 45 || (!isHash && scheme == URI::SchemeType::RING))

xml/callmanager-introspec.xml

@@ -520,6 +520,7 @@
                 The acceptable states are:
                 <ul>
                   <li>INCOMING: Initial state of incoming calls</li>
+                  <li>CONNECTING: Peer found, contacting him</li>
                   <li>RINGING: Initial state of received outgoing call</li>
                   <li>CURRENT: The normal active state of an answered call</li>
                   <li>HUNGUP: Notify that the call has been hungup by peer</li>

xml/configurationmanager-introspec.xml

@@ -828,6 +828,18 @@
           </arg>
        </method>
 
+       <signal name="certificateStateChanged" tp:name-for-bindings="certificateStateChanged">
+            <tp:docstring>
+                Notify clients that a certificate status have changed.
+            </tp:docstring>
+           <arg type="s" name="accountId">
+           </arg>
+           <arg type="s" name="certId">
+           </arg>
+           <arg type="s" name="state">
+           </arg>
+       </signal>
+
        <signal name="certificatePinned" tp:name-for-bindings="certificatePinned">
             <tp:docstring>
                 Notify clients that a certificate have been added to the store.
@@ -835,6 +847,7 @@
            <arg type="s" name="certId">
            </arg>
        </signal>
+
        <signal name="certificatePathPinned" tp:name-for-bindings="certificatePathPinned">
             <tp:docstring>
                 Notify clients that a certificate path have been added to the store.