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
84 lines
2.4 KiB
C++
84 lines
2.4 KiB
C++
/**
|
|
* Copyright 2018 Erik Duisters
|
|
*
|
|
* 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 COMPOSITEUPLOADJOB_H
|
|
#define COMPOSITEUPLOADJOB_H
|
|
|
|
#include "kdeconnectcore_export.h"
|
|
#include <KCompositeJob>
|
|
#include "server.h"
|
|
#include "uploadjob.h"
|
|
|
|
class KDECONNECTCORE_EXPORT CompositeUploadJob
|
|
: public KCompositeJob
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit CompositeUploadJob(const QString& deviceId, bool displayNotification);
|
|
|
|
void start() override;
|
|
QVariantMap transferInfo();
|
|
bool isRunning();
|
|
bool addSubjob(KJob* job) override;
|
|
|
|
private:
|
|
bool startListening();
|
|
void emitDescription(const QString& currentFileName);
|
|
|
|
protected:
|
|
bool doKill() override;
|
|
|
|
private:
|
|
enum {
|
|
NoPortAvailable = UserDefinedError,
|
|
SendingNetworkPacketFailed,
|
|
SocketError,
|
|
SslError
|
|
};
|
|
|
|
Server *const m_server;
|
|
QSslSocket *m_socket;
|
|
quint16 m_port;
|
|
const QString& m_deviceId;
|
|
bool m_running;
|
|
int m_currentJobNum;
|
|
int m_totalJobs;
|
|
quint64 m_currentJobSendPayloadSize;
|
|
quint64 m_totalSendPayloadSize;
|
|
quint64 m_totalPayloadSize;
|
|
UploadJob *m_currentJob;
|
|
QElapsedTimer m_timer;
|
|
|
|
const static quint16 MIN_PORT = 1739;
|
|
const static quint16 MAX_PORT = 1764;
|
|
|
|
private Q_SLOTS:
|
|
void newConnection();
|
|
void socketDisconnected();
|
|
void socketError(QAbstractSocket::SocketError socketError);
|
|
void sslError(const QList<QSslError>& errors);
|
|
void encrypted();
|
|
void slotProcessedAmount(KJob *job, KJob::Unit unit, qulonglong amount);
|
|
void slotResult(KJob *job) override;
|
|
void startNextSubJob();
|
|
};
|
|
|
|
#endif //COMPOSITEUPLOADJOB_H
|