diff options
| author | Pekka Vuorela <pvuorela@iki.fi> | 2025-11-10 12:49:05 +0200 |
|---|---|---|
| committer | Pekka Vuorela <pvuorela@iki.fi> | 2025-11-12 13:10:12 +0200 |
| commit | ec2e17f3ccc122d6c47ca42c8c8c28bcb3952acd (patch) | |
| tree | ba14bb7e8bbe6814350bcfde4ad15882e940513f /src/tools/messageserver/messageserver.cpp | |
| parent | cc3f1651da37aceb333dcd10817da06b3994cbda (diff) | |
Remove dead voice/video mail handling
Not much done here since the initial commit and the
QMailMessageClassifier::classifyMessage(QMailMessageMetaData*)
wasn't actually getting even called anywhere.
Besides if something like this is wanted in some environment, it's better
implemented as external messageserver plugin.
Change-Id: Iff3b9616a739345f6dc73f7b8160b83835ece13b
Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
Reviewed-by: <matti.viljanen@kapsi.fi>
Reviewed-by: Damien Caliste <dcaliste@free.fr>
Diffstat (limited to 'src/tools/messageserver/messageserver.cpp')
| -rw-r--r-- | src/tools/messageserver/messageserver.cpp | 68 |
1 files changed, 1 insertions, 67 deletions
diff --git a/src/tools/messageserver/messageserver.cpp b/src/tools/messageserver/messageserver.cpp index 86710dd9..d5d5c8a9 100644 --- a/src/tools/messageserver/messageserver.cpp +++ b/src/tools/messageserver/messageserver.cpp @@ -69,8 +69,7 @@ int MessageServer::sigintFd[2]; MessageServer::MessageServer(QObject *parent) : QObject(parent), - handler(nullptr), - completionAttempted(false) + handler(nullptr) { readLogSettings(); } @@ -138,13 +137,6 @@ bool MessageServer::init() qCWarning(lcMessaging) << "Messaging DB Invalid: Messaging cannot operate due to database incompatibilty!"; // Do not close, however, or QPE will start another instance. return false; - } else { - connect(store, SIGNAL(messagesAdded(QMailMessageIdList)), - this, SLOT(messagesAdded(QMailMessageIdList))); - connect(store, SIGNAL(messagesUpdated(QMailMessageIdList)), - this, SLOT(messagesUpdated(QMailMessageIdList))); - connect(store, SIGNAL(messagesRemoved(QMailMessageIdList)), - this, SLOT(messagesRemoved(QMailMessageIdList))); } // Register our object on the session bus and expose interface to others. @@ -186,18 +178,6 @@ void MessageServer::retrievalCompleted(quint64 action) // Ensure the client receives any resulting events before a notification QMailStore::instance()->flushIpcNotifications(); - if (!completionList.isEmpty()) { - if (!completionAttempted) { - // Complete the messages that we selected for immediate completion - completionAttempted = true; - handler->retrieveMessages(action, completionList.values(), QMailRetrievalAction::Content); - return; - } else { - completionList.clear(); - } - } - - completionAttempted = false; emit handler->retrievalCompleted(action); } @@ -209,52 +189,6 @@ void MessageServer::transmissionCompleted(quint64 action) emit handler->transmissionCompleted(action); } -void MessageServer::messagesAdded(const QMailMessageIdList &ids) -{ - if (!QMailStore::instance()->asynchronousEmission()) { - // Added in our process - from retrieval - foreach (const QMailMessageId &id, ids) { - QMailMessageMetaData message(id); - - bool complete(false); - if (!(message.status() & QMailMessage::ContentAvailable)) { - // Automatically download voicemail messages - if (message.content() == QMailMessage::VoicemailContent - || message.content() == QMailMessage::VideomailContent) { - complete = true; - } - } - - if (complete) - completionList.insert(message.id()); - } - } -} - -void MessageServer::messagesUpdated(const QMailMessageIdList &ids) -{ - if (!QMailStore::instance()->asynchronousEmission()) { - // If we're updating, check whether the messages have been marked as Removed - foreach (const QMailMessageId &id, ids) { - if (completionList.contains(id)) { - QMailMessageMetaData message(id); - if ((message.status() & QMailMessage::ContentAvailable) || (message.status() & QMailMessage::Removed)) { - // This message has been completed (or removed) - completionList.remove(id); - } - } - } - } -} - -void MessageServer::messagesRemoved(const QMailMessageIdList &ids) -{ - foreach (const QMailMessageId &id, ids) { - // No need to complete deleted messages - completionList.remove(id); - } -} - void MessageServer::cleanupTemporaryMessages() { QMailStore::instance()->removeMessages(QMailMessageKey::status(QMailMessage::Temporary), QMailStore::NoRemovalRecord); |