Save password as QString

strawberrymusicplayer · Sep 24, 2018 · a8e9aba · a8e9aba
1 parent 36563cd
commit a8e9aba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/settings/tidalsettingspage.cpp b/src/settings/tidalsettingspage.cpp
@@ -77,7 +77,7 @@ void TidalSettingsPage::Load() {
   ui_->username->setText(s.value("username").toString());
   QByteArray password = s.value("password").toByteArray();
   if (password.isEmpty()) ui_->password->setText("");
-  else ui_->password->setText(QByteArray::fromBase64(password));
+  else ui_->password->setText(QString::fromUtf8(QByteArray::fromBase64(password)));
   dialog()->ComboBoxLoadFromSettings(s, ui_->combobox_quality, "quality", "HIGH");
   ui_->spinbox_searchdelay->setValue(s.value("searchdelay", 1500).toInt());
   ui_->spinbox_albumssearchlimit->setValue(s.value("albumssearchlimit", 100).toInt());
@@ -96,7 +96,7 @@ void TidalSettingsPage::Save() {
   QSettings s;
   s.beginGroup(kSettingsGroup);
   s.setValue("username", ui_->username->text());
-  s.setValue("password", ui_->password->text().toUtf8().toBase64());
+  s.setValue("password", QString::fromUtf8(ui_->password->text().toUtf8().toBase64()));
   s.setValue("quality", ui_->combobox_quality->itemData(ui_->combobox_quality->currentIndex()));
   s.setValue("searchdelay", ui_->spinbox_searchdelay->value());
   s.setValue("albumssearchlimit", ui_->spinbox_albumssearchlimit->value());

diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp
@@ -107,7 +107,9 @@ void TidalService::ReloadSettings() {
   QSettings s;
   s.beginGroup(TidalSettingsPage::kSettingsGroup);
   username_ = s.value("username").toString();
-  password_ = QByteArray::fromBase64(s.value("password").toByteArray());
+  QByteArray password = s.value("password").toByteArray();
+  if (password.isEmpty()) password_.clear();
+  else password_ = QString::fromUtf8(QByteArray::fromBase64(password));
   quality_ = s.value("quality").toString();
   searchdelay_ = s.value("searchdelay", 1500).toInt();
   albumssearchlimit_ = s.value("albumssearchlimit", 100).toInt();
@@ -127,7 +129,7 @@ void TidalService::LoadSessionID() {
   session_id_ = s.value("session_id").toString();
   user_id_ = s.value("user_id").toInt();
   country_code_ = s.value("country_code").toString();
-  clientuniquekey_ = Utilities::GetRandomStringWithChars(12);
+  clientuniquekey_ = Utilities::GetRandomStringWithChars(12).toLower();
   s.endGroup();
 
 }
@@ -253,7 +255,7 @@ void TidalService::HandleAuthReply(QNetworkReply *reply) {
   country_code_ = json_obj["countryCode"].toString();
   session_id_ = json_obj["sessionId"].toString();
   user_id_ = json_obj["userId"].toInt();
-  clientuniquekey_ = Utilities::GetRandomStringWithChars(12);
+  clientuniquekey_ = Utilities::GetRandomStringWithChars(12).toLower();
 
   QSettings s;
   s.beginGroup(TidalSettingsPage::kSettingsGroup);