diff --git a/src/core/ClientNetworkMessages.h b/src/core/ClientNetworkMessages.h --- a/src/core/ClientNetworkMessages.h +++ b/src/core/ClientNetworkMessages.h @@ -45,7 +45,7 @@ void portChanged(); void connectionStatus(); - void loginListReceived(const QStringList& logins); + void loginListReceived(const QStringList& logins, const QStringList& passwords); void requestConnection(const QString& serverName); private: diff --git a/src/core/ClientNetworkMessages.cpp b/src/core/ClientNetworkMessages.cpp --- a/src/core/ClientNetworkMessages.cpp +++ b/src/core/ClientNetworkMessages.cpp @@ -303,10 +303,12 @@ case MessageIdentifier::LOGINS_LIST: { AvailableLogins logins; - in >> logins; + in >> logins._logins; + in >> logins._passwords; qDebug() << "logins received: " << logins._logins; + qDebug() << "passwords : " << logins._passwords; // todo - emit loginListReceived(logins._logins); + emit loginListReceived(logins._logins, logins._passwords); break; } default: diff --git a/src/core/DataStreamConverter.h b/src/core/DataStreamConverter.h --- a/src/core/DataStreamConverter.h +++ b/src/core/DataStreamConverter.h @@ -53,12 +53,14 @@ inline QDataStream& operator<<(QDataStream &dataStream, const AvailableLogins &logins) { dataStream << logins._logins; + dataStream << logins._passwords; return dataStream; }; inline QDataStream& operator>>(QDataStream &dataStream, AvailableLogins &logins) { dataStream >> logins._logins; + dataStream >> logins._passwords; return dataStream; }; diff --git a/src/core/Messages.h b/src/core/Messages.h --- a/src/core/Messages.h +++ b/src/core/Messages.h @@ -48,6 +48,7 @@ struct AvailableLogins { QStringList _logins; + QStringList _passwords; }; struct DisplayedActivities { diff --git a/src/server/Server.cpp b/src/server/Server.cpp --- a/src/server/Server.cpp +++ b/src/server/Server.cpp @@ -178,6 +178,7 @@ AvailableLogins act; for(const QObject *oC: MessageHandler::getInstance()->returnUsers()) { act._logins << ((const UserData*)oC)->getName(); + act._passwords << ((const UserData*)oC)->getPassword(); }