Merge lp:~phablet-team/messaging-framework/self-id into lp:messaging-framework

[Roberto Mier Escandon]

Added self identifier

NOTE: This branch should be landed along with https://code.launchpad.net/~ningbo-team/ningbo/self-id/+merge/307702

Added self identifier

NOTE: This branch should be landed along with https://code.launchpad.net/~ningbo-team/ningbo/self-id/+merge/307702

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

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

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

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

thanks.
We are using this info in messaging-app now to display the "me" participant.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-10-05 11:58:12 +0000
+++ debian/changelog	2016-10-05 11:58:12 +0000
@@ -1,3 +1,9 @@
+messaging-framework (0.1+16.10.20161005-1ubuntu28) vivid; urgency=medium
+
+  * Self identifier support
+
+ -- Roberto Mier Escandon <[e-mail]>  Wed, 05 Oct 2016 13:38:22 +0200
+
 messaging-framework (0.1+16.10.20160926-1ubuntu28) vivid; urgency=medium
 
   * Bugfix: The participant who was invited back is shown as admin

=== modified file 'include/messaging/connection.h'
--- include/messaging/connection.h	2016-05-17 19:33:22 +0000
+++ include/messaging/connection.h	2016-10-05 11:58:12 +0000
@@ -77,6 +77,9 @@
         
     };
 
+    /// @brief self_identifier returns the current registered user identifier
+    virtual std::string self_identifier() = 0;
+
     /// @brief presence_manager returns a shared pointer to a PresenceManager object
     virtual std::shared_ptr<PresenceManager> presence_manager() = 0;
 

=== modified file 'src/messaging/qt/tp/connection.cpp'
--- src/messaging/qt/tp/connection.cpp	2016-10-05 11:58:12 +0000
+++ src/messaging/qt/tp/connection.cpp	2016-10-05 11:58:12 +0000
@@ -155,7 +155,7 @@
     qRegisterMetaType<messaging::Recipient::shared_ptr>();
 
     setSelfHandle(1);
-    handles_.insert(HandleIdPair(1, "my_myself_and_i"));
+    handles_.insert(HandleIdPair(1, QString::fromStdString(connection->self_identifier())));
 
     // Wire up the actual request for connecting.
     setConnectCallback(Tp::memFun(this, &tp::Connection::connect));

=== modified file 'tests/mock_connection.h'
--- tests/mock_connection.h	2016-06-07 18:15:24 +0000
+++ tests/mock_connection.h	2016-10-05 11:58:12 +0000
@@ -45,6 +45,7 @@
 
     void announce_status_connected();
 
+    MOCK_METHOD0(self_identifier, std::string());
     MOCK_METHOD0(presence_manager, std::shared_ptr<messaging::PresenceManager>());
     MOCK_METHOD0(messenger, std::shared_ptr<messaging::Messenger>());
     MOCK_METHOD0(group_starter, std::shared_ptr<messaging::GroupStarter>());

=== modified file 'tests/unit/messaging/connection_test.cpp'
--- tests/unit/messaging/connection_test.cpp	2016-05-19 11:56:55 +0000
+++ tests/unit/messaging/connection_test.cpp	2016-10-05 11:58:12 +0000
@@ -30,6 +30,11 @@
     {
     }
 
+    std::string self_identifier() override
+    {
+        throw std::logic_error{"Not implemented"};
+    }
+
     std::shared_ptr<messaging::PresenceManager> presence_manager() override
     {
         throw std::logic_error{"Not implemented"};