Address issues.

Changes list: - Rename to `appWideEnabled` - Rename to `egenioussEnabled` - Set `mSocketStateString` and `mSocketState` - Use `const` variables in `onReadyRead`
opengisch · Sep 23, 2024 · 183fd28 · 183fd28
1 parent 781d9f9
commit 183fd28
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 15 deletions.
diff --git a/src/core/pluginmanager.cpp b/src/core/pluginmanager.cpp
@@ -288,7 +288,7 @@ void PluginManager::enableAppPlugin( const QString &uuid )
       loadPlugin( mAvailableAppPlugins[uuid].path(), mAvailableAppPlugins[uuid].name() );
     }
   }
-  callPluginMethod( uuid, "appWideActivated" );
+  callPluginMethod( uuid, "appWideEnabled" );
 }
 
 void PluginManager::disableAppPlugin( const QString &uuid )
@@ -474,9 +474,9 @@ void PluginManager::callPluginMethod( const QString &uuid, const QString &method
   const QPointer<QObject> object = mLoadedPlugins[pluginPath];
 
   const char *normalizedSignature = QMetaObject::normalizedSignature( ( methodName + "()" ).toStdString().c_str() );
-  const int methodExists = object->metaObject()->indexOfSlot( normalizedSignature );
+  const int methodIndex = object->metaObject()->indexOfSlot( normalizedSignature );
 
-  if ( methodExists != -1 )
+  if ( methodIndex != -1 )
   {
     QMetaObject::invokeMethod( object.data(), methodName.toStdString().c_str() );
   }

diff --git a/src/core/positioning/egenioussreceiver.cpp b/src/core/positioning/egenioussreceiver.cpp
@@ -21,6 +21,7 @@ void EgenioussReceiver::handleConnectDevice()
 void EgenioussReceiver::connected()
 {
   mSocketState = QAbstractSocket::ConnectedState;
+  mSocketStateString = tr( "Successfully connected" );
   emit socketStateChanged( mSocketState );
   setValid( true );
 }
@@ -35,6 +36,7 @@ void EgenioussReceiver::disconnected()
   if ( mTcpSocket->state() == QAbstractSocket::ConnectedState )
   {
     mSocketState = QAbstractSocket::UnconnectedState;
+    mSocketStateString = tr( "Disconnected" );
     emit socketStateChanged( mSocketState );
   }
 }
@@ -55,27 +57,39 @@ QList<QPair<QString, QVariant>> EgenioussReceiver::details()
 
 void EgenioussReceiver::onReadyRead()
 {
+  const int minimumDataSize = 9;
+  const uint8_t validStartByte = 0xFE;
+  const int payloadHeaderSize = 8;
+
   QByteArray mReceivedData = mTcpSocket->readAll();
-  if ( mReceivedData.size() < 9 )
+  if ( mReceivedData.size() < minimumDataSize )
   {
-    return; // Received data is too short to process.
+    mLastError = tr( "Received data is too short to process" );
+    emit lastErrorChanged( mLastError );
+    return;
   }
-  if ( static_cast<uint8_t>( mReceivedData[0] ) != 0xFE )
+  if ( static_cast<uint8_t>( mReceivedData[0] ) != validStartByte )
   {
-    return; // Invalid start byte
+    mLastError = tr( "Invalid start byte" );
+    emit lastErrorChanged( mLastError );
+    return;
   }
   uint32_t payloadLength;
   QDataStream dataStream( mReceivedData.mid( 4, 4 ) );
   dataStream.setByteOrder( QDataStream::LittleEndian );
   dataStream >> payloadLength;
-  if ( mReceivedData.size() < 8 + payloadLength )
+  if ( mReceivedData.size() < payloadHeaderSize + payloadLength )
   {
-    return; // Received data is too short to contain the payload.
+    mLastError = tr( "Received data is too short to contain the payload" );
+    emit lastErrorChanged( mLastError );
+    return;
   }
-  QJsonDocument jsonDoc = QJsonDocument::fromJson( mReceivedData.mid( 8, payloadLength ) );
+  QJsonDocument jsonDoc = QJsonDocument::fromJson( mReceivedData.mid( payloadHeaderSize, payloadLength ) );
   if ( jsonDoc.isNull() || !jsonDoc.isObject() )
   {
-    return; // Failed to parse JSON
+    mLastError = tr( "Failed to parse JSON" );
+    emit lastErrorChanged( mLastError );
+    return;
   }
   mPayload = jsonDoc.object();
   const double latitude = mPayload.value( "lat" ).toDouble() == 0 ? std::numeric_limits<double>::quiet_NaN() : mPayload.value( "lat" ).toDouble();
@@ -118,6 +132,8 @@ void EgenioussReceiver::handleError( QAbstractSocket::SocketError error )
       mLastError = tr( "TCP receiver error (%1)" ).arg( QMetaEnum::fromType<QAbstractSocket::SocketError>().valueToKey( error ) );
       break;
   }
+  mSocketState = QAbstractSocket::UnconnectedState;
+  mSocketStateString = mLastError;
   qInfo() << QStringLiteral( "EgenioussReceiver: Error: %1" ).arg( mLastError );
 
   emit lastErrorChanged( mLastError );

diff --git a/src/qml/PositioningDeviceSettings.qml b/src/qml/PositioningDeviceSettings.qml
@@ -42,7 +42,7 @@ Popup {
   }
 
   function handleEgenioussChange() {
-    if (positioningSettings.enableEgeniouss) {
+    if (positioningSettings.egenioussEnabled) {
       positioningDeviceTypeModel.insert(0, {
           "name": qsTr('Egeniouss'),
           "value": PositioningDeviceModel.EgenioussDevice
@@ -68,14 +68,14 @@ Popup {
           "value": PositioningDeviceModel.SerialPortDevice
         });
     }
-    if (positioningSettings.enableEgeniouss) {
+    if (positioningSettings.egenioussEnabled) {
       positioningDeviceTypeModel.insert(0, {
           "name": qsTr('Egeniouss'),
           "value": PositioningDeviceModel.EgenioussDevice
         });
     }
     positioningDeviceType.model = positioningDeviceTypeModel;
-    positioningSettings.onEnableEgenioussChanged.connect(handleEgenioussChange);
+    positioningSettings.onEgenioussEnabledChanged.connect(handleEgenioussChange);
   }
 
   Page {

diff --git a/src/qml/PositioningSettings.qml b/src/qml/PositioningSettings.qml
@@ -45,5 +45,5 @@ Settings {
   property int digitizingMeasureType: 1
 
   property bool geofencingPreventDigitizingDuringAlert: false
-  property bool enableEgeniouss: false
+  property bool egenioussEnabled: false
 }