ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make networkstate work

Browse Source
This commit is contained in:
Simon Stürz 2018-06-14 08:29:16 +02:00 committed by Michael Zanetti
parent 8681cc7070
commit 5b26ed591b
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
libmea-core/wifisetup/wirelesssetupmanager.cpp
View File

@ -479,7 +479,7 @@ void WirelessSetupManager::processNetworkResponse(const QVariantMap &response)
emit errorOccured(tr("There is no wireless device available on the device.")); emit errorOccured(tr("There is no wireless device available on the device."));
break; break;
default: default:
emit errorOccured("Unknown error occured."); emit errorOccured(tr("Unknown error occured."));
break; break;
} }
@ -524,7 +524,7 @@ void WirelessSetupManager::processWifiResponse(const QVariantMap &response)
emit errorOccured(tr("The networking is disabled on the device.")); emit errorOccured(tr("The networking is disabled on the device."));
break; break;
default: default:
emit errorOccured("Unknown error occured."); emit errorOccured(tr("Unknown error occured."));
break; break;
} }
@ -794,34 +794,39 @@ void WirelessSetupManager::onNetworkServiceStateChanged(const QLowEnergyService:
void WirelessSetupManager::onNetworkServiceCharacteristicChanged(const QLowEnergyCharacteristic &characteristic, const QByteArray &value) void WirelessSetupManager::onNetworkServiceCharacteristicChanged(const QLowEnergyCharacteristic &characteristic, const QByteArray &value)
{ {
Q_UNUSED(characteristic)
// Check if currently reading if (characteristic.uuid() == networkStatusCharacteristicUuid) {
if (m_readingResponse) { qDebug() << "Network status changed:" << value;
m_inputDataStream.append(value); setNetworkStatus(value.toHex().toUInt(0, 16));
} else { return;
m_inputDataStream.clear(); } else if (characteristic.uuid() == networkResponseCharacteristicUuid) {
m_readingResponse = true; // Check if currently reading
m_inputDataStream.append(value); if (m_readingResponse) {
} m_inputDataStream.append(value);
} else {
// If command finished
if (value.endsWith('\n')) {
QJsonParseError error;
QJsonDocument jsonDocument = QJsonDocument::fromJson(m_inputDataStream, &error);
if (error.error != QJsonParseError::NoError) {
qWarning() << "Got invalid json object" << m_inputDataStream;
m_inputDataStream.clear(); m_inputDataStream.clear();
m_readingResponse = false; m_readingResponse = true;
return; m_inputDataStream.append(value);
} }
qDebug() << "Got command stream" << qUtf8Printable(jsonDocument.toJson()); // If command finished
if (value.endsWith('\n')) {
QJsonParseError error;
QJsonDocument jsonDocument = QJsonDocument::fromJson(m_inputDataStream, &error);
if (error.error != QJsonParseError::NoError) {
qWarning() << "Got invalid json object" << m_inputDataStream;
m_inputDataStream.clear();
m_readingResponse = false;
return;
}
processNetworkResponse(jsonDocument.toVariant().toMap()); qDebug() << "Got command stream" << qUtf8Printable(jsonDocument.toJson());
m_inputDataStream.clear(); processNetworkResponse(jsonDocument.toVariant().toMap());
m_readingResponse = false;
m_inputDataStream.clear();
m_readingResponse = false;
}
} }
} }