bbcbec7709
Moves all the stuff that is needed to start DBus on macOS (which for some reason it needs several steps, involving the use of `launchctl`) into a single `startDBusDaemon()` function. Before, it was spread into `kdeconnectconfig.cpp`, `indicatorhelper_mac.cpp` and `dbushelper.cpp`. It also removes checking for an existing DBus daemon and always starts our own, since in most cases we couldn't connect to it anyway. This, together with removing the sleep in the retries when polling for the DBus daemon from 3s to 100ms, makes the startup much faster, so I removed the loading splash screen.
78 lines
2.1 KiB
C++
78 lines
2.1 KiB
C++
/**
|
|
* SPDX-FileCopyrightText: 2015 Albert Vaca <albertvaka@gmail.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
|
|
*/
|
|
|
|
#ifndef KDECONNECTCONFIG_H
|
|
#define KDECONNECTCONFIG_H
|
|
|
|
#include <QDir>
|
|
#include <QSslKey>
|
|
|
|
#include "deviceinfo.h"
|
|
#include "kdeconnectcore_export.h"
|
|
|
|
class QSslCertificate;
|
|
|
|
class KDECONNECTCORE_EXPORT KdeConnectConfig
|
|
{
|
|
public:
|
|
static KdeConnectConfig &instance();
|
|
|
|
/*
|
|
* Our own info
|
|
*/
|
|
|
|
QString deviceId();
|
|
QString name();
|
|
DeviceType deviceType();
|
|
QSslKey privateKey();
|
|
QSslCertificate certificate();
|
|
DeviceInfo deviceInfo();
|
|
QSsl::KeyAlgorithm privateKeyAlgorithm();
|
|
QString privateKeyPath();
|
|
QString certificatePath();
|
|
|
|
void setName(const QString &name);
|
|
|
|
/*
|
|
* Trusted devices
|
|
*/
|
|
|
|
QStringList trustedDevices(); // list of ids
|
|
void removeTrustedDevice(const QString &id);
|
|
void addTrustedDevice(const DeviceInfo &deviceInfo);
|
|
void updateTrustedDeviceInfo(const DeviceInfo &deviceInfo);
|
|
DeviceInfo getTrustedDevice(const QString &id);
|
|
QSslCertificate getTrustedDeviceCertificate(const QString &id);
|
|
|
|
void setDeviceProperty(const QString &deviceId, const QString &name, const QString &value);
|
|
QString getDeviceProperty(const QString &deviceId, const QString &name, const QString &defaultValue = QString());
|
|
|
|
// Custom devices
|
|
void setCustomDevices(const QStringList &addresses);
|
|
QStringList customDevices() const;
|
|
|
|
/*
|
|
* Paths for config files, there is no guarantee the directories already exist
|
|
*/
|
|
QDir baseConfigDir();
|
|
QDir deviceConfigDir(const QString &deviceId);
|
|
QDir pluginConfigDir(const QString &deviceId, const QString &pluginName); // Used by KdeConnectPluginConfig
|
|
|
|
private:
|
|
KdeConnectConfig();
|
|
|
|
void loadOrGeneratePrivateKeyAndCertificate(const QString &keyPath, const QString &certPath);
|
|
bool loadPrivateKey(const QString &path);
|
|
bool loadCertificate(const QString &path);
|
|
void generatePrivateKey(const QString &path);
|
|
void generateCertificate(const QString &path);
|
|
|
|
void removeAllTrustedDevices();
|
|
|
|
struct KdeConnectConfigPrivate *d;
|
|
};
|
|
|
|
#endif
|