telephony-service

Merge lp:~phablet-team/telephony-service/change_group_title into lp:telephony-service

change_group_title
Merge into trunk

Proposed by Gustavo Pichorim Boiko on 2016-06-13

Status:	Superseded
Proposed branch:	lp:~phablet-team/telephony-service/change_group_title
Merge into:	lp:telephony-service
Prerequisite:	lp:~phablet-team/telephony-service/destroy_chatrooms
Diff against target:	276 lines (+114/-12) 9 files modified handler/Handler.xml (+7/-0) handler/handlerdbus.cpp (+5/-0) handler/handlerdbus.h (+2/-2) handler/messagesendingjob.cpp (+40/-1) handler/messagesendingjob.h (+1/-0) handler/texthandler.cpp (+33/-8) handler/texthandler.h (+2/-0) libtelephonyservice/chatentry.cpp (+22/-0) libtelephonyservice/chatentry.h (+2/-1)
To merge this branch:	bzr merge lp:~phablet-team/telephony-service/change_group_title
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-06-15
Roberto Mier Escandon (community)		2016-06-13	Approve on 2016-06-13
PS Jenkins bot	continuous-integration		Pending
Review via email: mp+297168@code.launchpad.net

This proposal has been superseded by a proposal from 2016-06-15.

Commit message

Make it possible to change the group title.

Description of the change

Make it possible to change the group title.

Revision history for this message

Roberto Mier Escandon (rmescandon) on 2016-06-13:

review: Approve

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-06-13:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/10/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

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

FAILED: Continuous integration, rev:1223
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/15/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/557/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/557
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/545
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/545/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/15/rebuild

review: Needs Fixing (continuous-integration)

lp:~phablet-team/telephony-service/change_group_title updated on 2016-06-14

1224. By Gustavo Pichorim Boiko on 2016-06-14: Make sure we fetch the initial values of the group title from the channel.

Revision history for this message

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

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/19/rebuild

review: Needs Fixing (continuous-integration)

lp:~phablet-team/telephony-service/change_group_title updated on 2016-06-15

1225. By Gustavo Pichorim Boiko on 2016-06-15: Use values instead of references

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-06-15:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/20/rebuild

review: Needs Fixing (continuous-integration)

lp:~phablet-team/telephony-service/change_group_title updated on 2016-10-21

1226. By Gustavo Pichorim Boiko on 2016-06-15: merge parent
1227. By Gustavo Pichorim Boiko on 2016-06-15: Merge parent
1228. By Tiago Salem Herrmann on 2016-06-27: merge parent branch
1229. By Tiago Salem Herrmann on 2016-06-27: merge parent branch
1230. By Tiago Salem Herrmann on 2016-06-27: merge parent branch
1231. By Tiago Salem Herrmann on 2016-06-27: merge parent branch
1232. By Tiago Salem Herrmann on 2016-06-27: merge parent branch
1233. By Tiago Salem Herrmann on 2016-06-27: merge parent branch
1234. By Gustavo Pichorim Boiko on 2016-07-06: Merge parent
1235. By Tiago Salem Herrmann on 2016-07-07: merge parent branch
1236. By Tiago Salem Herrmann on 2016-07-08: merge parent branch
1237. By Tiago Salem Herrmann on 2016-07-08: merge parent branch
1238. By Tiago Salem Herrmann on 2016-07-11: merge parent branch
1239. By Tiago Salem Herrmann on 2016-07-11: merge parent branch
1240. By Tiago Salem Herrmann on 2016-07-11: merge parent branch
1241. By Gustavo Pichorim Boiko on 2016-07-13: merge parent
1242. By Tiago Salem Herrmann on 2016-08-05: merge parent branch
1243. By Tiago Salem Herrmann on 2016-08-05: merge parent branch
1244. By Tiago Salem Herrmann on 2016-08-11: merge parent branch
1245. By Tiago Salem Herrmann on 2016-08-12: merge parent branch
1246. By Tiago Salem Herrmann on 2016-08-12: merge parent branch
1247. By Tiago Salem Herrmann on 2016-08-16: merge parent branch
1248. By Tiago Salem Herrmann on 2016-10-06: merge parent branch
1249. By Gustavo Pichorim Boiko on 2016-10-21: Merge parent branch

Unmerged revisions

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 'handler/Handler.xml'
 --- handler/Handler.xml	2016-06-15 09:41:11 +0000
 +++ handler/Handler.xml	2016-06-15 09:41:11 +0000
@@ -53,6 +53,13 @@
              <arg name="objectPath" type="s" direction="in"/>
              <arg name="result" type="b" direction="out"/>
          </method>
++        <method name="ChangeRoomTitle">
++            <dox:d><![CDATA[
++                Changes the title of a group.
++            ]]></dox:d>
++            <arg name="objectPath" type="s" direction="in"/>
++            <arg name="title" type="s" direction="in"/>
++        </method>
          <!-- Call Related -->
          <method name="StartCall">
              <dox:d><![CDATA[
 === modified file 'handler/handlerdbus.cpp'
 --- handler/handlerdbus.cpp	2016-06-15 09:41:11 +0000
 +++ handler/handlerdbus.cpp	2016-06-15 09:41:11 +0000
@@ -106,6 +106,11 @@
      return TextHandler::instance()->destroyTextChannel(objectPath);
+ }
++void HandlerDBus::ChangeRoomTitle(const QString &objectPath, const QString &title)
++{
++    TextHandler::instance()->changeRoomTitle(objectPath, title);
++}
++
  bool HandlerDBus::connectToBus()
+ {
      bool ok = QDBusConnection::sessionBus().registerService(DBUS_SERVICE);
 === modified file 'handler/handlerdbus.h'
 --- handler/handlerdbus.h	2016-06-15 09:41:11 +0000
 +++ handler/handlerdbus.h	2016-06-15 09:41:11 +0000
@@ -56,8 +56,6 @@
      static HandlerDBus *instance();
--    bool DestroyTextChannel(const QString &objectPath);
--
  public Q_SLOTS:
      bool connectToBus();
@@ -66,6 +64,8 @@
      Q_NOREPLY void AcknowledgeMessages(const QVariantList &messages);
      Q_NOREPLY void StartChat(const QString &accountId, const QVariantMap &properties);
      Q_NOREPLY void AcknowledgeAllMessages(const QVariantMap &properties);
++    bool DestroyTextChannel(const QString &objectPath);
++    Q_NOREPLY void ChangeRoomTitle(const QString &objectPath, const QString &title);
      // call related
      Q_NOREPLY void StartCall(const QString &number, const QString &accountId);
 === modified file 'handler/messagesendingjob.cpp'
 --- handler/messagesendingjob.cpp	2016-06-15 09:41:11 +0000
 +++ handler/messagesendingjob.cpp	2016-06-15 09:41:11 +0000
@@ -214,7 +214,28 @@
  void MessageSendingJob::sendMessage()
+ {
      qDebug() << __PRETTY_FUNCTION__;
--    Tp::PendingSendMessage *op = mTextChannel->send(buildMessage(mMessage));
++
++    Tp::MessagePartList messageParts = buildMessage(mMessage);
++    Tp::PendingSendMessage *op = NULL;
++    // some protocols can't sent multipart messages, so we check here
++    // and split the parts if needed
++    if (canSendMultiPartMessages()) {
++        op = mTextChannel->send(messageParts);
++    } else {
++        bool messageSent = false;
++        Tp::MessagePart header = messageParts.takeFirst();
++        Q_FOREACH(const Tp::MessagePart &part, messageParts) {
++            Tp::MessagePartList newMessage;
++            newMessage << header;
++            newMessage << part;
++            Tp::PendingSendMessage *thisOp = mTextChannel->send(newMessage);
++            if (messageSent) {
++                continue;
++            }
++            messageSent = true;
++            op = thisOp;
++        }
++    }
      connect(op, &Tp::PendingOperation::finished, [this, op]() {
          if (op->isError()) {
              setStatus(Failed);
@@ -228,6 +249,24 @@
          scheduleDeletion();
      });
+ }
++
++bool MessageSendingJob::canSendMultiPartMessages()
++{
++    if (!mAccount) {
++        return false;
++    }
++    switch (mAccount->type()) {
++    case AccountEntry::PhoneAccount:
++        return true;
++    // TODO check in telepathy if multipart is supported
++    // currently we just return false to be on the safe side
++    case AccountEntry::GenericAccount:
++    case AccountEntry::MultimediaAccount:
++    default:
++        return false;
++    }
++    return false;
++}
  void MessageSendingJob::setAccountId(const QString &accountId)
+ {
 === modified file 'handler/messagesendingjob.h'
 --- handler/messagesendingjob.h	2016-06-15 09:41:11 +0000
 +++ handler/messagesendingjob.h	2016-06-15 09:41:11 +0000
@@ -89,6 +89,7 @@
      MessageSendingJobAdaptor *mAdaptor;
      Tp::MessagePartList buildMessage(const PendingMessage &pendingMessage);
++    bool canSendMultiPartMessages();
  };
 === modified file 'handler/texthandler.cpp'
 --- handler/texthandler.cpp	2016-06-15 09:41:11 +0000
 +++ handler/texthandler.cpp	2016-06-15 09:41:11 +0000
@@ -99,14 +99,7 @@
  bool TextHandler::destroyTextChannel(const QString &objectPath)
+ {
--    Tp::TextChannelPtr channelToDestroy;
--    Q_FOREACH(Tp::TextChannelPtr channel, mChannels) {
--        if (channel->objectPath() == objectPath) {
--            channelToDestroy = channel;
--            break;
--        }
--    }
--
++    Tp::TextChannelPtr channelToDestroy = existingChannelFromObjectPath(objectPath);
      if (!channelToDestroy ||
          !channelToDestroy->hasInterface(TP_QT_IFACE_CHANNEL_INTERFACE_DESTROYABLE)) {
          return false;
@@ -123,6 +116,28 @@
      return !reply.isError();
+ }
++void TextHandler::changeRoomTitle(const QString &objectPath, const QString &title)
++{
++    qDebug() << __PRETTY_FUNCTION__;
++    Tp::TextChannelPtr channel = existingChannelFromObjectPath(objectPath);
++    if (!channel) {
++        qWarning() << "Could not find channel for object path" << objectPath;
++        return;
++    }
++
++    Tp::Client::ChannelInterfaceRoomConfigInterface *roomConfigInterface;
++    roomConfigInterface = channel->optionalInterface<Tp::Client::ChannelInterfaceRoomConfigInterface>();
++    if (!roomConfigInterface) {
++        qWarning() << "Could not find RoomConfig interface in the channel" << objectPath;
++        return;
++    }
++
++    QVariantMap properties;
++    properties["Title"] = title;
++    // FIXME: we better check for the result here and maybe notify the app
++    roomConfigInterface->UpdateConfiguration(properties);
++}
++
  void TextHandler::onTextChannelInvalidated()
+ {
      Tp::TextChannelPtr textChannel(qobject_cast<Tp::TextChannel*>(sender()));
@@ -201,3 +216,13 @@
+     }
      return channels;
+ }
++
++Tp::TextChannelPtr TextHandler::existingChannelFromObjectPath(const QString &objectPath)
++{
++    Q_FOREACH(Tp::TextChannelPtr channel, mChannels) {
++        if (channel->objectPath() == objectPath) {
++            return channel;
++        }
++    }
++    return Tp::TextChannelPtr();
++}
 === modified file 'handler/texthandler.h'
 --- handler/texthandler.h	2016-06-15 09:41:11 +0000
 +++ handler/texthandler.h	2016-06-15 09:41:11 +0000
@@ -43,6 +43,7 @@
      void acknowledgeMessages(const QVariantList &messages);
      void acknowledgeAllMessages(const QVariantMap &properties);
      bool destroyTextChannel(const QString &objectPath);
++    void changeRoomTitle(const QString &objectPath, const QString &title);
  protected Q_SLOTS:
      void onTextChannelAvailable(Tp::TextChannelPtr channel);
@@ -50,6 +51,7 @@
  protected:
      QList<Tp::TextChannelPtr> existingChannels(const QString &accountId, const QVariantMap &properties);
++    Tp::TextChannelPtr existingChannelFromObjectPath(const QString &objectPath);
  private:
      explicit TextHandler(QObject *parent = 0);
 === modified file 'libtelephonyservice/chatentry.cpp'
 --- libtelephonyservice/chatentry.cpp	2016-06-15 09:41:11 +0000
 +++ libtelephonyservice/chatentry.cpp	2016-06-15 09:41:11 +0000
@@ -30,6 +30,7 @@
  #include <TelepathyQt/Contact>
  #include <TelepathyQt/PendingReady>
  #include <TelepathyQt/Connection>
++#include <TelepathyQt/PendingVariantMap>
  Q_DECLARE_METATYPE(ContactChatStates)
@@ -115,6 +116,21 @@
      return mTitle;
+ }
++void ChatEntry::setTitle(const QString &title)
++{
++    // FIXME: remove this debug before going into production.
++    qDebug() << __PRETTY_FUNCTION__ << "Changing group title to" << title;
++    QDBusInterface *handlerIface = TelepathyHelper::instance()->handlerInterface();
++    Q_FOREACH(const Tp::TextChannelPtr channel, mChannels) {
++        if (!channel->hasInterface(TP_QT_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG)) {
++            qWarning() << "Channel doesn't have the RoomConfig interface";
++            return;
++        }
++
++        handlerIface->asyncCall("ChangeRoomTitle", channel->objectPath(), title);
++    }
++}
++
  ChatEntry::~ChatEntry()
+ {
      QMap<QString, ContactChatState*> tmp = mChatStates;
@@ -296,6 +312,12 @@
+     }
      if (roomConfigInterface) {
          roomConfigInterface->setMonitorProperties(true);
++        Tp::PendingVariantMap *pendingResult = roomConfigInterface->requestAllProperties();
++        connect(pendingResult, &Tp::PendingOperation::finished, [=](){
++            if (!pendingResult->isError()) {
++                onRoomPropertiesChanged(pendingResult->result(), QStringList());
++            }
++        });
          connect(roomConfigInterface, SIGNAL(propertiesChanged(const QVariantMap &,const QStringList &)),
                                       SLOT(onRoomPropertiesChanged(const QVariantMap &,const QStringList &)));
+     }
 === modified file 'libtelephonyservice/chatentry.h'
 --- libtelephonyservice/chatentry.h	2016-06-15 09:41:11 +0000
 +++ libtelephonyservice/chatentry.h	2016-06-15 09:41:11 +0000
@@ -59,7 +59,7 @@
      Q_PROPERTY(QString roomName READ roomName WRITE setRoomName NOTIFY roomNameChanged)
      Q_PROPERTY(QString chatId READ chatId WRITE setChatId NOTIFY chatIdChanged)
      Q_PROPERTY(QString accountId READ accountId WRITE setAccountId NOTIFY accountIdChanged)
--    Q_PROPERTY(QString title READ title NOTIFY titleChanged)
++    Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
      Q_PROPERTY(QQmlListProperty<ContactChatState> chatStates
                 READ chatStates
                 NOTIFY chatStatesChanged)
@@ -95,6 +95,7 @@
      QString roomName() const;
      void setRoomName(const QString &name);
      QString title() const;
++    void setTitle(const QString & title);
      static int chatStatesCount(QQmlListProperty<ContactChatState> *p);
      static ContactChatState *chatStatesAt(QQmlListProperty<ContactChatState> *p, int index);