Added reading and storing of the XMPP password of the current user.

This commit is contained in:
Dimitar Dobrev 2014-03-04 21:27:06 +02:00
parent 9798767261
commit 07d3eb886a
2 changed files with 24 additions and 5 deletions

View file

@ -12,21 +12,26 @@
DataServerAccountInfo::DataServerAccountInfo() : DataServerAccountInfo::DataServerAccountInfo() :
_accessToken(), _accessToken(),
_username() _username(),
_xmppPassword()
{ {
} }
DataServerAccountInfo::DataServerAccountInfo(const QJsonObject& jsonObject) : DataServerAccountInfo::DataServerAccountInfo(const QJsonObject& jsonObject) :
_accessToken(jsonObject), _accessToken(jsonObject),
_username() _username(),
_xmppPassword()
{ {
setUsername(jsonObject["user"].toObject()["username"].toString()); QJsonObject userJSONObject = jsonObject["user"].toObject();
setUsername(userJSONObject["username"].toString());
setXMPPPassword(userJSONObject["xmpp_password"].toString());
} }
DataServerAccountInfo::DataServerAccountInfo(const DataServerAccountInfo& otherInfo) { DataServerAccountInfo::DataServerAccountInfo(const DataServerAccountInfo& otherInfo) {
_accessToken = otherInfo._accessToken; _accessToken = otherInfo._accessToken;
_username = otherInfo._username; _username = otherInfo._username;
_xmppPassword = otherInfo._xmppPassword;
} }
DataServerAccountInfo& DataServerAccountInfo::operator=(const DataServerAccountInfo& otherInfo) { DataServerAccountInfo& DataServerAccountInfo::operator=(const DataServerAccountInfo& otherInfo) {
@ -40,6 +45,7 @@ void DataServerAccountInfo::swap(DataServerAccountInfo& otherInfo) {
swap(_accessToken, otherInfo._accessToken); swap(_accessToken, otherInfo._accessToken);
swap(_username, otherInfo._username); swap(_username, otherInfo._username);
swap(_xmppPassword, otherInfo._xmppPassword);
} }
void DataServerAccountInfo::setUsername(const QString& username) { void DataServerAccountInfo::setUsername(const QString& username) {
@ -50,12 +56,21 @@ void DataServerAccountInfo::setUsername(const QString& username) {
} }
} }
void DataServerAccountInfo::setXMPPPassword(const QString& xmppPassword)
{
if (_xmppPassword != xmppPassword) {
_xmppPassword = xmppPassword;
qDebug() << "XMPP password changed to " << xmppPassword;
}
}
QDataStream& operator<<(QDataStream &out, const DataServerAccountInfo& info) { QDataStream& operator<<(QDataStream &out, const DataServerAccountInfo& info) {
out << info._accessToken << info._username; out << info._accessToken << info._username << info._xmppPassword;
return out; return out;
} }
QDataStream& operator>>(QDataStream &in, DataServerAccountInfo& info) { QDataStream& operator>>(QDataStream &in, DataServerAccountInfo& info) {
in >> info._accessToken >> info._username; in >> info._accessToken >> info._username >> info._xmppPassword;
return in; return in;
} }

View file

@ -25,6 +25,9 @@ public:
const QString& getUsername() const { return _username; } const QString& getUsername() const { return _username; }
void setUsername(const QString& username); void setUsername(const QString& username);
const QString& getXMPPPassword() const { return _xmppPassword; }
void setXMPPPassword(const QString& xmppPassword);
friend QDataStream& operator<<(QDataStream &out, const DataServerAccountInfo& info); friend QDataStream& operator<<(QDataStream &out, const DataServerAccountInfo& info);
friend QDataStream& operator>>(QDataStream &in, DataServerAccountInfo& info); friend QDataStream& operator>>(QDataStream &in, DataServerAccountInfo& info);
@ -33,6 +36,7 @@ private:
OAuthAccessToken _accessToken; OAuthAccessToken _accessToken;
QString _username; QString _username;
QString _xmppPassword;
}; };
#endif /* defined(__hifi__DataServerAccountInfo__) */ #endif /* defined(__hifi__DataServerAccountInfo__) */