Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'nfc' into 'master'
Add nfc settings interfaces

See merge request mer-core/nemo-qml-plugin-systemsettings!130
  • Loading branch information
monich committed Dec 18, 2019
2 parents ba125e4 + 44716f0 commit d095d76
Show file tree
Hide file tree
Showing 4 changed files with 158 additions and 0 deletions.
110 changes: 110 additions & 0 deletions src/nfcsettings.cpp
@@ -0,0 +1,110 @@
/*
* Copyright (C) 2019 Open Mobile Platform LLС. <s.chupligin@omprussia.ru>
*
* You may use this file under the terms of the BSD license as follows:
*
* "Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Nemo Mobile nor the names of its contributors
* may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
*/


#include "nfcsettings.h"

#include <QDBusConnection>
#include <QDBusConnectionInterface>
#include <QDebug>

NfcSettings::NfcSettings(QObject *parent)
: QObject(parent)
, m_valid(false)
, m_enabled(false)
, m_available(false)
{
m_interface = new QDBusInterface("org.sailfishos.nfc.settings",
"/",
"org.sailfishos.nfc.Settings",
QDBusConnection::systemBus(),
this);
if (QDBusConnection::systemBus().interface()->isServiceRegistered("org.sailfishos.nfc.settings")) {
m_available = true;
emit availableChanged();

QDBusPendingCall pcall = m_interface->asyncCall(QLatin1String("GetEnabled"));
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);

connect(watcher, &QDBusPendingCallWatcher::finished, this, &NfcSettings::getEnableStateFinished);
QDBusConnection::systemBus().connect("org.sailfishos.nfc.settings", "/", "org.sailfishos.nfc.Settings", "EnabledChanged", this, SLOT(updateEnabledState(bool)));

} else {
qWarning() << "NFC interface not available";
qWarning() << m_interface->lastError();
}

}

NfcSettings::~NfcSettings()
{
}

bool NfcSettings::valid() const
{
return m_valid;
}

bool NfcSettings::available() const
{
return m_available;
}

bool NfcSettings::enabled() const
{
return m_enabled;
}

void NfcSettings::setEnabled(bool enabled)
{
m_interface->asyncCall("SetEnabled", enabled);
}

void NfcSettings::getEnableStateFinished(QDBusPendingCallWatcher *call)
{
QDBusPendingReply<bool> reply = *call;
if (reply.isError()) {
qWarning() << "Get dbus error:" << reply.error();
} else {
updateEnabledState(reply.value());
m_valid = true;
emit validChanged();
}
call->deleteLater();
}

void NfcSettings::updateEnabledState(bool enabled)
{
if (enabled != m_enabled) {
m_enabled = enabled;
emit enabledChanged();
}
}
44 changes: 44 additions & 0 deletions src/nfcsettings.h
@@ -0,0 +1,44 @@
#ifndef NFCSETTINGS_H
#define NFCSETTINGS_H

#include <systemsettingsglobal.h>

#include <QObject>
#include <QDBusInterface>
#include <QDBusPendingCallWatcher>
#include <QTimer>

class SYSTEMSETTINGS_EXPORT NfcSettings : public QObject
{
Q_OBJECT
Q_PROPERTY(bool valid READ valid NOTIFY validChanged)
Q_PROPERTY(bool available READ available NOTIFY availableChanged)
Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)

public:
explicit NfcSettings(QObject *parent = nullptr);
~NfcSettings();

bool valid() const;
bool available() const;
bool enabled() const;
void setEnabled(bool enabled);

signals:
void validChanged();
void availableChanged();
void enabledChanged();

private:
bool m_valid;
bool m_enabled;
bool m_available;
QDBusInterface *m_interface;
QTimer *m_timer;

private slots:
void getEnableStateFinished(QDBusPendingCallWatcher* call);
void updateEnabledState(bool enabled);
};

#endif // NFCSETTINGS_H
2 changes: 2 additions & 0 deletions src/plugin/plugin.cpp
Expand Up @@ -50,6 +50,7 @@
#include "settingsvpnmodel.h"
#include "locationsettings.h"
#include "deviceinfo.h"
#include "nfcsettings.h"

template<class T>
static QObject *api_factory(QQmlEngine *, QJSEngine *)
Expand Down Expand Up @@ -89,6 +90,7 @@ class SystemSettingsPlugin : public QQmlExtensionPlugin
qmlRegisterType<DiskUsage>(uri, 1, 0, "DiskUsage");
qmlRegisterType<LocationSettings>(uri, 1, 0, "LocationSettings");
qmlRegisterType<DeviceInfo>(uri, 1, 0, "DeviceInfo");
qmlRegisterType<NfcSettings>(uri, 1, 0, "NfcSettings");
}
};

Expand Down
2 changes: 2 additions & 0 deletions src/src.pro
Expand Up @@ -16,6 +16,7 @@ SOURCES += \
localeconfig.cpp \
logging.cpp \
datetimesettings.cpp \
nfcsettings.cpp \
profilecontrol.cpp \
alarmtonemodel.cpp \
mceiface.cpp \
Expand Down Expand Up @@ -70,6 +71,7 @@ HEADERS += \
diskusage_p.h \
locationsettings_p.h \
logging_p.h \
nfcsettings.h \
partition_p.h \
partitionmanager_p.h \
udisks2blockdevices_p.h \
Expand Down

0 comments on commit d095d76

Please sign in to comment.