tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plugins: Add context-aware logging in case of errors

Browse source 
Also clean up some unneeded statements
This commit is contained in:
Albert Vaca Cintora 2023-08-01 16:31:45 +00:00 committed by Alexander Lohnau
parent 1631ada5b3
commit abb6dfcc6e
7 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/kdeconnectplugin.cpp
View file

@ -71,7 +71,7 @@ QString KdeConnectPlugin::dbusPath() const
void KdeConnectPlugin::receivePacket(const NetworkPacket &np) void KdeConnectPlugin::receivePacket(const NetworkPacket &np)
{ {
qCWarning(KDECONNECT_CORE) << metaObject()->className() << "tried to send an recieve an unhandled packet type" << np.type(); qCWarning(KDECONNECT_CORE) << metaObject()->className() << "received a packet of type" << np.type() << "but doesn't implement receivePacket";
} }
QString KdeConnectPlugin::iconName() const QString KdeConnectPlugin::iconName() const
{ {

4
plugins/battery/batteryplugin.cpp
View file

@ -108,10 +108,6 @@ void BatteryPlugin::slotChargeChanged()
void BatteryPlugin::receivePacket(const NetworkPacket &np) void BatteryPlugin::receivePacket(const NetworkPacket &np)
{ {
if (PACKET_TYPE_BATTERY != np.type()) {
return;
}
m_isCharging = np.get<bool>(QStringLiteral("isCharging"), false); m_isCharging = np.get<bool>(QStringLiteral("isCharging"), false);
m_charge = np.get<int>(QStringLiteral("currentCharge"), -1); m_charge = np.get<int>(QStringLiteral("currentCharge"), -1);
const int thresholdEvent = np.get<int>(QStringLiteral("thresholdEvent"), (int)ThresholdNone); const int thresholdEvent = np.get<int>(QStringLiteral("thresholdEvent"), (int)ThresholdNone);

1
plugins/clipboard/clipboardplugin.cpp
View file

@ -88,6 +88,7 @@ void ClipboardPlugin::receivePacket(const NetworkPacket &np)
qint64 packetTime = np.get<qint64>(QStringLiteral("timestamp")); qint64 packetTime = np.get<qint64>(QStringLiteral("timestamp"));
// If the packetTime is 0, it means the timestamp is unknown (so do nothing). // If the packetTime is 0, it means the timestamp is unknown (so do nothing).
if (packetTime == 0 || packetTime < ClipboardListener::instance()->updateTimestamp()) { if (packetTime == 0 || packetTime < ClipboardListener::instance()->updateTimestamp()) {
qCWarning(KDECONNECT_PLUGIN_CLIPBOARD) << "Ignoring clipboard without timestamp";
return; return;
} }

4
plugins/connectivity-report/connectivity_reportplugin.cpp
View file

@ -32,10 +32,6 @@ int ConnectivityReportPlugin::cellularNetworkStrength() const
void ConnectivityReportPlugin::receivePacket(const NetworkPacket &np) void ConnectivityReportPlugin::receivePacket(const NetworkPacket &np)
{ {
if (PACKET_TYPE_CONNECTIVITY_REPORT != np.type()) {
return;
}
auto subscriptions = np.get<QVariantMap>(QStringLiteral("signalStrengths"), QVariantMap()); auto subscriptions = np.get<QVariantMap>(QStringLiteral("signalStrengths"), QVariantMap());
if (!subscriptions.isEmpty()) { if (!subscriptions.isEmpty()) {
auto networkInfo = subscriptions.first().toMap(); auto networkInfo = subscriptions.first().toMap();

3
plugins/contacts/contactsplugin.cpp
View file

@ -53,9 +53,6 @@ void ContactsPlugin::receivePacket(const NetworkPacket &np)
handleResponseUIDsTimestamps(np); handleResponseUIDsTimestamps(np);
} else if (np.type() == PACKET_TYPE_CONTACTS_RESPONSE_VCARDS) { } else if (np.type() == PACKET_TYPE_CONTACTS_RESPONSE_VCARDS) {
handleResponseVCards(np); handleResponseVCards(np);
} else {
// Is this check necessary?
qCDebug(KDECONNECT_PLUGIN_CONTACTS) << "Unknown packet type received from device: " << device()->name() << ". Maybe you need to upgrade KDE Connect?";
} }
} }

5
plugins/notifications/notificationsplugin.cpp
View file

@ -35,8 +35,9 @@ void NotificationsPlugin::connected()
void NotificationsPlugin::receivePacket(const NetworkPacket &np) void NotificationsPlugin::receivePacket(const NetworkPacket &np)
{ {
if (np.get<bool>(QStringLiteral("request"))) if (np.get<bool>(QStringLiteral("request"))) {
return; qCWarning(KDECONNECT_PLUGIN_NOTIFICATION) << "Unexpected notification request. Maybe the paired client is very old?";
}
if (np.get<bool>(QStringLiteral("isCancel"))) { if (np.get<bool>(QStringLiteral("isCancel"))) {
QString id = np.get<QString>(QStringLiteral("id")); QString id = np.get<QString>(QStringLiteral("id"));

2
plugins/sftp/sftpplugin.cpp
View file

@ -126,7 +126,7 @@ void SftpPlugin::receivePacket(const NetworkPacket &np)
const QStringList keysList = np.body().keys(); const QStringList keysList = np.body().keys();
const auto keys = QSet(keysList.begin(), keysList.end()); const auto keys = QSet(keysList.begin(), keysList.end());
if (!(fields_c - keys).isEmpty() && !np.has(QStringLiteral("errorMessage"))) { if (!(fields_c - keys).isEmpty() && !np.has(QStringLiteral("errorMessage"))) {
// packet is invalid qCWarning(KDECONNECT_PLUGIN_SFTP) << "Invalid sftp packet received";
return; return;
} }