diff --git a/plugins/findthisdevice/findthisdeviceplugin.cpp b/plugins/findthisdevice/findthisdeviceplugin.cpp index eeddb4ec..5d0df2ae 100644 --- a/plugins/findthisdevice/findthisdeviceplugin.cpp +++ b/plugins/findthisdevice/findthisdeviceplugin.cpp @@ -1,90 +1,90 @@ /** * Copyright 2018 Friedrich W. H. Kossebau * Copyright 2019 Piyush Aggarwal * * 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 . */ #include "findthisdeviceplugin.h" // KF #include #ifndef Q_OS_WIN #include #include #endif // Qt #include #include K_PLUGIN_CLASS_WITH_JSON(FindThisDevicePlugin, "kdeconnect_findthisdevice.json") FindThisDevicePlugin::FindThisDevicePlugin(QObject* parent, const QVariantList& args) : KdeConnectPlugin(parent, args) { } FindThisDevicePlugin::~FindThisDevicePlugin() = default; bool FindThisDevicePlugin::receivePacket(const NetworkPacket& np) { Q_UNUSED(np); const QString soundFile = config()->get(QStringLiteral("ringtone"), defaultSound()); - const QUrl soundURL = QUrl(soundFile); + const QUrl soundURL = QUrl::fromLocalFile(soundFile); if (soundURL.isEmpty()) { qCWarning(KDECONNECT_PLUGIN_FINDTHISDEVICE) << "Not playing sound, no valid ring tone specified."; return true; } QMediaPlayer* player = new QMediaPlayer; player->setAudioRole(QAudio::Role(QAudio::NotificationRole)); player->setMedia(soundURL); player->setVolume(100); #ifndef Q_OS_WIN const auto sinks = PulseAudioQt::Context::instance()->sinks(); QVector mutedSinks; for (auto sink : sinks) { if (sink->isMuted()) { sink->setMuted(false); mutedSinks.append(sink); } } connect(player, &QMediaPlayer::stateChanged, this, [player, mutedSinks]{ for (auto sink : qAsConst(mutedSinks)) { sink->setMuted(true); } }); #endif player->play(); connect(player, &QMediaPlayer::stateChanged, player, &QObject::deleteLater); // TODO: ensure to use built-in loudspeakers return true; } QString FindThisDevicePlugin::dbusPath() const { return QStringLiteral("/modules/kdeconnect/devices/") + device()->id() + QStringLiteral("/findthisdevice"); } #include "findthisdeviceplugin.moc" diff --git a/plugins/findthisdevice/findthisdeviceplugin.h b/plugins/findthisdevice/findthisdeviceplugin.h index 072715cf..8b957c25 100644 --- a/plugins/findthisdevice/findthisdeviceplugin.h +++ b/plugins/findthisdevice/findthisdeviceplugin.h @@ -1,95 +1,95 @@ /** * Copyright 2018 Friedrich W. H. Kossebau * Copyright 2019 Piyush Aggarwal * * 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 . */ #ifndef FINDTHISDEVICEPLUGIN_H #define FINDTHISDEVICEPLUGIN_H #include #ifdef Q_OS_WIN #include #define INFO_BUFFER_SIZE 32767 #else #include #include #include #endif // Qt #include #define PACKET_TYPE_FINDMYPHONE_REQUEST QStringLiteral("kdeconnect.findmyphone.request") static const QLoggingCategory &KDECONNECT_PLUGIN_FINDTHISDEVICE() { static const QLoggingCategory category("kdeconnect.plugin.findthisdevice"); return category; } class FindThisDevicePlugin : public KdeConnectPlugin { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.kdeconnect.device.findthisdevice") public: explicit FindThisDevicePlugin(QObject* parent, const QVariantList& args); ~FindThisDevicePlugin() override; void connected() override {}; QString dbusPath() const override; bool receivePacket(const NetworkPacket& np) override; }; inline QString defaultSound() { QString dirPath; QUrl soundURL; #ifdef Q_OS_WIN wchar_t infoBuf[INFO_BUFFER_SIZE]; if(!GetWindowsDirectory(infoBuf, INFO_BUFFER_SIZE)) { qCWarning(KDECONNECT_PLUGIN_FINDTHISDEVICE) << "Error with getting the Windows Directory."; } else { dirPath = QString::fromStdWString(infoBuf) + QStringLiteral("/media"); if (!dirPath.isEmpty()) { soundURL = QUrl::fromUserInput(QStringLiteral("Ring01.wav"), dirPath, QUrl::AssumeLocalFile); } } #else const QStringList dataLocations = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); for (const QString &dataLocation : dataLocations) { dirPath = dataLocation + QStringLiteral("/sounds"); soundURL = QUrl::fromUserInput(QStringLiteral("Oxygen-Im-Phone-Ring.ogg"), dirPath, QUrl::AssumeLocalFile); - if ((soundURL.isLocalFile() && QFile::exists(soundURL.toLocalFile())) || soundURL.isValid()) { + if ((soundURL.isLocalFile() && soundURL.isValid() && QFile::exists(soundURL.toLocalFile()))) { break; } } #endif if (soundURL.isEmpty()) { qCWarning(KDECONNECT_PLUGIN_FINDTHISDEVICE) << "Could not find default ring tone."; } - return soundURL.toString(); + return soundURL.toLocalFile(); } #endif //FINDTHISDEVICEPLUGIN_H