mirror of https://github.com/cutefishos/settings
Improve Bluetooth and remove bluezqt
parent
27ea85b763
commit
641c378464
@ -1,179 +0,0 @@
|
|||||||
/*
|
|
||||||
* SPDX-FileCopyrightText: 2010 Alex Fiestas <alex@eyeos.org>
|
|
||||||
* SPDX-FileCopyrightText: 2010 UFO Coders <info@ufocoders.com>
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "bluetoothagent.h"
|
|
||||||
|
|
||||||
#include <QDBusObjectPath>
|
|
||||||
#include <QFile>
|
|
||||||
#include <QStandardPaths>
|
|
||||||
#include <QXmlStreamReader>
|
|
||||||
|
|
||||||
#include <BluezQt/Device>
|
|
||||||
#include <QDebug>
|
|
||||||
|
|
||||||
#include <QThread>
|
|
||||||
#include <QThreadStorage>
|
|
||||||
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
static int cRandom()
|
|
||||||
{
|
|
||||||
static QThreadStorage<bool> initialized_threads;
|
|
||||||
if (!initialized_threads.localData()) {
|
|
||||||
unsigned int seed;
|
|
||||||
initialized_threads.setLocalData(true);
|
|
||||||
QFile urandom(QStringLiteral("/dev/urandom"));
|
|
||||||
bool opened = urandom.open(QIODevice::ReadOnly | QIODevice::Unbuffered);
|
|
||||||
if (!opened || urandom.read(reinterpret_cast<char *>(&seed), sizeof(seed)) != sizeof(seed)) {
|
|
||||||
// silence warnings about use of deprecated qsrand()/qrand()
|
|
||||||
// Porting to QRandomGenerator::global() instead might result in no new seed set for the generator behind qrand()
|
|
||||||
// which then might affect other places indirectly relying on this.
|
|
||||||
// So just keeping the old calls here, as this method is also deprecated and will disappear together with qsrand/qrand.
|
|
||||||
QT_WARNING_PUSH
|
|
||||||
QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations")
|
|
||||||
QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations")
|
|
||||||
// No /dev/urandom... try something else.
|
|
||||||
qsrand(getpid());
|
|
||||||
seed = qrand() ^ time(nullptr) ^ reinterpret_cast<quintptr>(QThread::currentThread());
|
|
||||||
}
|
|
||||||
qsrand(seed);
|
|
||||||
}
|
|
||||||
return qrand();
|
|
||||||
QT_WARNING_POP
|
|
||||||
}
|
|
||||||
|
|
||||||
BluetoothAgent::BluetoothAgent(QObject *parent)
|
|
||||||
: BluezQt::Agent(parent)
|
|
||||||
, m_fromDatabase(false)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
QString BluetoothAgent::pin()
|
|
||||||
{
|
|
||||||
return m_pin;
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothAgent::setPin(const QString &pin)
|
|
||||||
{
|
|
||||||
m_pin = pin;
|
|
||||||
m_fromDatabase = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool BluetoothAgent::isFromDatabase()
|
|
||||||
{
|
|
||||||
return m_fromDatabase;
|
|
||||||
}
|
|
||||||
|
|
||||||
QString BluetoothAgent::getPin(BluezQt::DevicePtr device)
|
|
||||||
{
|
|
||||||
m_fromDatabase = false;
|
|
||||||
m_pin = QString::number(cRandom());
|
|
||||||
m_pin = m_pin.left(6);
|
|
||||||
|
|
||||||
const QString &xmlPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("pin-code-database.xml"));
|
|
||||||
|
|
||||||
QFile file(xmlPath);
|
|
||||||
if (!file.open(QIODevice::ReadOnly)) {
|
|
||||||
qDebug() << "Can't open the pin-code-database.xml";
|
|
||||||
return m_pin;
|
|
||||||
}
|
|
||||||
|
|
||||||
QXmlStreamReader xml(&file);
|
|
||||||
|
|
||||||
QString deviceType = BluezQt::Device::typeToString(device->type());
|
|
||||||
if (deviceType == QLatin1String("audiovideo")) {
|
|
||||||
deviceType = QStringLiteral("audio");
|
|
||||||
}
|
|
||||||
|
|
||||||
while (!xml.atEnd()) {
|
|
||||||
xml.readNext();
|
|
||||||
if (xml.name() != QLatin1String("device")) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
QXmlStreamAttributes attr = xml.attributes();
|
|
||||||
|
|
||||||
if (attr.count() == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (attr.hasAttribute(QLatin1String("type")) && attr.value(QLatin1String("type")) != QLatin1String("any")) {
|
|
||||||
if (deviceType != attr.value(QLatin1String("type")).toString()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (attr.hasAttribute(QLatin1String("oui"))) {
|
|
||||||
if (!device->address().startsWith(attr.value(QLatin1String("oui")).toString())) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (attr.hasAttribute(QLatin1String("name"))) {
|
|
||||||
if (device->name() != attr.value(QLatin1String("name")).toString()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
m_pin = attr.value(QLatin1String("pin")).toString();
|
|
||||||
m_fromDatabase = true;
|
|
||||||
if (m_pin.startsWith(QLatin1String("max:"))) {
|
|
||||||
m_fromDatabase = false;
|
|
||||||
int num = m_pin.rightRef(m_pin.length() - 4).toInt();
|
|
||||||
m_pin = QString::number(cRandom()).left(num);
|
|
||||||
}
|
|
||||||
|
|
||||||
qDebug() << "PIN: " << m_pin;
|
|
||||||
return m_pin;
|
|
||||||
}
|
|
||||||
|
|
||||||
return m_pin;
|
|
||||||
}
|
|
||||||
|
|
||||||
QDBusObjectPath BluetoothAgent::objectPath() const
|
|
||||||
{
|
|
||||||
return QDBusObjectPath(QStringLiteral("/agent"));
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothAgent::requestPinCode(BluezQt::DevicePtr device, const BluezQt::Request<QString> &req)
|
|
||||||
{
|
|
||||||
qDebug() << "AGENT-RequestPinCode" << device->ubi();
|
|
||||||
|
|
||||||
Q_EMIT pinRequested(m_pin);
|
|
||||||
req.accept(m_pin);
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothAgent::displayPinCode(BluezQt::DevicePtr device, const QString &pinCode)
|
|
||||||
{
|
|
||||||
qDebug() << "AGENT-DisplayPinCode" << device->ubi() << pinCode;
|
|
||||||
|
|
||||||
Q_EMIT pinRequested(pinCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothAgent::requestPasskey(BluezQt::DevicePtr device, const BluezQt::Request<quint32> &req)
|
|
||||||
{
|
|
||||||
qDebug() << "AGENT-RequestPasskey" << device->ubi();
|
|
||||||
|
|
||||||
Q_EMIT pinRequested(m_pin);
|
|
||||||
req.accept(m_pin.toUInt());
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothAgent::displayPasskey(BluezQt::DevicePtr device, const QString &passkey, const QString &entered)
|
|
||||||
{
|
|
||||||
Q_UNUSED(entered);
|
|
||||||
|
|
||||||
qDebug() << "AGENT-DisplayPasskey" << device->ubi() << passkey;
|
|
||||||
|
|
||||||
Q_EMIT pinRequested(passkey);
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothAgent::requestConfirmation(BluezQt::DevicePtr device, const QString &passkey, const BluezQt::Request<> &req)
|
|
||||||
{
|
|
||||||
|
|
||||||
qDebug() << "AGENT-RequestConfirmation " << device->ubi() << passkey;
|
|
||||||
|
|
||||||
Q_EMIT confirmationRequested(passkey, req);
|
|
||||||
}
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
/*
|
|
||||||
* SPDX-FileCopyrightText: 2010 Alex Fiestas <alex@eyeos.org>
|
|
||||||
* SPDX-FileCopyrightText: 2010 UFO Coders <info@ufocoders.com>
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef BLUETOOTHAGENT_H
|
|
||||||
#define BLUETOOTHAGENT_H
|
|
||||||
|
|
||||||
#include <BluezQt/Agent>
|
|
||||||
|
|
||||||
class BluetoothAgent : public BluezQt::Agent
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
|
||||||
explicit BluetoothAgent(QObject *parent = nullptr);
|
|
||||||
|
|
||||||
QString pin();
|
|
||||||
void setPin(const QString &pin);
|
|
||||||
|
|
||||||
bool isFromDatabase();
|
|
||||||
QString getPin(BluezQt::DevicePtr device);
|
|
||||||
|
|
||||||
QDBusObjectPath objectPath() const override;
|
|
||||||
|
|
||||||
void requestPinCode(BluezQt::DevicePtr device, const BluezQt::Request<QString> &req) override;
|
|
||||||
void displayPinCode(BluezQt::DevicePtr device, const QString &pinCode) override;
|
|
||||||
void requestPasskey(BluezQt::DevicePtr device, const BluezQt::Request<quint32> &req) override;
|
|
||||||
void displayPasskey(BluezQt::DevicePtr device, const QString &passkey, const QString &entered) override;
|
|
||||||
void requestConfirmation(BluezQt::DevicePtr device, const QString &passkey, const BluezQt::Request<> &req) override;
|
|
||||||
|
|
||||||
Q_SIGNALS:
|
|
||||||
void pinRequested(const QString &pin);
|
|
||||||
void confirmationRequested(const QString &passkey, const BluezQt::Request<> &req);
|
|
||||||
|
|
||||||
private:
|
|
||||||
bool m_fromDatabase;
|
|
||||||
QString m_pin;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // BluetoothAgent_H
|
|
||||||
@ -1,140 +0,0 @@
|
|||||||
#include "bluetoothmanager.h"
|
|
||||||
#include <QDebug>
|
|
||||||
|
|
||||||
#include <BluezQt/InitManagerJob>
|
|
||||||
#include <BluezQt/Adapter>
|
|
||||||
#include <BluezQt/Device>
|
|
||||||
#include <BluezQt/MediaPlayer>
|
|
||||||
|
|
||||||
BluetoothManager::BluetoothManager(QObject *parent)
|
|
||||||
: QObject(parent)
|
|
||||||
, m_agent(new BluetoothAgent(this))
|
|
||||||
{
|
|
||||||
m_manager = new BluezQt::Manager(this);
|
|
||||||
BluezQt::InitManagerJob *initJob = m_manager->init();
|
|
||||||
initJob->start();
|
|
||||||
connect(initJob, &BluezQt::InitManagerJob::result, this, &BluetoothManager::onInitJobResult);
|
|
||||||
|
|
||||||
connect(m_agent, &BluetoothAgent::confirmationRequested, this, &BluetoothManager::confirmationRequested);
|
|
||||||
|
|
||||||
connect(m_manager, &BluezQt::Manager::bluetoothBlockedChanged, this, [=] (bool blocked) {
|
|
||||||
if (!blocked) {
|
|
||||||
BluezQt::AdapterPtr adaptor = m_manager->adapters().first();
|
|
||||||
if (adaptor) {
|
|
||||||
if (!adaptor->isDiscoverable()) {
|
|
||||||
adaptor->setDiscoverable(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
BluetoothManager::~BluetoothManager()
|
|
||||||
{
|
|
||||||
m_manager->unregisterAgent(m_agent);
|
|
||||||
|
|
||||||
delete m_agent;
|
|
||||||
delete m_manager;
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothManager::setName(const QString &name)
|
|
||||||
{
|
|
||||||
BluezQt::AdapterPtr adaptor = m_manager->usableAdapter();
|
|
||||||
adaptor->setName(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothManager::connectToDevice(const QString address)
|
|
||||||
{
|
|
||||||
BluezQt::AdapterPtr adaptor = m_manager->usableAdapter();
|
|
||||||
BluezQt::DevicePtr device = adaptor->deviceForAddress(address);
|
|
||||||
qDebug() << "hello: " << address << device->name();
|
|
||||||
m_device = device;
|
|
||||||
device->setTrusted(true);
|
|
||||||
BluezQt::PendingCall *call = m_device->connectToDevice();
|
|
||||||
// connect(call, &BluezQt::PendingCall::finished, this, &Bluetooth::connectFinished);
|
|
||||||
// connect(m_device.data(), &BluezQt::Device::connectedChanged, this, &Bluetooth::connectedStateChanged);
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothManager::requestParingConnection(const QString address)
|
|
||||||
{
|
|
||||||
BluezQt::AdapterPtr adaptor = m_manager->usableAdapter();
|
|
||||||
BluezQt::DevicePtr device = adaptor->deviceForAddress(address);
|
|
||||||
m_device = device;
|
|
||||||
// m_address = address;
|
|
||||||
BluezQt::PendingCall *pairCall = m_device->pair();
|
|
||||||
// connect(pairCall, &BluezQt::PendingCall::finished, this, &Bluetooth::pairingFinished);
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothManager::confirmMatchButton(const bool match)
|
|
||||||
{
|
|
||||||
if (match){
|
|
||||||
m_req.accept();
|
|
||||||
} else{
|
|
||||||
m_req.reject();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothManager::deviceDisconnect(const QString address)
|
|
||||||
{
|
|
||||||
stopMediaPlayer(address);
|
|
||||||
BluezQt::AdapterPtr adaptor = m_manager->usableAdapter();
|
|
||||||
BluezQt::DevicePtr device = adaptor->deviceForAddress(address);
|
|
||||||
BluezQt::PendingCall *pairCall = device->disconnectFromDevice();
|
|
||||||
// connect(pairCall, &BluezQt::PendingCall::finished, this, &Bluetooth::disconnectFromDeviceFinished);
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothManager::deviceRemoved(const QString address)
|
|
||||||
{
|
|
||||||
stopMediaPlayer(address);
|
|
||||||
BluezQt::AdapterPtr adaptor = m_manager->usableAdapter();
|
|
||||||
BluezQt::DevicePtr device = adaptor->deviceForAddress(address);
|
|
||||||
BluezQt::PendingCall *removeCall = adaptor->removeDevice(device);
|
|
||||||
// connect(removeCall, &BluezQt::PendingCall::finished, this, &Bluetooth::removeDeviceFinished);
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothManager::stopMediaPlayer(const QString address)
|
|
||||||
{
|
|
||||||
BluezQt::AdapterPtr adaptor = m_manager->usableAdapter();
|
|
||||||
BluezQt::DevicePtr device = adaptor->deviceForAddress(address);
|
|
||||||
BluezQt::MediaPlayerPtr mediaPlayer = device->mediaPlayer();
|
|
||||||
|
|
||||||
if (mediaPlayer){
|
|
||||||
mediaPlayer->stop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothManager::onInitJobResult(BluezQt::InitManagerJob *job)
|
|
||||||
{
|
|
||||||
if (job->error()) {
|
|
||||||
qDebug() << "Init Bluetooth error";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Make sure to register agent when bluetoothd starts
|
|
||||||
operationalChanged(m_manager->isOperational());
|
|
||||||
connect(m_manager, &BluezQt::Manager::operationalChanged, this, &BluetoothManager::operationalChanged);
|
|
||||||
|
|
||||||
m_adapter = m_manager->usableAdapter();
|
|
||||||
if (m_adapter) {
|
|
||||||
setName("CutefishOS");
|
|
||||||
|
|
||||||
if (!m_adapter->isDiscoverable())
|
|
||||||
m_adapter->startDiscovery();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothManager::operationalChanged(bool operational)
|
|
||||||
{
|
|
||||||
if (operational) {
|
|
||||||
m_manager->registerAgent(m_agent);
|
|
||||||
} else {
|
|
||||||
// Attempt to start bluetoothd
|
|
||||||
BluezQt::Manager::startService();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void BluetoothManager::confirmationRequested(const QString &passkey, const BluezQt::Request<> &req)
|
|
||||||
{
|
|
||||||
m_req = req;
|
|
||||||
Q_EMIT showPairDialog(m_device->name(), passkey);
|
|
||||||
}
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
#ifndef BLUETOOTHMANAGER_H
|
|
||||||
#define BLUETOOTHMANAGER_H
|
|
||||||
|
|
||||||
#include <QObject>
|
|
||||||
#include <BluezQt/Manager>
|
|
||||||
#include "bluetoothagent.h"
|
|
||||||
|
|
||||||
class BluetoothManager : public QObject
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
|
||||||
explicit BluetoothManager(QObject *parent = nullptr);
|
|
||||||
~BluetoothManager();
|
|
||||||
|
|
||||||
Q_INVOKABLE void setName(const QString &name);
|
|
||||||
Q_INVOKABLE void connectToDevice(const QString address);
|
|
||||||
Q_INVOKABLE void requestParingConnection(const QString address);
|
|
||||||
Q_INVOKABLE void confirmMatchButton(const bool match);
|
|
||||||
Q_INVOKABLE void deviceDisconnect(const QString address);
|
|
||||||
Q_INVOKABLE void deviceRemoved(const QString address);
|
|
||||||
Q_INVOKABLE void stopMediaPlayer(const QString address);
|
|
||||||
|
|
||||||
signals:
|
|
||||||
void showPairDialog(const QString name, const QString pin);
|
|
||||||
|
|
||||||
private slots:
|
|
||||||
void onInitJobResult(BluezQt::InitManagerJob *job);
|
|
||||||
void operationalChanged(bool operational);
|
|
||||||
void confirmationRequested(const QString &passkey, const BluezQt::Request<> &req);
|
|
||||||
|
|
||||||
private:
|
|
||||||
BluezQt::Manager *m_manager;
|
|
||||||
BluetoothAgent *m_agent;
|
|
||||||
BluezQt::AdapterPtr m_adapter;
|
|
||||||
BluezQt::DevicePtr m_device;
|
|
||||||
BluezQt::Request<> m_req;
|
|
||||||
QString m_name;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // BLUETOOTHMANAGER_H
|
|
||||||
Loading…
Reference in New Issue