Merge lp:~phablet-team/messaging-framework/multiple_api_fixes into lp:messaging-framework

[Tiago Salem Herrmann]

Allow plugins to disable network monitor and to set self user id.

Allow plugins to disable network monitor and to set self user id.

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:73
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/108/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2201
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/570
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2204
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2031
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2031/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2031
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2031/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2031
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2031/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2031
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2031/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2031
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2031/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2031
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2031/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/2031
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/2031/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2031
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2031/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2031
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2031/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Roberto Mier Escandon (rmescandon)]

Lgtm

review: Approve

[lp:~phablet-team/messaging-framework/multiple_api_fixes]

74. By Renato Araujo Oliveira Filho on 2016-12-21

Trunk merged.

75. By Renato Araujo Oliveira Filho on 2016-12-21

Merged: lp:~phablet-team/messaging-framework/prepare_for_release

76. By Tiago Salem Herrmann on 2017-01-12

Do not test flags if it none

77. By Tiago Salem Herrmann on 2017-01-26

Only add self handle if it's not present on remote and regular users

78. By Gustavo Pichorim Boiko on 2017-01-27

Set the self contact as pending remote when creating rooms

79. By Tiago Salem Herrmann on 2017-02-23

bump clang version

80. By Tiago Salem Herrmann on 2017-02-24

try remove clang-format as it's not available on zesty

81. By Tiago Salem Herrmann on 2017-03-06

force unregister objects after disconnection

82. By Tiago Salem Herrmann on 2017-03-15

Set group self handle

83. By Tiago Salem Herrmann on 2017-03-15

Add persistent property

84. By Gustavo Pichorim Boiko on 2017-03-22

merge trunk

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

Unmerged revisions

84. By Gustavo Pichorim Boiko on 2017-03-22

merge trunk

83. By Tiago Salem Herrmann on 2017-03-15

Add persistent property

82. By Tiago Salem Herrmann on 2017-03-15

Set group self handle

81. By Tiago Salem Herrmann on 2017-03-06

force unregister objects after disconnection

80. By Tiago Salem Herrmann on 2017-02-24

try remove clang-format as it's not available on zesty

79. By Tiago Salem Herrmann on 2017-02-23

bump clang version

78. By Gustavo Pichorim Boiko on 2017-01-27

Set the self contact as pending remote when creating rooms

77. By Tiago Salem Herrmann on 2017-01-26

Only add self handle if it's not present on remote and regular users

76. By Tiago Salem Herrmann on 2017-01-12

Do not test flags if it none

75. By Renato Araujo Oliveira Filho on 2016-12-21

Merged: lp:~phablet-team/messaging-framework/prepare_for_release

=== modified file 'debian/control.in'
--- debian/control.in	2016-11-18 23:50:19 +0000
+++ debian/control.in	2017-03-22 21:19:38 +0000
@@ -3,7 +3,6 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: astyle,
-               clang-format-3.5:native,
                clang:native,
                cmake,
                debhelper (>= 9),

=== modified file 'include/messaging/connection.h'
--- include/messaging/connection.h	2016-10-21 14:02:19 +0000
+++ include/messaging/connection.h	2017-03-22 21:19:38 +0000
@@ -72,6 +72,8 @@
         /// @param reason The reason why the connection status changed.
         virtual void on_status_changed(Status status, StatusChangedReason reason) = 0;
 
+        virtual void on_self_id_changed(const std::string &self_id) = 0;
+
       protected:
         Observer() = default;
         
@@ -112,6 +114,8 @@
     /// A note to integrators: It is safe to call this function from any thread.
     void announce_status_changed(Status status, StatusChangedReason reason);
 
+    void announce_self_id_changed(const std::string &self_id);
+    
 private:
     /// @cond
     struct Private;

=== modified file 'include/messaging/connector.h'
--- include/messaging/connector.h	2016-06-07 18:15:24 +0000
+++ include/messaging/connector.h	2017-03-22 21:19:38 +0000
@@ -57,6 +57,8 @@
                                                 const std::shared_ptr<messaging::PresenceManager::Observer>& presence_observer,
                                                 const messaging::Dictionary<std::string, messaging::Variant>& dict) = 0;
 
+    virtual bool network_monitor_enabled() = 0;
+
 protected:
     // Only subclasses can instantiate.
     Connector() = default;

=== modified file 'include/messaging/group_manager.h'
--- include/messaging/group_manager.h	2016-10-09 16:01:04 +0000
+++ include/messaging/group_manager.h	2017-03-22 21:19:38 +0000
@@ -108,6 +108,9 @@
     /// @brief group_admins returns the list of admin identifiers
     virtual std::set<std::string> group_admins() = 0;
 
+    /// @brief check if group is persistent on server side
+    virtual bool persistent() = 0;
+
     /// @brief members returns current participants in the group.
     virtual Members members() = 0;
 

=== modified file 'include/messaging/plugin_connector.h'
--- include/messaging/plugin_connector.h	2016-06-07 18:15:24 +0000
+++ include/messaging/plugin_connector.h	2017-03-22 21:19:38 +0000
@@ -82,6 +82,8 @@
     /// @brief stop requests the connector to stop executing.
     void stop() override;
 
+    bool network_monitor_enabled() override;
+
     std::shared_ptr<Connection> request_connection(const std::shared_ptr<messaging::Connection::Observer>& connection_observer,
                                                    const std::shared_ptr<messaging::Messenger::Observer>& messenger_observer,
                                                    const std::shared_ptr<messaging::PresenceManager::Observer>& presence_observer,

=== modified file 'include/messaging/qt/network_monitor.h'
--- include/messaging/qt/network_monitor.h	2016-07-18 11:42:37 +0000
+++ include/messaging/qt/network_monitor.h	2017-03-22 21:19:38 +0000
@@ -42,7 +42,7 @@
         NetworkPartialOnline,
         NetworkOnline
     };
-    NetworkMonitor(const std::weak_ptr<Connection> &connection, QObject *parent=0);
+    NetworkMonitor(const std::weak_ptr<Connection> &connection, bool network_monitor_enabled = true, QObject *parent=0);
     virtual ~NetworkMonitor();
 
     void stop_monitoring();

=== modified file 'include/messaging/qt/tp/connection.h'
--- include/messaging/qt/tp/connection.h	2016-08-23 22:33:39 +0000
+++ include/messaging/qt/tp/connection.h	2017-03-22 21:19:38 +0000
@@ -32,6 +32,8 @@
 
 #include <memory>
 
+#include <QMutex>
+
 namespace messaging
 {
 // A handy fwd declaration
@@ -91,6 +93,8 @@
         ///
         /// Implemented from messaging::Connection::Observer.
         void on_status_changed(messaging::Connection::Status new_status, messaging::Connection::StatusChangedReason reason) override;
+        
+        void on_self_id_changed(const std::string &self_id) override;
 
         /// @brief on_message_without_chat_received called when received a messages that creates a new chat
         void on_message_without_chat_received(const Recipient::shared_ptr& recipient, const Message &message) override;
@@ -106,6 +110,7 @@
         Tp::SharedPtr<Connection> connection; ///< The managed connection instance.
     };
 
+    void on_self_id_changed(const std::string &self_id) override;
     /// @brief on_message_without_chat_received implementation of messaging::Messaging::Observer method
     void on_message_without_chat_received(const Recipient::shared_ptr& recipient, const Message &message) override;
 

=== modified file 'src/messaging/connection.cpp'
--- src/messaging/connection.cpp	2016-10-24 10:12:54 +0000
+++ src/messaging/connection.cpp	2017-03-22 21:19:38 +0000
@@ -32,3 +32,8 @@
 {
     impl->observer->on_status_changed(new_status, reason);
 }
+
+void messaging::Connection::announce_self_id_changed(const std::string &self_id)
+{
+    impl->observer->on_self_id_changed(self_id);
+}

=== modified file 'src/messaging/plugin_connector.cpp'
--- src/messaging/plugin_connector.cpp	2016-06-07 18:15:24 +0000
+++ src/messaging/plugin_connector.cpp	2017-03-22 21:19:38 +0000
@@ -118,3 +118,8 @@
 {
     connector->stop();
 }
+
+bool messaging::PluginConnector::network_monitor_enabled()
+{
+    connector->network_monitor_enabled();
+}

=== modified file 'src/messaging/qt/network_monitor.cpp'
--- src/messaging/qt/network_monitor.cpp	2016-10-25 18:16:46 +0000
+++ src/messaging/qt/network_monitor.cpp	2017-03-22 21:19:38 +0000
@@ -8,14 +8,16 @@
 
 namespace mq = messaging::qt;
 
-mq::NetworkMonitor::NetworkMonitor(const std::weak_ptr<Connection> &connection, QObject *parent)
+mq::NetworkMonitor::NetworkMonitor(const std::weak_ptr<Connection> &connection, bool network_monitor_enabled, QObject *parent)
     : QObject(parent)
     , network_config_manager_{this}
     , connection_{connection}
     , current_ssid_{}
     , is_connection_ready_{false}
 {
-    start_monitoring();
+    if (network_monitor_enabled) {
+        start_monitoring();
+    }
 }
 
 mq::NetworkMonitor::~NetworkMonitor()

=== modified file 'src/messaging/qt/tp/connection.cpp'
--- src/messaging/qt/tp/connection.cpp	2016-10-24 10:35:20 +0000
+++ src/messaging/qt/tp/connection.cpp	2017-03-22 21:19:38 +0000
@@ -57,6 +57,15 @@
 {
 }
 
+void mqt::tp::Connection::Observer::on_self_id_changed(const std::string &self_id)
+{
+    auto sp = shared_from_this();
+    runtime->enter_with_task([sp, self_id]()
+                             {
+                                 sp->connection->on_self_id_changed(self_id);
+                             });
+}
+
 void mqt::tp::Connection::Observer::on_status_changed(messaging::Connection::Status new_status, messaging::Connection::StatusChangedReason reason)
 {
     auto sp = shared_from_this();
@@ -87,10 +96,16 @@
 void mqt::tp::Connection::Observer::on_new_group_invitation_received(const messaging::Group::shared_ptr& new_group)
 {
     auto sp = shared_from_this();
-    runtime->enter_with_task([sp, new_group]()
+    QMutex mutex;
+    QWaitCondition wait;
+    
+    runtime->enter_with_task([sp, new_group, &mutex, &wait]()
                              {
                                  sp->connection->on_new_group_invitation_received(new_group);
+                                 wait.wakeAll();
+                                 mutex.unlock();
                              });
+    wait.wait(&mutex);
 }
 
 Tp::SharedPtr<mqt::tp::Connection> mqt::tp::Connection::create(const std::shared_ptr<msg::Connector>& connector,
@@ -150,7 +165,7 @@
     , connector{connector}
     , observer{std::make_shared<mqt::tp::Connection::Observer>(runtime, Tp::SharedPtr<mqt::tp::Connection>{this})}
     , connection{connector->request_connection(observer, observer, observer, mqt::VariantMapFacade{parameters})}
-    , network_monitor_{connection}
+    , network_monitor_{connection, connector->network_monitor_enabled()}
 {
     qRegisterMetaType<messaging::Recipient::shared_ptr>();
 
@@ -256,8 +271,19 @@
     {
         LOG(ERROR) << "An exception has been thrown when disconnecting framework connection implementation";
     }
+   
+    QTimer::singleShot(250, [=](){
+        dbusConnection().unregisterObject(objectPath(), QDBusConnection::UnregisterTree);
+        dbusConnection().unregisterService(busName());
+
+    });
 }
  
+void mqt::tp::Connection::on_self_id_changed(const std::string &self_id)
+{
+    setSelfID(self_id.c_str());
+}
+
 void mqt::tp::Connection::on_message_without_chat_received(const Recipient::shared_ptr& recipient, const messaging::Message &message)
 {
     if (recipient->type() != messaging::RecipientType::user) {
@@ -641,8 +667,13 @@
                         handles_.left.find(target_handle)->second.toLatin1().data());
             break;
         case Tp::HandleTypeRoom: {
+            messaging::Members initial_invitees;
+            initial_invitees.push_back(std::make_shared<Member>(connection->self_identifier(),
+                                                                        PendingStatus::Remote,
+                                                                        Flags<Role>(Role::Member),
+                                                                        std::string{}/* display_name*/ ));
             recipient = std::make_shared<messaging::Group>(
-                     group_handles_.left.find(target_handle)->second.toLatin1().data());
+                     group_handles_.left.find(target_handle)->second.toLatin1().data(), initial_invitees);
 
             try
             {
@@ -665,6 +696,10 @@
                     additional_properties[Group::SUBJECT] = std::make_shared<messaging::BoostVariant>(group_manager->group_subject());
                 }
                 auto members = group_manager->members();
+                members.push_back(std::make_shared<Member>(connection->self_identifier(),
+                                                                        PendingStatus::Remote,
+                                                                        Flags<Role>(Role::Member),
+                                                                        std::string{}/* display_name*/ ));
                 recipient = std::make_shared<messaging::Group>(
                             group_manager->group_id(),
                             members,
@@ -719,6 +754,10 @@
                                                                         is_room ? PendingStatus::Remote : PendingStatus::None,
                                                                         Flags<Role>(Role::Member),
                                                                         std::string{}/* display_name*/ ));
+                    initial_invitees.push_back(std::make_shared<Member>(connection->self_identifier(),
+                                                                        PendingStatus::Remote,
+                                                                        Flags<Role>(Role::Member),
+                                                                        std::string{}/* display_name*/ ));
                 }
             }
 

=== modified file 'src/messaging/qt/tp/protocol.cpp'
--- src/messaging/qt/tp/protocol.cpp	2016-05-20 06:21:33 +0000
+++ src/messaging/qt/tp/protocol.cpp	2017-03-22 21:19:38 +0000
@@ -43,7 +43,10 @@
 
 Tp::ConnMgrParamFlags parameter_flags_to_qt_tp(const messaging::Parameter::Flags& flags)
 {
-    Tp::ConnMgrParamFlags result;
+    Tp::ConnMgrParamFlags result = 0;
+    if (flags == messaging::Parameter::Flags::none) {
+        return result;
+    }
 
     if (FlagHelper<messaging::Parameter::Flags>::is_set_in<messaging::Parameter::Flags::required>(flags))
     {

=== modified file 'src/messaging/qt/tp/text_channel.cpp'
--- src/messaging/qt/tp/text_channel.cpp	2016-10-19 09:19:08 +0000
+++ src/messaging/qt/tp/text_channel.cpp	2017-03-22 21:19:38 +0000
@@ -328,8 +328,7 @@
                                                             &error)[0];
         if (error.isValid())
         {
-            LOG(ERROR) << "Could not get creator handle";
-            return;
+            LOG(WARNING) << "Could not get creator handle";
         }
 
         // NOTE (rmescandon): Build and populate values for Subject interface before than roomConfig one. This is needed for having
@@ -372,6 +371,7 @@
             return;
         }
 
+        room_config_interface->setPersistent(group_manager->persistent());
         room_config_interface->setConfigurationRetrieved(true);
 
         // As telepathy does not offer a way to differentiate whether it can be changed one configuration element
@@ -386,6 +386,7 @@
                                            Tp::ChannelGroupFlagProperties;
         group_interface = Tp::BaseChannelGroupInterface::create();
         group_interface->setGroupFlags(groupFlags);
+        group_interface->setSelfHandle(tp_connection->selfHandle());
 
         roles_interface = interfaces::BaseChannelRolesInterface::create();
 
@@ -406,6 +407,7 @@
                                            Tp::ChannelGroupFlagProperties;
         group_interface = Tp::BaseChannelGroupInterface::create();
         group_interface->setGroupFlags(groupFlags);
+        group_interface->setSelfHandle(tp_connection->selfHandle());
 
         // we need to plug this interface here to avoid a crash
         plug_interface_if_available(group_interface);
@@ -817,7 +819,10 @@
 
     // selfHandle will be set as member while the channel is active, so add it to received members. In case we are
     // expelled or the group is dissolved, let's remove that selfHandle from members
-    handles << tp_connection->selfHandle();
+    uint selfHandle = tp_connection->selfHandle();
+    if (!remote_handles.contains(selfHandle) && !handles.contains(selfHandle)) {
+        handles << tp_connection->selfHandle();
+    }
 
     group_interface->setMembers(handles, local_info_list, remote_handles,  /* details */ QVariantMap());
     if (!roles_interface.isNull())

=== modified file 'tests/mock_connection.h'
--- tests/mock_connection.h	2016-10-21 14:02:19 +0000
+++ tests/mock_connection.h	2017-03-22 21:19:38 +0000
@@ -37,6 +37,7 @@
     struct MockObserver : public messaging::Connection::Observer
     {
         MOCK_METHOD2(on_status_changed, void(messaging::Connection::Status, messaging::Connection::StatusChangedReason));
+        MOCK_METHOD1(on_self_id_changed, void(const std::string&));
     };
 
     MockConnection(const std::shared_ptr<messaging::Connection::Observer>& connection_observer,

=== modified file 'tests/mock_connector.h'
--- tests/mock_connector.h	2016-06-07 18:15:24 +0000
+++ tests/mock_connector.h	2017-03-22 21:19:38 +0000
@@ -44,6 +44,7 @@
                      const messaging::Dictionary<std::string, messaging::Variant>&));
     MOCK_METHOD0(run, void());
     MOCK_METHOD0(stop, void());
+    MOCK_METHOD0(network_monitor_enabled, bool());
 
 private:
     messaging::StdVectorEnumerator<messaging::Parameter> params_;

=== modified file 'tests/mock_group_manager.h'
--- tests/mock_group_manager.h	2016-10-09 16:01:04 +0000
+++ tests/mock_group_manager.h	2017-03-22 21:19:38 +0000
@@ -40,6 +40,7 @@
     MOCK_METHOD0(leave_group, void());
     MOCK_METHOD0(dissolve_group, void());
     MOCK_METHOD0(join_group, void());
+    MOCK_METHOD0(persistent, bool());
     MOCK_METHOD1(change_group_title, void(const std::string&));
     MOCK_METHOD1(change_group_subject, void(const std::string&));
     MOCK_METHOD1(add_members, void(const messaging::Members&));

=== modified file 'tests/unit/messaging/blocking_connector.cpp'
--- tests/unit/messaging/blocking_connector.cpp	2016-06-07 18:15:24 +0000
+++ tests/unit/messaging/blocking_connector.cpp	2017-03-22 21:19:38 +0000
@@ -48,3 +48,8 @@
     stop_requested = true;
     cv.notify_all();
 }
+
+bool testing::BlockingConnector::network_monitor_enabled()
+{
+    return true;
+}

=== modified file 'tests/unit/messaging/blocking_connector.h'
--- tests/unit/messaging/blocking_connector.h	2016-06-07 18:15:24 +0000
+++ tests/unit/messaging/blocking_connector.h	2017-03-22 21:19:38 +0000
@@ -39,6 +39,7 @@
         const messaging::Dictionary<std::string, messaging::Variant>&) override;
     void run() override;
     void stop() override;
+    bool network_monitor_enabled() override;
 
 private:
     std::mutex m;

=== modified file 'tests/unit/messaging/plugin_connector_test.cpp'
--- tests/unit/messaging/plugin_connector_test.cpp	2016-06-07 18:15:24 +0000
+++ tests/unit/messaging/plugin_connector_test.cpp	2017-03-22 21:19:38 +0000
@@ -51,6 +51,11 @@
     void stop() override
     {
     }
+
+    bool network_monitor_enabled() override
+    {
+        return true;
+    }
 };
 
 class Creator

=== modified file 'tests/unit/messaging/runner_test.cpp'
--- tests/unit/messaging/runner_test.cpp	2016-05-27 22:49:16 +0000
+++ tests/unit/messaging/runner_test.cpp	2017-03-22 21:19:38 +0000
@@ -73,6 +73,7 @@
 
     MOCK_METHOD0(run, int());
     MOCK_METHOD1(stop, void(int));
+    MOCK_METHOD0(network_manager_enabled, bool());
 };
 
 /// @brief the_dummy_runner returns a functor executing a runner with a dummy configuration,