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

Make bluetooth payload upload work & asynchronous

Browse source 
Summary: Sharing files to the Android bluetooth backend now works. The code is asynchronous now too.

Test Plan: I tested several files, and they all get transferred correctly. The socket gets destroyed correctly too.

Reviewers: #kde_connect, apol

Reviewed By: #kde_connect, apol

Subscribers: apol, #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D12264
This commit is contained in:
Matthijs Tijink 2018-04-16 21:57:59 +02:00
parent fcfd1d7c69
commit 1b570d4719
3 changed files with 49 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/backends/bluetooth/bluetoothdevicelink.cpp
View file

@ -51,12 +51,9 @@ QString BluetoothDeviceLink::name()
bool BluetoothDeviceLink::sendPacket(NetworkPacket& np)
{
if (np.hasPayload()) {
qCWarning(KDECONNECT_CORE) << "Sending packets with payload over bluetooth not yet supported";
/*
BluetoothUploadJob* uploadJob = new BluetoothUploadJob(np.payload(), mBluetoothSocket->peerAddress(), this);
np.setPayloadTransferInfo(uploadJob->transferInfo());
uploadJob->start();
*/
}
int written = mSocketReader->write(np.serialize());
return (written != -1);

58
core/backends/bluetooth/bluetoothuploadjob.cpp
View file

@ -1,5 +1,6 @@
/*
* Copyright 2016 Saikrishna Arcot <saiarcot895@gmail.com>
* Copyright 2018 Matthijs TIjink <matthijstijink@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
@ -43,43 +44,70 @@ QVariantMap BluetoothUploadJob::transferInfo() const
void BluetoothUploadJob::start()
{
connect(mServer, SIGNAL(newConnection()), this, SLOT(newConnection()));
connect(mServer, &QBluetoothServer::newConnection, this, &BluetoothUploadJob::newConnection);
mServiceInfo = mServer->listen(mTransferUuid, "KDE Connect Transfer Job");
Q_ASSERT(mServiceInfo.isValid());
}
void BluetoothUploadJob::newConnection()
{
QBluetoothSocket* socket = mServer->nextPendingConnection();
connect(socket, SIGNAL(disconnected()), socket, SLOT(deleteLater()));
m_socket = mServer->nextPendingConnection();
Q_ASSERT(m_socket);
m_socket->setParent(this);
connect(m_socket, &QBluetoothSocket::disconnected, this, &BluetoothUploadJob::deleteLater);
if (socket->peerAddress() != mRemoteAddress) {
socket->close();
if (m_socket->peerAddress() != mRemoteAddress) {
m_socket->close();
} else {
mServer->close();
disconnect(mServer, SIGNAL(newConnection()), this, SLOT(newConnection()));
disconnect(mServer, &QBluetoothServer::newConnection, this, &BluetoothUploadJob::newConnection);
mServiceInfo.unregisterService();
if (!mData->open(QIODevice::ReadOnly)) {
qCWarning(KDECONNECT_CORE) << "error when opening the input to upload";
socket->close();
m_socket->close();
deleteLater();
return;
}
}
while (mData->bytesAvailable() > 0 && socket->isWritable()) {
qint64 bytes = qMin(mData->bytesAvailable(), (qint64)4096);
int w = socket->write(mData->read(bytes));
if (w < 0) {
qCWarning(KDECONNECT_CORE()) << "error when writing data to upload" << bytes << mData->bytesAvailable();
connect(m_socket, &QBluetoothSocket::bytesWritten, this, &BluetoothUploadJob::writeSome);
connect(m_socket, &QBluetoothSocket::disconnected, this, &BluetoothUploadJob::closeConnection);
writeSome();
}
void BluetoothUploadJob::writeSome() {
Q_ASSERT(m_socket);
bool errorOccurred = false;
while (m_socket->bytesToWrite() == 0 && mData->bytesAvailable() && m_socket->isWritable()) {
qint64 bytes = qMin<qint64>(mData->bytesAvailable(), 4096);
int bytesWritten = m_socket->write(mData->read(bytes));
if (bytesWritten < 0) {
qCWarning(KDECONNECT_CORE()) << "error when writing data to bluetooth upload" << bytes << mData->bytesAvailable();
errorOccurred = true;
break;
} else {
QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 2000);
}
}
if (mData->atEnd() || errorOccurred) {
disconnect(m_socket, &QBluetoothSocket::bytesWritten, this, &BluetoothUploadJob::writeSome);
mData->close();
connect(m_socket, &QBluetoothSocket::bytesWritten, this, &BluetoothUploadJob::finishWrites);
finishWrites();
}
}
void BluetoothUploadJob::finishWrites() {
Q_ASSERT(m_socket);
if (m_socket->bytesToWrite() == 0) {
closeConnection();
}
}
void BluetoothUploadJob::closeConnection() {
mData->close();
socket->close();
deleteLater();
}

6
core/backends/bluetooth/bluetoothuploadjob.h
View file

@ -1,5 +1,6 @@
/*
* Copyright 2016 Saikrishna Arcot <saiarcot895@gmail.com>
* Copyright 2018 Matthijs TIjink <matthijstijink@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
@ -45,9 +46,14 @@ private:
QBluetoothUuid mTransferUuid;
QBluetoothServer* mServer;
QBluetoothServiceInfo mServiceInfo;
QBluetoothSocket* m_socket;
void closeConnection();
private Q_SLOTS:
void newConnection();
void writeSome();
void finishWrites();
};
#endif // BLUETOOTHUPLOADJOB_H