a14b39d541
Summary: This patch fixes T10184 and stops the SMS app from crashing when a conversation is selected but no devices are connected. It also allows the SMS app to access the cached messages in the ConversationsDbusInterface so the app is still slightly useful even when the device is disconnected. Test Plan: - Open sms app - Open a few conversations - Disconnect phone (Force close app?) - Re-open a conversation which was previously opened - Verify that the messages appear. It is possible to scroll up to view any older cached messages too! - Open a conversation which was not opened previously - Verify that a single messages is shown (since this was the only one in cache, from populating the list of all conversations) - Verify that attempting to scroll this conversation does nothing, but also does not crash the app Note: Opening the app with no phone connected will cause it to lose its handle on the deviceId, so it can't spawn a new Dbus interface, so it will remain blank and empty. Solving that is a project for another day. Reviewers: #kde_connect Reviewed By: #kde_connect Subscribers: apol, nicolasfella, kdeconnect Tags: #kde_connect Maniphest Tasks: T10184 Differential Revision: https://phabricator.kde.org/D17634
93 lines
3.6 KiB
C++
93 lines
3.6 KiB
C++
/**
|
|
* Copyright 2018 Simon Redman <simon@ergotech.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License or (at your option) version 3 or any later version
|
|
* accepted by the membership of KDE e.V. (or its successor approved
|
|
* by the membership of KDE e.V.), which shall act as a proxy
|
|
* defined in Section 14 of version 3 of the license.
|
|
*
|
|
* This program 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "requestconversationworker.h"
|
|
|
|
#include "conversationsdbusinterface.h"
|
|
|
|
#include <QObject>
|
|
|
|
RequestConversationWorker::RequestConversationWorker(const qint64& conversationID, int start, int end, ConversationsDbusInterface* interface) :
|
|
//QObject(interface)
|
|
conversationID(conversationID)
|
|
, start(start)
|
|
, parent(interface)
|
|
, m_thread(new QThread)
|
|
{
|
|
Q_ASSERT(end >= start && "Not allowed to have a negative-length range");
|
|
howMany = end - start;
|
|
|
|
this->moveToThread(m_thread);
|
|
connect(m_thread, &QThread::started,
|
|
this, &RequestConversationWorker::handleRequestConversation);
|
|
connect(m_thread, &QThread::finished,
|
|
m_thread, &QObject::deleteLater);
|
|
connect(this, &RequestConversationWorker::finished,
|
|
m_thread, &QThread::quit);
|
|
connect(this, &RequestConversationWorker::finished,
|
|
this, &QObject::deleteLater);
|
|
}
|
|
|
|
void RequestConversationWorker::handleRequestConversation()
|
|
{
|
|
auto messagesList = parent->getConversation(conversationID);
|
|
|
|
if (messagesList.isEmpty()) {
|
|
// Since there are no messages in the conversation, it's likely that it is a junk ID, but go ahead anyway
|
|
qCWarning(KDECONNECT_CONVERSATIONS) << "Got a conversationID for a conversation with no messages!" << conversationID;
|
|
}
|
|
|
|
// In case the remote takes awhile to respond, we should go ahead and do anything we can from the cache
|
|
size_t numHandled = replyForConversation(messagesList, start, howMany);
|
|
|
|
if (numHandled < howMany) {
|
|
size_t numRemaining = howMany - numHandled;
|
|
// If we don't have enough messages in cache, go get some more
|
|
// TODO: Make Android interface capable of requesting small window of messages
|
|
parent->updateConversation(conversationID);
|
|
messagesList = parent->getConversation(conversationID);
|
|
//ConversationsDbusInterface::getConversation blocks until it sees new messages in the requested conversation
|
|
replyForConversation(messagesList, start + numHandled, numRemaining);
|
|
}
|
|
|
|
Q_EMIT finished();
|
|
}
|
|
|
|
size_t RequestConversationWorker::replyForConversation(const QList<ConversationMessage>& conversation, int start, size_t howMany) {
|
|
Q_ASSERT(start >= 0);
|
|
// Messages are sorted in ascending order of keys, meaning the front of the list has the oldest
|
|
// messages (smallest timestamp number)
|
|
// Therefore, return the end of the list first (most recent messages)
|
|
int i = 0;
|
|
for(auto it = conversation.crbegin() + start; it != conversation.crend(); ++it) {
|
|
if (i >= howMany) {
|
|
break;
|
|
}
|
|
Q_EMIT conversationMessageRead(it->toVariant());
|
|
i++;
|
|
}
|
|
|
|
return i;
|
|
}
|
|
|
|
void RequestConversationWorker::work()
|
|
{
|
|
m_thread->start();
|
|
}
|