parent
b5258058ab
commit
3908aca513
4 changed files with 11 additions and 20 deletions
|
@ -64,8 +64,7 @@ void ContactsPlugin::synchronizeRemoteWithLocal()
|
||||||
bool ContactsPlugin::handleResponseUIDsTimestamps(const NetworkPacket &np)
|
bool ContactsPlugin::handleResponseUIDsTimestamps(const NetworkPacket &np)
|
||||||
{
|
{
|
||||||
if (!np.has(QStringLiteral("uids"))) {
|
if (!np.has(QStringLiteral("uids"))) {
|
||||||
qCDebug(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseUIDsTimestamps:"
|
qCDebug(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseUIDsTimestamps:" << "Malformed packet does not have uids key";
|
||||||
<< "Malformed packet does not have uids key";
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
uIDList_t uIDsToUpdate;
|
uIDList_t uIDsToUpdate;
|
||||||
|
@ -97,8 +96,8 @@ bool ContactsPlugin::handleResponseUIDsTimestamps(const NetworkPacket &np)
|
||||||
|
|
||||||
// Check if the vcard needs to be updated
|
// Check if the vcard needs to be updated
|
||||||
if (!vcardFile.open(QIODevice::ReadOnly)) {
|
if (!vcardFile.open(QIODevice::ReadOnly)) {
|
||||||
qCWarning(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseUIDsTimestamps:"
|
qCWarning(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseUIDsTimestamps:" << "Unable to open" << filename
|
||||||
<< "Unable to open" << filename << "to read even though it was reported to exist";
|
<< "to read even though it was reported to exist";
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -136,8 +135,7 @@ bool ContactsPlugin::handleResponseUIDsTimestamps(const NetworkPacket &np)
|
||||||
bool ContactsPlugin::handleResponseVCards(const NetworkPacket &np)
|
bool ContactsPlugin::handleResponseVCards(const NetworkPacket &np)
|
||||||
{
|
{
|
||||||
if (!np.has(QStringLiteral("uids"))) {
|
if (!np.has(QStringLiteral("uids"))) {
|
||||||
qCDebug(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseVCards:"
|
qCDebug(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseVCards:" << "Malformed packet does not have uids key";
|
||||||
<< "Malformed packet does not have uids key";
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -151,8 +149,7 @@ bool ContactsPlugin::handleResponseVCards(const NetworkPacket &np)
|
||||||
QFile vcardFile(filename);
|
QFile vcardFile(filename);
|
||||||
bool vcardFileOpened = vcardFile.open(QIODevice::WriteOnly); // Want to smash anything that might have already been there
|
bool vcardFileOpened = vcardFile.open(QIODevice::WriteOnly); // Want to smash anything that might have already been there
|
||||||
if (!vcardFileOpened) {
|
if (!vcardFileOpened) {
|
||||||
qCWarning(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseVCards:"
|
qCWarning(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseVCards:" << "Unable to open" << filename;
|
||||||
<< "Unable to open" << filename;
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -160,8 +157,7 @@ bool ContactsPlugin::handleResponseVCards(const NetworkPacket &np)
|
||||||
const QString &vcard = np.get<QString>(ID);
|
const QString &vcard = np.get<QString>(ID);
|
||||||
fileWriteStream << vcard;
|
fileWriteStream << vcard;
|
||||||
}
|
}
|
||||||
qCDebug(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseVCards:"
|
qCDebug(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseVCards:" << "Got" << uIDs.size() << "VCards";
|
||||||
<< "Got" << uIDs.size() << "VCards";
|
|
||||||
Q_EMIT localCacheSynchronized(uIDs);
|
Q_EMIT localCacheSynchronized(uIDs);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -194,8 +194,7 @@ void DBusNotificationsListenerThread::run()
|
||||||
"member='Notify'");
|
"member='Notify'");
|
||||||
|
|
||||||
if (!error.isEmpty()) {
|
if (!error.isEmpty()) {
|
||||||
qCWarning(KDECONNECT_PLUGIN_SENDNOTIFICATIONS).noquote() << "Failed to become a DBus monitor."
|
qCWarning(KDECONNECT_PLUGIN_SENDNOTIFICATIONS).noquote() << "Failed to become a DBus monitor." << "No notifictions will be sent. Error:" << error;
|
||||||
<< "No notifictions will be sent. Error:" << error;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// wake up every minute to see if we are still connected
|
// wake up every minute to see if we are still connected
|
||||||
|
@ -376,8 +375,7 @@ QSharedPointer<QIODevice> DBusNotificationsListener::iconForImageData(const QVar
|
||||||
return QSharedPointer<QIODevice>();
|
return QSharedPointer<QIODevice>();
|
||||||
|
|
||||||
if (bitsPerSample != 8) {
|
if (bitsPerSample != 8) {
|
||||||
qCWarning(KDECONNECT_PLUGIN_SENDNOTIFICATIONS) << "Unsupported image format:"
|
qCWarning(KDECONNECT_PLUGIN_SENDNOTIFICATIONS) << "Unsupported image format:" << "width=" << width << "height=" << height << "rowStride=" << rowStride
|
||||||
<< "width=" << width << "height=" << height << "rowStride=" << rowStride
|
|
||||||
<< "bitsPerSample=" << bitsPerSample << "channels=" << channels << "hasAlpha=" << hasAlpha;
|
<< "bitsPerSample=" << bitsPerSample << "channels=" << channels << "hasAlpha=" << hasAlpha;
|
||||||
return QSharedPointer<QIODevice>();
|
return QSharedPointer<QIODevice>();
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,14 +76,12 @@ QVariantList ConversationsDbusInterface::activeConversations()
|
||||||
void ConversationsDbusInterface::requestConversation(const qint64 &conversationID, int start, int end)
|
void ConversationsDbusInterface::requestConversation(const qint64 &conversationID, int start, int end)
|
||||||
{
|
{
|
||||||
if (start < 0 || end < 0) {
|
if (start < 0 || end < 0) {
|
||||||
qCWarning(KDECONNECT_CONVERSATIONS) << "requestConversation"
|
qCWarning(KDECONNECT_CONVERSATIONS) << "requestConversation" << "Start and end must be >= 0";
|
||||||
<< "Start and end must be >= 0";
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (end - start < 0) {
|
if (end - start < 0) {
|
||||||
qCWarning(KDECONNECT_CONVERSATIONS) << "requestConversation"
|
qCWarning(KDECONNECT_CONVERSATIONS) << "requestConversation" << "Start must be before end";
|
||||||
<< "Start must be before end";
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -58,8 +58,7 @@ void ConversationModel::setDeviceId(const QString &deviceId)
|
||||||
if (deviceId == m_deviceId)
|
if (deviceId == m_deviceId)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
qCDebug(KDECONNECT_SMS_CONVERSATION_MODEL) << "setDeviceId"
|
qCDebug(KDECONNECT_SMS_CONVERSATION_MODEL) << "setDeviceId" << "of" << this;
|
||||||
<< "of" << this;
|
|
||||||
if (m_conversationsInterface) {
|
if (m_conversationsInterface) {
|
||||||
disconnect(m_conversationsInterface, &DeviceConversationsDbusInterface::conversationUpdated, this, &ConversationModel::handleConversationUpdate);
|
disconnect(m_conversationsInterface, &DeviceConversationsDbusInterface::conversationUpdated, this, &ConversationModel::handleConversationUpdate);
|
||||||
disconnect(m_conversationsInterface, &DeviceConversationsDbusInterface::conversationLoaded, this, &ConversationModel::handleConversationLoaded);
|
disconnect(m_conversationsInterface, &DeviceConversationsDbusInterface::conversationLoaded, this, &ConversationModel::handleConversationLoaded);
|
||||||
|
|
Loading…
Reference in a new issue