Merge lp:~phablet-team/messaging-framework/last-minute-fixes into lp:messaging-framework

[Roberto Mier Escandon]

Bunch of last minute fixes:
- adding selfID along with selfHandle
- using connection->group_admin_ids to know who are the admins, and compare with selfID to know if we are admin also, instead of querying existing members and guess.

NOTE: This branch should be landed along with https://code.launchpad.net/~ningbo-team/ningbo/last-minute-fixes/+merge/308007

Bunch of last minute fixes:
- adding selfID along with selfHandle
- using connection->group_admin_ids to know who are the admins, and compare with selfID to know if we are admin also, instead of querying existing members and guess.

NOTE: This branch should be landed along with https://code.launchpad.net/~ningbo-team/ningbo/last-minute-fixes/+merge/308007

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

FAILED: Continuous integration, rev:75
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/87/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1834/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1835
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1675/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1675/console

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

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

there was only one bug leading to a crash when using broadcast chats, but it is now fixed.
thanks.

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'include/messaging/group_manager.h'
--- include/messaging/group_manager.h	2016-09-14 07:44:10 +0000
+++ include/messaging/group_manager.h	2016-10-12 14:43:53 +0000
@@ -105,6 +105,9 @@
     /// @brief creator returns the creator of the group being managed
     virtual std::shared_ptr<Member> group_creator() = 0;
 
+    /// @brief group_admins returns the list of admin identifiers
+    virtual std::set<std::string> group_admins() = 0;
+
     /// @brief members returns current participants in the group.
     virtual Members members() = 0;
 
 
=== modified file 'include/messaging/qt/tp/text_channel.h'
--- include/messaging/qt/tp/text_channel.h	2016-09-07 08:22:52 +0000
+++ include/messaging/qt/tp/text_channel.h	2016-10-12 14:43:53 +0000
@@ -211,6 +211,7 @@
     void register_callbacks_once();
     void plug_interfaces_once();
     void plug_interface_if_available(const Tp::AbstractChannelInterfacePtr &interface);
+    bool self_is_admin();
 
     Tp::BaseChannelTextTypePtr text_type_interface;
     Tp::BaseChannelMessagesInterfacePtr messages_interface;
 
=== modified file 'src/messaging/qt/tp/connection.cpp'
--- src/messaging/qt/tp/connection.cpp	2016-10-12 14:43:53 +0000
+++ src/messaging/qt/tp/connection.cpp	2016-10-12 14:43:53 +0000
@@ -155,7 +155,8 @@
     qRegisterMetaType<messaging::Recipient::shared_ptr>();
 
     setSelfHandle(1);
-    handles_.insert(HandleIdPair(1, QString::fromStdString(connection->self_identifier())));
+    setSelfID(QString::fromStdString(connection->normalize_identifier(connection->self_identifier())));
+    handles_.insert(HandleIdPair(selfHandle(), selfID()));
 
     // Wire up the actual request for connecting.
     setConnectCallback(Tp::memFun(this, &tp::Connection::connect));
@@ -594,7 +595,7 @@
             {
                 std::shared_ptr<GroupStarter> group_starter = connection->group_starter();
                 group_manager = group_starter->accept_group(group);
-                if (group_manager->group_id().empty())
+                if (not group_manager || group_manager->group_id().empty())
                 {
                     LOG(ERROR) << "Group creation rejected";
                     error->set(TP_QT_ERROR_CANCELLED, "Group creation rejected");
@@ -649,7 +650,7 @@
                 messaging::Group::shared_ptr group = std::dynamic_pointer_cast<messaging::Group>(recipient);
                 group_manager = group_starter->rejoin_group(group);
 
-                if (group_manager->group_id().empty())
+                if (not group_manager || group_manager->group_id().empty())
                 {
                     LOG(ERROR) << "Group rejoin rejected";
                     error->set(TP_QT_ERROR_CANCELLED, "Group rejoin rejected");
@@ -761,7 +762,7 @@
                     messaging::Group::shared_ptr group = std::dynamic_pointer_cast<messaging::Group>(recipient);
                     group_manager = group_starter->create_group(group);
 
-                    if (group_manager->group_id().empty())
+                    if (not group_manager || group_manager->group_id().empty())
                     {
                         LOG(ERROR) << "Group creation rejected";
                         error->set(TP_QT_ERROR_CANCELLED, "Group creation rejected");
 
=== modified file 'src/messaging/qt/tp/text_channel.cpp'
--- src/messaging/qt/tp/text_channel.cpp	2016-10-12 14:43:53 +0000
+++ src/messaging/qt/tp/text_channel.cpp	2016-10-12 14:43:53 +0000
@@ -757,10 +757,6 @@
     QStringList member_ids;
     QStringList remote_member_ids;
     interfaces::HandleRolesMap roles_map;
-    // flag assuming there is at least one admin (See if this is happening in all protocols and if this solution
-    // is valid for all them). In case any of the participants have admin role, we set it to self handle and add
-    // that to updating roles.
-    bool found_admin = false;
 
     for (auto member : received_members) {
 
@@ -800,11 +796,6 @@
             }
             }
 
-            // search for admin in current member roles
-            if (member->roles().is_set(Role::Admin)) {
-                found_admin = true;
-            }
-
             // add current member roles to map
             roles_map[handle] = member->roles().underlying_type();
         }
@@ -816,7 +807,7 @@
 
     // if not found admin, add admin role to ourselves
     interfaces::ChannelRoles self_roles(interfaces::ChannelRole::ChannelRoleMember);
-    if (not found_admin) {
+    if (self_is_admin()) {
         self_roles |= interfaces::ChannelRole::ChannelRoleAdmin;
     }
     roles_map[tp_connection->selfHandle()] = static_cast<uint>(self_roles);
@@ -1191,3 +1182,21 @@
     }
     plugInterface(interface);
 }
+
+bool mqt::tp::TextChannel::self_is_admin()
+{
+    std::shared_ptr<messaging::GroupManager> group_manager = chat->interface<GroupManager>();
+    if (!group_manager) {
+        return false;
+    }
+    std::set<std::string> admins = group_manager->group_admins();
+    std::string self_id = tp_connection->selfID().toStdString();
+
+    for (const std::string &admin : admins) {
+        if (admin == self_id) {
+            return true;
+        }
+    }
+
+    return false;
+}
 
=== modified file 'tests/mock_group_manager.h'
--- tests/mock_group_manager.h	2016-09-14 07:36:33 +0000
+++ tests/mock_group_manager.h	2016-10-12 14:43:53 +0000
@@ -48,6 +48,7 @@
     MOCK_METHOD0(group_title, std::string());
     MOCK_METHOD0(group_subject, std::string());
     MOCK_METHOD0(group_creator, std::shared_ptr<messaging::Member>());
+    MOCK_METHOD0(group_admins, std::set<std::string>());
     MOCK_METHOD0(members, messaging::Members());
     MOCK_METHOD1(set_observer, void(const std::shared_ptr<Observer>&));
     MOCK_METHOD1(on_plugged, void(const std::weak_ptr<messaging::HasInterfaces>&));