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

Revert "Make default name and device type customizable"

Browse source 
This causes a crash described in https://invent.kde.org/kde/kdeconnect-kde/-/merge_requests/206#note_37534

This reverts commit a39a2d562d.
This commit is contained in:
Nicolas Fella 2020-03-21 21:13:41 +01:00
parent 08df418cc9
commit eac1e07e29
4 changed files with 11 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/daemon.h
View file

@ -55,8 +55,6 @@ public:
virtual void quit() = 0; virtual void quit() = 0;
virtual QNetworkAccessManager* networkAccessManager(); virtual QNetworkAccessManager* networkAccessManager();
virtual KJobTrackerInterface* jobTracker() = 0; virtual KJobTrackerInterface* jobTracker() = 0;
virtual QString defaultName() const = 0;
virtual QString deviceType() const = 0;
Device* getDevice(const QString& deviceId); Device* getDevice(const QString& deviceId);

19
core/kdeconnectconfig.cpp
View file

@ -29,6 +29,7 @@
#include <QDir> #include <QDir>
#include <QStandardPaths> #include <QStandardPaths>
#include <QCoreApplication> #include <QCoreApplication>
#include <QHostInfo>
#include <QSettings> #include <QSettings>
#include <QSslCertificate> #include <QSslCertificate>
#include <QtCrypto> #include <QtCrypto>
@ -52,9 +53,6 @@ struct KdeConnectConfigPrivate {
QSettings* m_config; QSettings* m_config;
QSettings* m_trustedDevices; QSettings* m_trustedDevices;
QString m_defaultName;
QString m_deviceType;
#ifdef USE_PRIVATE_DBUS #ifdef USE_PRIVATE_DBUS
QString m_privateDBusAddress; // Private DBus Address cache QString m_privateDBusAddress; // Private DBus Address cache
#endif #endif
@ -86,16 +84,21 @@ KdeConnectConfig::KdeConnectConfig()
d->m_config = new QSettings(baseConfigDir().absoluteFilePath(QStringLiteral("config")), QSettings::IniFormat); d->m_config = new QSettings(baseConfigDir().absoluteFilePath(QStringLiteral("config")), QSettings::IniFormat);
d->m_trustedDevices = new QSettings(baseConfigDir().absoluteFilePath(QStringLiteral("trusted_devices")), QSettings::IniFormat); d->m_trustedDevices = new QSettings(baseConfigDir().absoluteFilePath(QStringLiteral("trusted_devices")), QSettings::IniFormat);
d->m_defaultName = Daemon::instance()->defaultName();
d->m_deviceType = Daemon::instance()->deviceType();
loadPrivateKey(); loadPrivateKey();
loadCertificate(); loadCertificate();
} }
QString KdeConnectConfig::name() QString KdeConnectConfig::name()
{ {
return d->m_config->value(QStringLiteral("name"), d->m_defaultName).toString(); QString username;
#ifdef Q_OS_WIN
username = QString::fromLatin1(qgetenv("USERNAME"));
#else
username = QString::fromLatin1(qgetenv("USER"));
#endif
QString defaultName = username + QStringLiteral("@") + QHostInfo::localHostName();
QString name = d->m_config->value(QStringLiteral("name"), defaultName).toString();
return name;
} }
void KdeConnectConfig::setName(const QString& name) void KdeConnectConfig::setName(const QString& name)
@ -106,7 +109,7 @@ void KdeConnectConfig::setName(const QString& name)
QString KdeConnectConfig::deviceType() QString KdeConnectConfig::deviceType()
{ {
return d->m_deviceType; return QStringLiteral("desktop"); // TODO
} }
QString KdeConnectConfig::deviceId() QString KdeConnectConfig::deviceId()

15
daemon/kdeconnectd.cpp
View file

@ -29,7 +29,6 @@
#include <QStandardPaths> #include <QStandardPaths>
#include <QIcon> #include <QIcon>
#include <QProcess> #include <QProcess>
#include <QHostInfo>
#include <KAboutData> #include <KAboutData>
#include <KDBusService> #include <KDBusService>
@ -96,20 +95,6 @@ public:
return KIO::getJobTracker(); return KIO::getJobTracker();
} }
QString defaultName() const override {
QString username;
#ifdef Q_OS_WIN
username = QString::fromLatin1(qgetenv("USERNAME"));
#else
username = QString::fromLatin1(qgetenv("USER"));
#endif
return username + QLatin1Char('@') + QHostInfo::localHostName();
}
QString deviceType() const override {
return QStringLiteral("desktop");
}
Q_SCRIPTABLE void sendSimpleNotification(const QString &eventId, const QString &title, const QString &text, const QString &iconName) override Q_SCRIPTABLE void sendSimpleNotification(const QString &eventId, const QString &title, const QString &text, const QString &iconName) override
{ {
KNotification* notification = new KNotification(eventId); //KNotification::Persistent KNotification* notification = new KNotification(eventId); //KNotification::Persistent

8
tests/testdaemon.h
View file

@ -80,14 +80,6 @@ public:
qDebug() << "quit was called"; qDebug() << "quit was called";
} }
QString defaultName() const override {
return QStringLiteral("test@localhost");
}
QString deviceType() const override {
return QStringLiteral("desktop");
}
KJobTrackerInterface* jobTracker() override KJobTrackerInterface* jobTracker() override
{ {
if (!m_jobTrackerInterface) { if (!m_jobTrackerInterface) {