messaging-framework

Merge lp:~phablet-team/messaging-framework/telepathy-metadata-interface into lp:messaging-framework

telepathy-metadata-interface
Merge into trunk

Proposed by Roberto Mier Escandon on 2016-08-19

Status:	Needs review
Proposed branch:	lp:~phablet-team/messaging-framework/telepathy-metadata-interface
Merge into:	lp:messaging-framework
Diff against target:	345 lines (+258/-3) 7 files modified include/messaging/qt/tp/interfaces/base_channel_destroyable_internal.h (+1/-1) include/messaging/qt/tp/interfaces/base_channel_file_transfer_metadata.h (+76/-0) include/messaging/qt/tp/interfaces/base_channel_file_transfer_metadata_internal.h (+54/-0) include/messaging/qt/tp/interfaces/base_channel_roles_internal.h (+2/-1) include/messaging/qt/tp/interfaces/types.h (+4/-1) src/CMakeLists.txt (+3/-0) src/messaging/qt/tp/interfaces/base_channel_file_transfer_metadata.cpp (+118/-0)
To merge this branch:	bzr merge lp:~phablet-team/messaging-framework/telepathy-metadata-interface
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Approve on 2016-09-14
Ubuntu Phablet Team		2016-08-19	Pending
Review via email: mp+303473@code.launchpad.net

Commit message

Implementation of interface described here https://telepathy.freedesktop.org/spec/Channel_Interface_File_Transfer_Metadata.html

This interface is needed to hold file transfer identifier while channel is active

Modified some bad modificators in the other interfaces

Description of the change

Implementation of interface described here https://telepathy.freedesktop.org/spec/Channel_Interface_File_Transfer_Metadata.html

Modified some bad modificators in the other interfaces

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-22:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/41/rebuild

review: Approve (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-30:

FAILED: Continuous integration, rev:56
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/47/
Executed test runs:
FAILURE: https://jenkins.canonical.com/system-apps/job/build/1358/console
FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1358/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/47/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-09-09:

FAILED: Continuous integration, rev:56
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/69/
Executed test runs:
FAILURE: https://jenkins.canonical.com/system-apps/job/build/1457/console
FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1457/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/69/rebuild

review: Needs Fixing (continuous-integration)

lp:~phablet-team/messaging-framework/telepathy-metadata-interface updated on 2016-09-09

57. By Roberto Mier Escandon on 2016-09-09: merged trunk

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-09-09:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/71/rebuild

review: Approve (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-09-14:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/74/rebuild

review: Approve (continuous-integration)

Unmerged revisions

57. By Roberto Mier Escandon on 2016-09-09: merged trunk
56. By Roberto Mier Escandon on 2016-08-19: finished implementation
55. By Roberto Mier Escandon on 2016-08-19: first code

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Ubuntu Phablet Team

 === modified file 'include/messaging/qt/tp/interfaces/base_channel_destroyable_internal.h'
 --- include/messaging/qt/tp/interfaces/base_channel_destroyable_internal.h	2016-06-08 16:22:14 +0000
 +++ include/messaging/qt/tp/interfaces/base_channel_destroyable_internal.h	2016-09-09 09:33:30 +0000
@@ -40,7 +40,7 @@
  public Q_SLOTS:
      void destroy(const Tp::Service::ChannelInterfaceDestroyableAdaptor::DestroyContextPtr &context);
--public:
++private:
      BaseChannelDestroyableInterface *mInterface;
  };
 === added file 'include/messaging/qt/tp/interfaces/base_channel_file_transfer_metadata.h'
 --- include/messaging/qt/tp/interfaces/base_channel_file_transfer_metadata.h	1970-01-01 00:00:00 +0000
 +++ include/messaging/qt/tp/interfaces/base_channel_file_transfer_metadata.h	2016-09-09 09:33:30 +0000
@@ -0,0 +1,76 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef MESSAGING_QT_TP_INTERFACES_BASE_CHANNEL_FILE_TRANSFER_METADATA_H
++#define MESSAGING_QT_TP_INTERFACES_BASE_CHANNEL_FILE_TRANSFER_METADATA_H
++
++#include <messaging/visibility.h>
++
++#include <TelepathyQt/BaseChannel>
++
++#include <messaging/qt/tp/interfaces/types.h>
++
++namespace messaging
++{
++namespace qt
++{
++namespace tp
++{
++namespace interfaces
++{
++
++class MESSAGING_FW_LOCAL BaseChannelFileTransferMetadataInterface : public Tp::AbstractChannelInterface
++{
++    Q_OBJECT
++    Q_DISABLE_COPY(BaseChannelFileTransferMetadataInterface)
++
++public:
++    static BaseChannelFileTransferMetadataInterfacePtr create(const QString &serviceName,
++                                                              const Tp::Metadata &metadata) {
++        return BaseChannelFileTransferMetadataInterfacePtr(
++                    new BaseChannelFileTransferMetadataInterface(serviceName,
++                                                                 metadata));
++    }
++    template<typename BaseChannelFileTransferMetadataInterfaceSubclass>
++    static Tp::SharedPtr<BaseChannelFileTransferMetadataInterfaceSubclass> create(const QString &serviceName,
++                                                                                  const Tp::Metadata &metadata) {
++        return Tp::SharedPtr<BaseChannelFileTransferMetadataInterfaceSubclass>(
++                   new BaseChannelFileTransferMetadataInterfaceSubclass(serviceName, metadata));
++    }
++    virtual ~BaseChannelFileTransferMetadataInterface();
++
++    QVariantMap immutableProperties() const;
++
++    QString serviceName() const;
++    Tp::Metadata metadata() const;
++
++private:
++    BaseChannelFileTransferMetadataInterface(const QString &serviceName, const Tp::Metadata &metadata);
++    void createAdaptor();
++
++    class Adaptee;
++    friend class Adaptee;
++    struct Private;
++    friend struct Private;
++    Private *mPriv;
++};
++
++}
++}
++}
++}
++#endif // MESSAGING_QT_TP_INTERFACES_BASE_CHANNEL_FILE_TRANSFER_METADATA_H
++
 === added file 'include/messaging/qt/tp/interfaces/base_channel_file_transfer_metadata_internal.h'
 --- include/messaging/qt/tp/interfaces/base_channel_file_transfer_metadata_internal.h	1970-01-01 00:00:00 +0000
 +++ include/messaging/qt/tp/interfaces/base_channel_file_transfer_metadata_internal.h	2016-09-09 09:33:30 +0000
@@ -0,0 +1,54 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef MESSAGING_QT_TP_INTERFACES_BASE_CHANNEL_FILE_TRANSFER_METADATA_INTERNAL
++#define MESSAGING_QT_TP_INTERFACES_BASE_CHANNEL_FILE_TRANSFER_METADATA_INTERNAL
++
++#include <TelepathyQt/_gen/svc-channel.h>
++#include <messaging/qt/tp/interfaces/base_channel_file_transfer_metadata.h>
++
++namespace messaging
++{
++namespace qt
++{
++namespace tp
++{
++namespace interfaces
++{
++
++class MESSAGING_FW_LOCAL BaseChannelFileTransferMetadataInterface::Adaptee : public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(QString serviceName READ serviceName)
++    Q_PROPERTY(Tp::Metadata metadata READ metadata)
++
++public:
++    Adaptee(BaseChannelFileTransferMetadataInterface *interface);
++    ~Adaptee();
++
++    QString serviceName() const;
++    Tp::Metadata metadata() const;
++
++private:
++    BaseChannelFileTransferMetadataInterface *mInterface;
++};
++
++}
++}
++}
++}
++#endif // BASE_CHANNEL_FILE_TRANSFER_METADATA_INTERNAL
++
 === modified file 'include/messaging/qt/tp/interfaces/base_channel_roles_internal.h'
 --- include/messaging/qt/tp/interfaces/base_channel_roles_internal.h	2016-08-11 21:13:16 +0000
 +++ include/messaging/qt/tp/interfaces/base_channel_roles_internal.h	2016-09-09 09:33:30 +0000
@@ -35,6 +35,7 @@
      Q_OBJECT
      Q_PROPERTY(HandleRolesMap roles READ roles)
      Q_PROPERTY(bool canUpdateRoles READ canUpdateRoles)
++
  public:
      Adaptee(BaseChannelRolesInterface *interface);
      ~Adaptee();
@@ -48,7 +49,7 @@
  Q_SIGNALS:
      void rolesChanged(const HandleRolesMap &added, const HandleRolesMap& removed);
--public:
++private:
      BaseChannelRolesInterface *mInterface;
  };
 === modified file 'include/messaging/qt/tp/interfaces/types.h'
 --- include/messaging/qt/tp/interfaces/types.h	2016-08-16 16:23:42 +0000
 +++ include/messaging/qt/tp/interfaces/types.h	2016-09-09 09:33:30 +0000
@@ -19,6 +19,8 @@
  #include <messaging/visibility.h>
++#include <TelepathyQt/SharedPtr>
++
  #include <QMap>
  #include <TelepathyQt/Types>
@@ -31,12 +33,13 @@
  namespace interfaces
+ {
++class BaseChannelFileTransferMetadataInterface;
  class BaseChannelDestroyableInterface;
  class BaseChannelRolesInterface;
  typedef Tp::SharedPtr<BaseChannelDestroyableInterface> BaseChannelDestroyableInterfacePtr;
  typedef Tp::SharedPtr<BaseChannelRolesInterface> BaseChannelRolesInterfacePtr;
--
++typedef Tp::SharedPtr<BaseChannelFileTransferMetadataInterface> BaseChannelFileTransferMetadataInterfacePtr;
  /**
   * \struct HandleRolesMap
 === modified file 'src/CMakeLists.txt'
 --- src/CMakeLists.txt	2016-08-26 14:11:06 +0000
 +++ src/CMakeLists.txt	2016-09-09 09:33:30 +0000
@@ -7,6 +7,8 @@
                                 ${CMAKE_SOURCE_DIR}/include/messaging/qt/tp/text_channel.h
                                 ${CMAKE_SOURCE_DIR}/include/messaging/qt/tp/interfaces/base_channel_destroyable.h
                                 ${CMAKE_SOURCE_DIR}/include/messaging/qt/tp/interfaces/base_channel_destroyable_internal.h
++                               ${CMAKE_SOURCE_DIR}/include/messaging/qt/tp/interfaces/base_channel_file_transfer_metadata.h
++                               ${CMAKE_SOURCE_DIR}/include/messaging/qt/tp/interfaces/base_channel_file_transfer_metadata_internal.h
                                 ${CMAKE_SOURCE_DIR}/include/messaging/qt/tp/interfaces/base_channel_roles.h
                                 ${CMAKE_SOURCE_DIR}/include/messaging/qt/tp/interfaces/base_channel_roles_internal.h
                                 ${CMAKE_SOURCE_DIR}/include/messaging/qt/tp/interfaces/channel_interface_roles_adaptor.h)
@@ -47,6 +49,7 @@
      messaging/qt/tp/text_channel.cpp
      messaging/qt/tp/interfaces/base_channel_destroyable.cpp
++    messaging/qt/tp/interfaces/base_channel_file_transfer_metadata.cpp
      messaging/qt/tp/interfaces/base_channel_roles.cpp
      messaging/qt/tp/interfaces/channel_interface_roles_adaptor.cpp
 === added file 'src/messaging/qt/tp/interfaces/base_channel_file_transfer_metadata.cpp'
 --- src/messaging/qt/tp/interfaces/base_channel_file_transfer_metadata.cpp	1970-01-01 00:00:00 +0000
 +++ src/messaging/qt/tp/interfaces/base_channel_file_transfer_metadata.cpp	2016-09-09 09:33:30 +0000
@@ -0,0 +1,118 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <TelepathyQt/DBusObject>
++#include <messaging/qt/tp/interfaces/base_channel_file_transfer_metadata.h>
++#include <messaging/qt/tp/interfaces/base_channel_file_transfer_metadata_internal.h>
++
++namespace mqt = messaging::qt::tp;
++namespace mqti = messaging::qt::tp::interfaces;
++
++// Chan.I.FileTransfer.Metadata
++struct MESSAGING_FW_LOCAL mqti::BaseChannelFileTransferMetadataInterface::Private {
++    Private(BaseChannelFileTransferMetadataInterface *parent,
++            const QString &serviceName,
++            const Tp::Metadata &metadata)
++        : serviceName{serviceName}
++        , metadata{metadata}
++        , adaptee(new BaseChannelFileTransferMetadataInterface::Adaptee(parent)) {
++    }
++
++    QString serviceName;
++    Tp::Metadata metadata;
++    BaseChannelFileTransferMetadataInterface::Adaptee *adaptee;
++};
++
++mqti::BaseChannelFileTransferMetadataInterface::Adaptee::Adaptee(BaseChannelFileTransferMetadataInterface *interface)
++    : QObject(interface)
++    , mInterface(interface)
++{
++}
++
++mqti::BaseChannelFileTransferMetadataInterface::Adaptee::~Adaptee()
++{
++}
++
++QString mqti::BaseChannelFileTransferMetadataInterface::Adaptee::serviceName() const
++{
++    return mInterface->serviceName();
++}
++
++Tp::Metadata mqti::BaseChannelFileTransferMetadataInterface::Adaptee::metadata() const
++{
++    return mInterface->metadata();
++}
++
++/**
++ * \class BaseChannelFileTransferMetadataInterface
++ *
++ * \brief Base class for implementations of Channel.Interface.FileTransfer.Metadata
++ *
++ */
++
++/**
++ * Class constructor.
++ */
++mqti::BaseChannelFileTransferMetadataInterface::BaseChannelFileTransferMetadataInterface(
++        const QString &serviceName, const Tp::Metadata &metadata)
++    : Tp::AbstractChannelInterface(TP_QT_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA)
++    , mPriv(new Private(this, serviceName, metadata))
++{
++}
++
++/**
++ * Class destructor.
++ */
++mqti::BaseChannelFileTransferMetadataInterface::~BaseChannelFileTransferMetadataInterface()
++{
++    delete mPriv;
++}
++
++
++/**
++ * Return the immutable properties of this interface.
++ *
++ * Immutable properties cannot change after the interface has been registered
++ * on a service on the bus with registerInterface().
++ *
++ * \return The immutable properties of this interface.
++ */
++QVariantMap mqti::BaseChannelFileTransferMetadataInterface::immutableProperties() const
++{
++    QVariantMap map;
++    map.insert(TP_QT_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA + QLatin1String(".ServiceName"),
++               QVariant::fromValue(mPriv->adaptee->serviceName()));
++    map.insert(TP_QT_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA + QLatin1String(".Metadata"),
++               QVariant::fromValue(mPriv->adaptee->metadata()));
++    return map;
++}
++
++void mqti::BaseChannelFileTransferMetadataInterface::createAdaptor()
++{
++    (void) new Tp::Service::ChannelInterfaceFileTransferMetadataAdaptor(dbusObject()->dbusConnection(),
++            mPriv->adaptee, dbusObject());
++}
++
++QString mqti::BaseChannelFileTransferMetadataInterface::serviceName() const
++{
++    return mPriv->serviceName;
++}
++
++Tp::Metadata mqti::BaseChannelFileTransferMetadataInterface::metadata() const
++{
++    return mPriv->metadata;
++}
++