[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:27:05 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=9af0bc3
The following commit has been merged in the master branch:
commit 9af0bc342d11b37b2aaf07999d298a00f691c77d
Author: Albert Vaca <albertvaka at gmail.com>
Date: Sat Oct 5 17:20:13 2013 +0200
LanDeviceLink now uses readLine instead of readAll
---
kded/backends/lan/landevicelink.cpp | 51 +++++++++++++++----------------------
1 file changed, 20 insertions(+), 31 deletions(-)
diff --git a/kded/backends/lan/landevicelink.cpp b/kded/backends/lan/landevicelink.cpp
index b340746..d2d2682 100644
--- a/kded/backends/lan/landevicelink.cpp
+++ b/kded/backends/lan/landevicelink.cpp
@@ -81,48 +81,37 @@ bool LanDeviceLink::sendPackage(NetworkPackage& np)
void LanDeviceLink::dataReceived()
{
- QByteArray data = mSocket->readAll();
- //qDebug() << "LanDeviceLink dataReceived" << data;
-
- QList<QByteArray> packages = data.split('
');
- Q_FOREACH(const QByteArray& package, packages) {
-
- if (package.length() < 3) {
- continue;
- }
-
- NetworkPackage unserialized(QString::null);
- NetworkPackage::unserialize(package, &unserialized);
- if (unserialized.isEncrypted()) {
+ QByteArray package = mSocket->readLine();
- //mPrivateKey should always be set when device link is added to device, no null-checking done here
- NetworkPackage decrypted(QString::null);
- unserialized.decrypt(mPrivateKey, &decrypted);
+ //qDebug() << "LanDeviceLink dataReceived" << data;
- if (decrypted.hasPayloadTransferInfo()) {
- qDebug() << "HasPayloadTransferInfo";
- DownloadJob* job = new DownloadJob(mSocket->peerAddress(), decrypted.payloadTransferInfo());
- job->start();
- decrypted.setPayload(job->getPayload(), decrypted.payloadSize());
- }
+ NetworkPackage unserialized(QString::null);
+ NetworkPackage::unserialize(package, &unserialized);
+ if (unserialized.isEncrypted()) {
- Q_EMIT receivedPackage(decrypted);
+ //mPrivateKey should always be set when device link is added to device, no null-checking done here
+ NetworkPackage decrypted(QString::null);
+ unserialized.decrypt(mPrivateKey, &decrypted);
- } else {
+ if (decrypted.hasPayloadTransferInfo()) {
+ qDebug() << "HasPayloadTransferInfo";
+ DownloadJob* job = new DownloadJob(mSocket->peerAddress(), decrypted.payloadTransferInfo());
+ job->start();
+ decrypted.setPayload(job->getPayload(), decrypted.payloadSize());
+ }
- if (unserialized.hasPayloadTransferInfo()) {
- qWarning() << "Ignoring unencrypted payload";
- continue;
- }
+ Q_EMIT receivedPackage(decrypted);
- Q_EMIT receivedPackage(unserialized);
+ } else {
+ if (unserialized.hasPayloadTransferInfo()) {
+ qWarning() << "Ignoring unencrypted payload";
}
- }
+ Q_EMIT receivedPackage(unserialized);
- //qDebug() << "MOAR BYTES" << mSocket->bytesAvailable() << packages.length();
+ }
if (mSocket->bytesAvailable() > 0) {
QMetaObject::invokeMethod(this, "dataReceived", Qt::QueuedConnection);
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list