Commit 5ccf1301 authored by David Edmundson's avatar David Edmundson

Reconnect to text channels in declarative lib when user reconnects

REVIEW: 110682
parent ef515f51
......@@ -21,6 +21,10 @@
#include "messages-model.h"
#include <TelepathyQt/TextChannel>
#include <TelepathyQt/Account>
#include <TelepathyQt/PendingChannelRequest>
#include <TelepathyQt/PendingChannel>
#include <KDebug>
#include "conversation-target.h"
......@@ -47,6 +51,7 @@ Conversation::Conversation(const Tp::TextChannelPtr &channel,
d->account = account;
connect(d->, SIGNAL(connectionChanged(Tp::ConnectionPtr)), SLOT(onAccountConnectionChanged(Tp::ConnectionPtr)));
d->messages = new MessagesModel(account, this);
......@@ -100,6 +105,32 @@ void Conversation::onChannelInvalidated(Tp::DBusProxy *proxy, const QString &err
Q_EMIT validityChanged(d->valid);
void Conversation::onAccountConnectionChanged(const Tp::ConnectionPtr& connection)
//if we have reconnected and we were handling the channel
if (connection && ! d->delegated) {
//general convention is to never use ensureAndHandle when we already have a client registrar
//ensureAndHandle will implicity create a new temporary client registrar which is a waste
//it's also more code to get the new channel
//However, we cannot use use ensureChannel as normal because without being able to pass a preferredHandler
//we need a preferredHandler so that this handler is the one that ends up with the channel if multi handlers are active
//we do not know the name that this handler is currently registered with
Tp::PendingChannel *pendingChannel = d->account->ensureAndHandleTextChat(textChannel()->targetId());
connect(pendingChannel, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onCreateChannelFinished(Tp::PendingOperation*)));
void Conversation::onCreateChannelFinished(Tp::PendingOperation* op)
Tp::PendingChannel *pendingChannelOp = qobject_cast<Tp::PendingChannel*>(op);
Tp::TextChannelPtr textChannel = Tp::TextChannelPtr::dynamicCast(pendingChannelOp->channel());
if (textChannel) {
void Conversation::delegateToProperClient()
ChannelDelegator::delegateChannel(d->account, d->messages->textChannel());
......@@ -62,6 +62,8 @@ public Q_SLOTS:
private Q_SLOTS:
void onChannelInvalidated(Tp::DBusProxy *proxy, const QString &errorName, const QString &errorMessage);
void onAccountConnectionChanged(const Tp::ConnectionPtr &connection);
void onCreateChannelFinished(Tp::PendingOperation *op);
class ConversationPrivate;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment