Index: sources/device/DeviceModels.cpp =================================================================== diff -u -rf0a80523d37c862fd24064522216b0bd53a2cc33 -rbf5b9b7cb86aaf3c4ec85e4ef0b92cba0e836634 --- sources/device/DeviceModels.cpp (.../DeviceModels.cpp) (revision f0a80523d37c862fd24064522216b0bd53a2cc33) +++ sources/device/DeviceModels.cpp (.../DeviceModels.cpp) (revision bf5b9b7cb86aaf3c4ec85e4ef0b92cba0e836634) @@ -265,8 +265,6 @@ */ bool MDeviceWifiInfoResponse::fromByteArray(const QByteArray &vByteArray, int *vExitCode) { - //DEBUG qDebug() << __FUNCTION__ << vByteArray; - // initialize data bool ok = false; int error = 0; @@ -305,6 +303,43 @@ } /*! + * \brief MDeviceConnectWifiResponse::fromByteArray + * \details Checks the response and sets up the model data. + * \param vExitCode - Passed script exit code + * \return true if passed. + */ +bool MDeviceConnectWifiResponse::fromByteArray(const QByteArray &vByteArray, int *vExitCode) +{ + // initialize data + bool ok = false; + int error = 0; + _data.mCompleted = true; + _data.mAccepted = false; + _data.mReason = Device::DeviceError::eDevice_OK; + + // check if the vExitCode passed and it has a value other than zero + if ( ! ok ){ _data.mReason = Device::DeviceError::eDevice_Scripts_Error_Incorrect_Rsp_Type ; goto lError; } // there is not a valid value + if ( vExitCode && *vExitCode ){ _data.mReason = Device::DeviceError::eDevice_ConnectWifi_Error ; goto lApply; } // there still a valid value + + // Now everything is good to extract the data + _data.mAccepted = true; + _data.mMessage = QObject::tr("The WiFi (Dis)Connection is complete.") ; goto lOut ; // normal return + + // apply returned value in case the passed value is valid (type, range) + // regardless of the exit code (success, fail) +lApply: + goto lOut; + + // immediate exit on fail exitcode and invalid returned value. +lError: + if ( vExitCode ) error = *vExitCode; + _data.mMessage = Device::DeviceError::deviceErrorText(static_cast(_data.mReason), error) + "\n" + vByteArray; + +lOut: + return _data.mAccepted; +} + +/*! * \brief MDeviceUSBMountResponse::fromByteArray * \details Checks the response and sets up the model data. * \param vExitCode - Passed script exit code