messaging-framework

Merge lp:~phablet-team/messaging-framework/fix-roles-interface-event into lp:messaging-framework

  1. fix-roles-interface-event
  2. Merge into trunk
Proposed by Roberto Mier Escandon
Status: Merged
Approved by: Tiago Salem Herrmann
Approved revision: 78
Merged at revision: 65
Proposed branch: lp:~phablet-team/messaging-framework/fix-roles-interface-event
Merge into: lp:messaging-framework
Prerequisite: lp:~phablet-team/messaging-framework/end-group-info-event
Diff against target: 108 lines (+24/-10)
4 files modified
debian/changelog (+6/-0)
include/messaging/qt/tp/interfaces/channel_interface_roles_adaptor.h (+10/-6)
src/messaging/qt/tp/interfaces/base_channel_roles.cpp (+8/-2)
src/messaging/qt/tp/interfaces/channel_interface_roles_adaptor.cpp (+0/-2)
To merge this branch: bzr merge lp:~phablet-team/messaging-framework/fix-roles-interface-event
Reviewer Review Type Date Requested Status
Tiago Salem Herrmann (community) Approve
system-apps-ci-bot continuous-integration Approve
Review via email: mp+306477@code.launchpad.net

Commit message

Updates Roles interface for RolesChanged event be received in upper layers

NOTE: this branch is directly related with https://code.launchpad.net/~phablet-team/history-service/roles-client-interface

Description of the change

Updates Roles interface for RolesChanged event be received in upper layers

NOTE: this branch is directly related with https://code.launchpad.net/~phablet-team/history-service/roles-client-interface

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:76
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/80/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1598
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/381
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1598
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1446
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1446/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1446
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1446/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1446
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1446/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1446
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1446/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1446
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1446/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1446
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1446/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1446
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1446/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1446
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1446/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1446
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1446/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
lp:~phablet-team/messaging-framework/fix-roles-interface-event updated
77. By Roberto Mier Escandon

updated changelog

78. By Roberto Mier Escandon

corrected changelog version

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:78
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/82/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1631
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/385
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1631
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1478
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1478/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1478
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1478/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1478
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1478/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1478
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1478/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1478
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1478/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1478
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1478/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1478
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1478/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1478
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1478/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1478
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1478/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Tiago Salem Herrmann (tiagosh) wrote :

works fine!
thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-09-26 21:06:17 +0000
3+++ debian/changelog 2016-09-26 21:06:17 +0000
4@@ -1,3 +1,9 @@
5+messaging-framework (0.1+16.10.20160926-1ubuntu28) vivid; urgency=medium
6+
7+ * Bugfix: The participant who was invited back is shown as admin
8+
9+ -- Roberto Mier Escandon <roberto.escandon@canonical.com> Mon, 26 Sep 2016 22:50:35 +0200
10+
11 messaging-framework (0.1+16.10.20160922-1ubuntu28) vivid; urgency=medium
12
13 * Added new values for cancel group reason, out of spec, needed to differenciate leave from dissolve
14
15=== modified file 'include/messaging/qt/tp/interfaces/channel_interface_roles_adaptor.h'
16--- include/messaging/qt/tp/interfaces/channel_interface_roles_adaptor.h 2016-09-05 15:10:42 +0000
17+++ include/messaging/qt/tp/interfaces/channel_interface_roles_adaptor.h 2016-09-26 21:06:17 +0000
18@@ -45,17 +45,21 @@
19 Q_CLASSINFO("D-Bus Interface", "org.freedesktop.Telepathy.Channel.Interface.Roles")
20 Q_CLASSINFO("D-Bus Introspection", ""
21 " <interface name=\"org.freedesktop.Telepathy.Channel.Interface.Roles\">\n"
22-" <property access=\"read\" type=\"b\" name=\"CanUpdateRoles\"/>\n"
23 " <property access=\"read\" type=\"a{uu}\" name=\"Roles\">\n"
24-" <annotation value=\"Tp::HandleRolesMap\" name=\"com.trolltech.QtDBus.QtTypeName\"/>\n"
25+" <annotation value=\"HandleRolesMap\" name=\"com.trolltech.QtDBus.QtTypeName\"/>\n"
26 " </property>\n"
27+" <property access=\"read\" type=\"b\" name=\"CanUpdateRoles\"/>\n"
28 " <method name=\"UpdateRoles\">\n"
29-" <arg direction=\"in\" type=\"a{uu}\" name=\"contactroles\"/>\n"
30+" <arg direction=\"in\" type=\"a{uu}\" name=\"contactroles\">\n"
31+" <annotation value=\"HandleRolesMap\" name=\"com.trolltech.QtDBus.QtTypeName.In0\"/>\n"
32+" </arg>\n"
33 " </method>\n"
34 " <signal name=\"RolesChanged\">\n"
35-" <arg type=\"a{uu}\" name=\"added\"/>\n"
36+" <arg type=\"a{uu}\" name=\"added\">\n"
37+" <annotation value=\"HandleRolesMap\" name=\"com.trolltech.QtDBus.QtTypeName.In0\"/>\n"
38+" </arg>\n"
39 " <arg type=\"a{uu}\" name=\"removed\">\n"
40-" <annotation value=\"Tp::HandleRolesMap\" name=\"com.trolltech.QtDBus.QtTypeName.In0\"/>\n"
41+" <annotation value=\"HandleRolesMap\" name=\"com.trolltech.QtDBus.QtTypeName.In1\"/>\n"
42 " </arg>\n"
43 " </signal>\n"
44 " </interface>\n"
45@@ -68,7 +72,7 @@
46
47 typedef Tp::MethodInvocationContextPtr< > UpdateRolesContextPtr;
48
49-public:
50+public: //PROPERTIES
51 HandleRolesMap Roles() const;
52 bool CanUpdateRoles() const;
53
54
55=== modified file 'src/messaging/qt/tp/interfaces/base_channel_roles.cpp'
56--- src/messaging/qt/tp/interfaces/base_channel_roles.cpp 2016-09-05 15:10:42 +0000
57+++ src/messaging/qt/tp/interfaces/base_channel_roles.cpp 2016-09-26 21:06:17 +0000
58@@ -26,7 +26,8 @@
59 // Chan.I.Roles
60 struct MESSAGING_FW_LOCAL mqti::BaseChannelRolesInterface::Private {
61 Private(BaseChannelRolesInterface *parent)
62- :adaptee(new BaseChannelRolesInterface::Adaptee(parent)) {
63+ : canUpdateRoles(false)
64+ , adaptee(new BaseChannelRolesInterface::Adaptee(parent)) {
65 }
66
67 void emitRolesChangedSignal(const HandleRolesMap &added, const HandleRolesMap &removed) const;
68@@ -48,6 +49,7 @@
69 : QObject(interface),
70 mInterface(interface)
71 {
72+ qDBusRegisterMetaType<HandleRolesMap>();
73 // this signal connections and the exposition of the rolesChanged signal is only needed for unit tests.
74 // In case unit testing is changed this could be removed and not expose signal in the interface
75 qRegisterMetaType<HandleRolesMap>("HandleRolesMap");
76@@ -189,7 +191,11 @@
77 removedMap.unite(mPriv->roles);
78
79 mPriv->roles = receivedMap;
80- mPriv->emitRolesChangedSignal(addedMap, removedMap);
81+
82+ // emit RolesChanged only if there is any effective change
83+ if (!addedMap.empty() || !removedMap.empty()) {
84+ mPriv->emitRolesChangedSignal(addedMap, removedMap);
85+ }
86 }
87
88 bool mqti::BaseChannelRolesInterface::canUpdateRoles() const
89
90=== modified file 'src/messaging/qt/tp/interfaces/channel_interface_roles_adaptor.cpp'
91--- src/messaging/qt/tp/interfaces/channel_interface_roles_adaptor.cpp 2016-08-18 17:16:07 +0000
92+++ src/messaging/qt/tp/interfaces/channel_interface_roles_adaptor.cpp 2016-09-26 21:06:17 +0000
93@@ -23,7 +23,6 @@
94 mqti::ChannelInterfaceRolesAdaptor::ChannelInterfaceRolesAdaptor(const QDBusConnection& bus, QObject* adaptee, QObject* parent)
95 : Tp::AbstractAdaptor(bus, adaptee, parent)
96 {
97- qDBusRegisterMetaType<HandleRolesMap>();
98 connect(adaptee, SIGNAL(rolesChanged(const HandleRolesMap&, const HandleRolesMap&)), SIGNAL(RolesChanged(const HandleRolesMap&, const HandleRolesMap&)));
99 }
100
101@@ -43,7 +42,6 @@
102 QMetaObject::invokeMethod(adaptee(), "updateRoles",
103 Q_ARG(HandleRolesMap, contactRoles),
104 Q_ARG(ChannelInterfaceRolesAdaptor::UpdateRolesContextPtr, ctx));
105- return;
106 }
107
108 mqti::HandleRolesMap mqti::ChannelInterfaceRolesAdaptor::Roles() const

Subscribers

People subscribed via source and target branches

to all changes: