23d931cb10
Summary:
Update sms app model to use new conversationUpdated signal
Filter incoming messages which belong to a different conversation than the one currently being viewed
See Android-side diff D15360 which adds support for sending live updates when a new message is sent or received
Test Plan:
This patch relies on D15360 for Android-side support
- Positive case:
- Open a conversation in the SMS app
- Receive a new message into that conversation (text yourself?)
- Verify that the new message appears at the bottom of the appropriate conversation
- Negative case:
- Open a conversation in the SMS app
- Receive a new message into a different conversation (text yourself?)
- Verify that the new message does *not* appear in the open conversation
Reviewers: #kde_connect, nicolasfella
Reviewed By: #kde_connect, nicolasfella
Subscribers: nicolasfella, kdeconnect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D15409
113 lines
4 KiB
C++
113 lines
4 KiB
C++
/*
|
|
* This file is part of KDE Telepathy Chat
|
|
*
|
|
* Copyright (C) 2018 Aleix Pol Gonzalez <aleixpol@kde.org>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "conversationmodel.h"
|
|
#include <QLoggingCategory>
|
|
#include "interfaces/conversationmessage.h"
|
|
|
|
Q_LOGGING_CATEGORY(KDECONNECT_SMS_CONVERSATION_MODEL, "kdeconnect.sms.conversation")
|
|
|
|
ConversationModel::ConversationModel(QObject* parent)
|
|
: QStandardItemModel(parent)
|
|
, m_conversationsInterface(nullptr)
|
|
{
|
|
auto roles = roleNames();
|
|
roles.insert(FromMeRole, "fromMe");
|
|
roles.insert(DateRole, "date");
|
|
setItemRoleNames(roles);
|
|
}
|
|
|
|
ConversationModel::~ConversationModel()
|
|
{
|
|
}
|
|
|
|
QString ConversationModel::threadId() const
|
|
{
|
|
return m_threadId;
|
|
}
|
|
|
|
void ConversationModel::setThreadId(const QString &threadId)
|
|
{
|
|
if (m_threadId == threadId)
|
|
return;
|
|
|
|
m_threadId = threadId;
|
|
clear();
|
|
if (!threadId.isEmpty()) {
|
|
m_conversationsInterface->requestConversation(threadId, 0, 10);
|
|
}
|
|
}
|
|
|
|
void ConversationModel::setDeviceId(const QString& deviceId)
|
|
{
|
|
if (deviceId == m_deviceId)
|
|
return;
|
|
|
|
qCDebug(KDECONNECT_SMS_CONVERSATION_MODEL) << "setDeviceId" << "of" << this;
|
|
if (m_conversationsInterface) delete m_conversationsInterface;
|
|
|
|
m_deviceId = deviceId;
|
|
|
|
m_conversationsInterface = new DeviceConversationsDbusInterface(deviceId, this);
|
|
connect(m_conversationsInterface, SIGNAL(conversationMessageReceived(QVariantMap, int)), this, SLOT(createRowFromMessage(QVariantMap, int)));
|
|
connect(m_conversationsInterface, SIGNAL(conversationUpdated(QVariantMap)), this, SLOT(handleConversationUpdate(QVariantMap)));
|
|
}
|
|
|
|
void ConversationModel::sendReplyToConversation(const QString& message)
|
|
{
|
|
qCDebug(KDECONNECT_SMS_CONVERSATION_MODEL) << "Trying to send" << message << "to conversation with ID" << m_threadId;
|
|
m_conversationsInterface->replyToConversation(m_threadId, message);
|
|
}
|
|
|
|
void ConversationModel::createRowFromMessage(const QVariantMap& msg, int pos)
|
|
{
|
|
const ConversationMessage message(msg);
|
|
|
|
if (!(message.threadID() == m_threadId.toInt())) {
|
|
// Because of the asynchronous nature of the current implementation of this model, if the
|
|
// user clicks quickly between threads or for some other reason a message comes when we're
|
|
// not expecting it, we should not display it in the wrong place
|
|
qCDebug(KDECONNECT_SMS_CONVERSATION_MODEL)
|
|
<< "Got a message for a thread" << message.threadID()
|
|
<< "but we are currently viewing" << m_threadId
|
|
<< "Discarding.";
|
|
return;
|
|
}
|
|
auto item = new QStandardItem;
|
|
item->setText(message.body());
|
|
item->setData(message.type() == ConversationMessage::MessageTypeSent, FromMeRole);
|
|
item->setData(message.date(), DateRole);
|
|
insertRow(pos, item);
|
|
}
|
|
|
|
void ConversationModel::handleConversationUpdate(const QVariantMap& msg)
|
|
{
|
|
const ConversationMessage message(msg);
|
|
|
|
if (!(message.threadID() == m_threadId.toInt())) {
|
|
// If a conversation which we are not currently viewing was updated, discard the information
|
|
qCDebug(KDECONNECT_SMS_CONVERSATION_MODEL)
|
|
<< "Saw update for thread" << message.threadID()
|
|
<< "but we are currently viewing" << m_threadId;
|
|
return;
|
|
}
|
|
|
|
createRowFromMessage(msg, 0);
|
|
}
|