Index: sources/cloudsync/CloudSyncController.cpp =================================================================== diff -u -r2ff5c29049307261cbee39176631155e11722914 -r026721c53d9c1fe9bbf99ce184afdb6610553d1f --- sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision 2ff5c29049307261cbee39176631155e11722914) +++ sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision 026721c53d9c1fe9bbf99ce184afdb6610553d1f) @@ -539,7 +539,7 @@ case eError_LogNameEmpty : info = QString( "[%1:%2]" ).arg( vErrorID ).arg( item(0) ) ; break; case eError_NotRegistered : info = QString( "[%1:%2]" ).arg( vErrorID ).arg( item(0) ) ; break; case eError_LogRetentionNoParam : info = QString( "[%1:%2]" ).arg( vErrorID ).arg( item(0) ) ; break; - case eError_LogUploadRejected : info = QString( "[%1:%2]" ).arg( vErrorID ).arg( item(0) ) ; break; + case eError_LogUploadRejected : info = QString( "[%1:%2/%3]" ).arg( vErrorID ).arg( item(0) ).arg( item(1) ) ; break; } return info; } @@ -864,28 +864,28 @@ { bool ok = true; QString mLogName; - qint32 mAccepted; - qint32 mRejectReason = 0; - quint32 tmp; + quint32 mAccepted; + quint32 mRejectReason = eLogUpload_NoRejectReason; + QString tmp; // although it has been checked in the interpreter, we won't risk the crash and check the list empty. if ( vMessage.params.isEmpty() ) { toLog(eError_LogNameNoParam , {}); ok = false; goto lOut; } mLogName = vMessage.params[0].trimmed(); if ( mLogName.isEmpty() ) { toLog(eError_LogNameEmpty , {}); ok = false; goto lOut; } // DEBUG qDebug() << " ---------- " << mLogName; - tmp = vMessage.params[1]; + tmp = vMessage.params[1]; //Log upload Accepted/Rejected Flag mAccepted = tmp.toUInt(&ok); if ( ! ok ) { toLog(eError_ParamMismatch , {eError_LogUploadRejected, 1}); ok = false; goto lOut; } if ( ! mAccepted ) { - tmp = vMessage.params[2]; + tmp = vMessage.params[2];//Log upload Rejection Reason mRejectReason = tmp.toUInt(&ok); if ( ! ok ) { toLog(eError_ParamMismatch , {eError_LogUploadRejected, 2}); ok = false; goto lOut; } - toLog(eError_LogUploadRejected , {eError_LogUploadRejected, mRejectReason}); + toLog(eError_LogUploadRejected , {eError_LogUploadRejected, mLogName, mRejectReason}); ok = false; } - emit didLogUpload( mLogName , mAccepted , mRejReason); + emit didLogUpload( mLogName , mAccepted , mRejectReason); lOut: return ok;