b6c15289f5
Summary:
Combine multiple upload jobs for files into a single KCompositeJob so only 1 notification will be shown
Includes changes introduced in D16279
Test Plan:
1. Share of multiple files is performed using 1 composite job
Setup:
- Select multiple (big) files in dolphin and share with an Android device
Result:
- The files will be transferred using 1 CompositeUploadJob and showing only 1 notification
2. Share of file while another share is already running adds job to existing composite job
Setup:
- Select multiple (big) files in dolphin and share with an Android device
- Share an additional file with the same Android device
Result:
- The files are all transferred using 1 CompositeUploadJob and showing only 1 notification
- The notification is updated after adding the last file
3. Other packets are transmitted as usual
Setup:
- Setup sharing desktop notification with device
- Share a big file with an Android device
- Generate a desktop notification (eg. sending or receiving an email)
Result:
- Notification packet is send immediately
Reviewers: #kde_connect, nicolasfella, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: albertvaka, apol, nicolasfella, broulik, kdeconnect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D17081
70 lines
2 KiB
C++
70 lines
2 KiB
C++
/**
|
|
* Copyright 2013 Albert Vaca <albertvaka@gmail.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License or (at your option) version 3 or any later version
|
|
* accepted by the membership of KDE e.V. (or its successor approved
|
|
* by the membership of KDE e.V.), which shall act as a proxy
|
|
* defined in Section 14 of version 3 of the license.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef LANDEVICELINK_H
|
|
#define LANDEVICELINK_H
|
|
|
|
#include <QObject>
|
|
#include <QPointer>
|
|
#include <QString>
|
|
#include <QSslSocket>
|
|
#include <QSslCertificate>
|
|
|
|
#include <kdeconnectcore_export.h>
|
|
#include "backends/devicelink.h"
|
|
#include "uploadjob.h"
|
|
#include "compositeuploadjob.h"
|
|
|
|
class SocketLineReader;
|
|
|
|
class KDECONNECTCORE_EXPORT LanDeviceLink
|
|
: public DeviceLink
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
enum ConnectionStarted : bool { Locally, Remotely };
|
|
|
|
LanDeviceLink(const QString& deviceId, LinkProvider* parent, QSslSocket* socket, ConnectionStarted connectionSource);
|
|
void reset(QSslSocket* socket, ConnectionStarted connectionSource);
|
|
|
|
QString name() override;
|
|
bool sendPacket(NetworkPacket& np) override;
|
|
|
|
void userRequestsPair() override;
|
|
void userRequestsUnpair() override;
|
|
|
|
void setPairStatus(PairStatus status) override;
|
|
|
|
bool linkShouldBeKeptAlive() override;
|
|
|
|
QHostAddress hostAddress() const;
|
|
|
|
private Q_SLOTS:
|
|
void dataReceived();
|
|
|
|
private:
|
|
SocketLineReader* m_socketLineReader;
|
|
ConnectionStarted m_connectionSource;
|
|
QHostAddress m_hostAddress;
|
|
QPointer<CompositeUploadJob> m_compositeUploadJob;
|
|
};
|
|
|
|
#endif
|