marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kcms/cellularnetwork: Fix error condition

Browse source
This commit is contained in:
Devin Lin 2023-12-14 22:01:00 -08:00
parent 30262da8a5
commit 1c2ec93843
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kcms/cellularnetwork/modem.cpp
View file

@ -125,7 +125,7 @@ QCoro::Task<void> Modem::reset()
QDBusReply<void> reply = co_await m_mmInterface->reset();
if (reply.isValid()) {
if (!reply.isValid()) {
qDebug() << QStringLiteral("Error resetting the modem:") << reply.error().message();
CellularNetworkSettings::instance()->addMessage(InlineMessage::Error, i18n("Error resetting the modem: %1", reply.error().message()));
}
@ -234,7 +234,7 @@ QCoro::Task<void> Modem::setIsRoaming(bool roaming)
gsmSetting->setHomeOnly(!roaming); // set roaming setting
QDBusReply<void> reply = co_await connection->update(connection->settings()->toMap());
if (reply.isValid()) {
if (!reply.isValid()) {
qWarning() << QStringLiteral("Error updating connection settings for") << connection->uuid() << QStringLiteral(":") << reply.error().message()
<< QStringLiteral(".");
CellularNetworkSettings::instance()->addMessage(
@ -315,7 +315,7 @@ QCoro::Task<void> Modem::activateProfile(const QString &connectionUni)
// activate connection manually
// despite the documentation saying otherwise, activateConnection seems to need the DBus path, not uuid of the connection
QDBusReply<QDBusObjectPath> reply = co_await NetworkManager::activateConnection(con->path(), m_nmModem->uni(), "");
if (reply.isValid()) {
if (!reply.isValid()) {
qWarning() << QStringLiteral("Error activating connection:") << reply.error().message();
CellularNetworkSettings::instance()->addMessage(InlineMessage::Error, i18n("Error activating connection: %1", reply.error().message()));
co_return;
@ -349,7 +349,7 @@ QCoro::Task<void> Modem::addProfile(QString name, QString apn, QString username,
gsmSetting->setInitialized(true);
QDBusReply<QDBusObjectPath> reply = co_await NetworkManager::addAndActivateConnection(settings->toMap(), m_nmModem->uni(), "");
if (reply.isValid()) {
if (!reply.isValid()) {
qWarning() << QStringLiteral("Error adding connection:") << reply.error().message();
CellularNetworkSettings::instance()->addMessage(InlineMessage::Error, i18n("Error adding connection: %1", reply.error().message()));
} else {
@ -366,7 +366,7 @@ QCoro::Task<void> Modem::removeProfile(const QString &connectionUni)
}
QDBusReply<void> reply = co_await con->remove();
if (reply.isValid()) {
if (!reply.isValid()) {
qWarning() << QStringLiteral("Error removing connection") << reply.error().message();
CellularNetworkSettings::instance()->addMessage(InlineMessage::Error, i18n("Error removing connection: %1", reply.error().message()));
}
@ -399,7 +399,7 @@ QCoro::Task<void> Modem::updateProfile(QString connectionUni, QString name, QStr
gsmSetting->setInitialized(true);
QDBusReply<void> reply = con->update(conSettings->toMap());
if (reply.isValid()) {
if (!reply.isValid()) {
qWarning() << QStringLiteral("Error updating connection settings for") << connectionUni << QStringLiteral(":") << reply.error().message()
<< QStringLiteral(".");
CellularNetworkSettings::instance()->addMessage(InlineMessage::Error,

8
kcms/cellularnetwork/sim.cpp
View file

@ -159,7 +159,7 @@ QCoro::Task<void> Sim::togglePinEnabled(const QString &pin)
{
bool isPinEnabled = pinEnabled();
QDBusReply<void> reply = co_await m_mmSim->enablePin(pin, !isPinEnabled);
if (reply.isValid()) {
if (!reply.isValid()) {
qWarning() << QStringLiteral("Error toggling SIM lock to") << isPinEnabled << QStringLiteral(":") << reply.error().message();
CellularNetworkSettings::instance()->addMessage(InlineMessage::Error, i18n("Error toggling SIM lock: %1", reply.error().message()));
}
@ -168,7 +168,7 @@ QCoro::Task<void> Sim::togglePinEnabled(const QString &pin)
QCoro::Task<void> Sim::changePin(const QString &oldPin, const QString &newPin)
{
QDBusReply<void> reply = co_await m_mmSim->changePin(oldPin, newPin);
if (reply.isValid()) {
if (!reply.isValid()) {
qWarning() << QStringLiteral("Error changing the PIN:") << reply.error().message();
CellularNetworkSettings::instance()->addMessage(InlineMessage::Error, i18n("Error changing the PIN: %1", reply.error().message()));
}
@ -181,7 +181,7 @@ QCoro::Task<void> Sim::sendPin(const QString &pin)
}
QDBusReply<void> reply = co_await m_mmSim->sendPin(pin);
if (reply.isValid()) {
if (!reply.isValid()) {
qWarning() << QStringLiteral("Error sending the PIN:") << reply.error().message();
CellularNetworkSettings::instance()->addMessage(InlineMessage::Error, i18n("Error sending the PIN: %1", reply.error().message()));
}
@ -194,7 +194,7 @@ QCoro::Task<void> Sim::sendPuk(const QString &pin, const QString &puk)
}
QDBusReply<void> reply = co_await m_mmSim->sendPuk(pin, puk);
if (reply.isValid()) {
if (!reply.isValid()) {
qWarning() << QStringLiteral("Error sending the PUK:") << reply.error().message();
CellularNetworkSettings::instance()->addMessage(InlineMessage::Error, i18n("Error sending the PUK: %1", reply.error().message()));
}