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

Check for null devices in compositeuploadjob

Browse source
This commit is contained in:
Albert Vaca Cintora 2023-07-16 15:01:04 +02:00
parent 12a1f33665
commit af907cea83
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
core/backends/lan/compositeuploadjob.cpp
View file

@ -114,11 +114,17 @@ void CompositeUploadJob::startNextSubJob()
np.set<int>(QStringLiteral("numberOfFiles"), m_totalJobs); np.set<int>(QStringLiteral("numberOfFiles"), m_totalJobs);
np.set<quint64>(QStringLiteral("totalPayloadSize"), m_totalPayloadSize); np.set<quint64>(QStringLiteral("totalPayloadSize"), m_totalPayloadSize);
if (Daemon::instance()->getDevice(m_deviceId)->sendPacket(np)) { Device *device = Daemon::instance()->getDevice(m_deviceId);
if (device == nullptr) {
qCWarning(KDECONNECT_CORE) << "Device disconnected" << this->m_deviceId;
return;
}
if (device->sendPacket(np)) {
m_server->resumeAccepting(); m_server->resumeAccepting();
} else { } else {
setError(SendingNetworkPacketFailed); setError(SendingNetworkPacketFailed);
setErrorText(i18n("Failed to send packet to %1", Daemon::instance()->getDevice(m_deviceId)->name())); setErrorText(i18n("Failed to send packet to %1", device->name()));
emitResult(); emitResult();
} }
@ -225,13 +231,18 @@ bool CompositeUploadJob::addSubjob(KJob *job)
void CompositeUploadJob::sendUpdatePacket() void CompositeUploadJob::sendUpdatePacket()
{ {
m_updatePacketPending = false;
NetworkPacket np(PACKET_TYPE_SHARE_REQUEST_UPDATE); NetworkPacket np(PACKET_TYPE_SHARE_REQUEST_UPDATE);
np.set<int>(QStringLiteral("numberOfFiles"), m_totalJobs); np.set<int>(QStringLiteral("numberOfFiles"), m_totalJobs);
np.set<quint64>(QStringLiteral("totalPayloadSize"), m_totalPayloadSize); np.set<quint64>(QStringLiteral("totalPayloadSize"), m_totalPayloadSize);
Daemon::instance()->getDevice(m_deviceId)->sendPacket(np); Device *device = Daemon::instance()->getDevice(m_deviceId);
if (device == nullptr) {
m_updatePacketPending = false; qCWarning(KDECONNECT_CORE) << "Device disconnected" << this->m_deviceId;
return;
}
device->sendPacket(np);
} }
bool CompositeUploadJob::doKill() bool CompositeUploadJob::doKill()
@ -284,7 +295,12 @@ void CompositeUploadJob::slotResult(KJob *job)
void CompositeUploadJob::emitDescription(const QString &currentFileName) void CompositeUploadJob::emitDescription(const QString &currentFileName)
{ {
Q_EMIT description(this, i18n("Sending to %1", Daemon::instance()->getDevice(this->m_deviceId)->name()), {i18n("File"), currentFileName}, {}); Device *device = Daemon::instance()->getDevice(this->m_deviceId);
if (device == nullptr) {
qWarning() << "Device disconnected" << this->m_deviceId;
return;
}
Q_EMIT description(this, i18n("Sending to %1", device->name()), {i18n("File"), currentFileName}, {});
setProcessedAmount(Files, m_currentJobNum); setProcessedAmount(Files, m_currentJobNum);
setTotalAmount(Files, m_totalJobs); setTotalAmount(Files, m_totalJobs);