diff --git a/src/covermanager/tidalcoverprovider.cpp b/src/covermanager/tidalcoverprovider.cpp
index 1b12059d4..f137db0a8 100644
--- a/src/covermanager/tidalcoverprovider.cpp
+++ b/src/covermanager/tidalcoverprovider.cpp
@@ -50,7 +50,6 @@
const char *TidalCoverProvider::kApiUrl = "https://api.tidalhifi.com/v1";
const char *TidalCoverProvider::kResourcesUrl = "http://resources.tidal.com";
-const char *TidalCoverProvider::kApiTokenB64 = "UDVYYmVvNUxGdkVTZUR5Ng==";
const int TidalCoverProvider::kLimit = 10;
TidalCoverProvider::TidalCoverProvider(Application *app, QObject *parent) :
diff --git a/src/settings/tidalsettingspage.cpp b/src/settings/tidalsettingspage.cpp
index dea2ae5e7..70c397c72 100644
--- a/src/settings/tidalsettingspage.cpp
+++ b/src/settings/tidalsettingspage.cpp
@@ -45,25 +45,26 @@ TidalSettingsPage::TidalSettingsPage(SettingsDialog *parent)
connect(ui_->button_login, SIGNAL(clicked()), SLOT(LoginClicked()));
connect(ui_->login_state, SIGNAL(LogoutClicked()), SLOT(LogoutClicked()));
- connect(this, SIGNAL(Login(QString, QString)), service_, SLOT(SendLogin(QString, QString)));
+ connect(this, SIGNAL(Login(QString, QString, QString)), service_, SLOT(SendLogin(QString, QString, QString)));
connect(service_, SIGNAL(LoginFailure(QString)), SLOT(LoginFailure(QString)));
connect(service_, SIGNAL(LoginSuccess()), SLOT(LoginSuccess()));
dialog()->installEventFilter(this);
- ui_->combobox_quality->addItem("Low", "LOW");
- ui_->combobox_quality->addItem("High", "HIGH");
- ui_->combobox_quality->addItem("Lossless", "LOSSLESS");
+ ui_->quality->addItem("Low", "LOW");
+ ui_->quality->addItem("High", "HIGH");
+ ui_->quality->addItem("Lossless", "LOSSLESS");
- ui_->combobox_streamurl->addItem("HTTP", "http");
- ui_->combobox_streamurl->addItem("HTTPS", "https");
+ ui_->streamurl->addItem("Default", "default");
+ ui_->streamurl->addItem("HTTP", "http");
+ ui_->streamurl->addItem("HTTPS", "https");
- ui_->combobox_coversize->addItem("160x160", "160x160");
- ui_->combobox_coversize->addItem("320x320", "320x320");
- ui_->combobox_coversize->addItem("640x640", "640x640");
- ui_->combobox_coversize->addItem("750x750", "750x750");
- ui_->combobox_coversize->addItem("1280x1280", "1280x1280");
+ ui_->coversize->addItem("160x160", "160x160");
+ ui_->coversize->addItem("320x320", "320x320");
+ ui_->coversize->addItem("640x640", "640x640");
+ ui_->coversize->addItem("750x750", "750x750");
+ ui_->coversize->addItem("1280x1280", "1280x1280");
}
@@ -79,14 +80,15 @@ void TidalSettingsPage::Load() {
QByteArray password = s.value("password").toByteArray();
if (password.isEmpty()) ui_->password->clear();
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_artistssearchlimit->setValue(s.value("artistssearchlimit", 5).toInt());
- ui_->spinbox_albumssearchlimit->setValue(s.value("albumssearchlimit", 100).toInt());
- ui_->spinbox_songssearchlimit->setValue(s.value("songssearchlimit", 100).toInt());
+ ui_->token->setText(s.value("token").toString());
+ dialog()->ComboBoxLoadFromSettings(s, ui_->quality, "quality", "HIGH");
+ ui_->searchdelay->setValue(s.value("searchdelay", 1500).toInt());
+ ui_->artistssearchlimit->setValue(s.value("artistssearchlimit", 5).toInt());
+ ui_->albumssearchlimit->setValue(s.value("albumssearchlimit", 100).toInt());
+ ui_->songssearchlimit->setValue(s.value("songssearchlimit", 100).toInt());
ui_->checkbox_fetchalbums->setChecked(s.value("fetchalbums", false).toBool());
- dialog()->ComboBoxLoadFromSettings(s, ui_->combobox_coversize, "coversize", "320x320");
- dialog()->ComboBoxLoadFromSettings(s, ui_->combobox_streamurl, "streamurl", "http");
+ dialog()->ComboBoxLoadFromSettings(s, ui_->coversize, "coversize", "320x320");
+ dialog()->ComboBoxLoadFromSettings(s, ui_->streamurl, "streamurl", "http");
s.endGroup();
if (service_->authenticated()) ui_->login_state->SetLoggedIn(LoginStateWidget::LoggedIn);
@@ -100,14 +102,15 @@ void TidalSettingsPage::Save() {
s.setValue("enabled", ui_->checkbox_enable->isChecked());
s.setValue("username", ui_->username->text());
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("artistssearchlimit", ui_->spinbox_artistssearchlimit->value());
- s.setValue("albumssearchlimit", ui_->spinbox_albumssearchlimit->value());
- s.setValue("songssearchlimit", ui_->spinbox_songssearchlimit->value());
+ s.setValue("token", ui_->token->text());
+ s.setValue("quality", ui_->quality->itemData(ui_->quality->currentIndex()));
+ s.setValue("searchdelay", ui_->searchdelay->value());
+ s.setValue("artistssearchlimit", ui_->artistssearchlimit->value());
+ s.setValue("albumssearchlimit", ui_->albumssearchlimit->value());
+ s.setValue("songssearchlimit", ui_->songssearchlimit->value());
s.setValue("fetchalbums", ui_->checkbox_fetchalbums->isChecked());
- s.setValue("coversize", ui_->combobox_coversize->itemData(ui_->combobox_coversize->currentIndex()));
- s.setValue("streamurl", ui_->combobox_streamurl->itemData(ui_->combobox_streamurl->currentIndex()));
+ s.setValue("coversize", ui_->coversize->itemData(ui_->coversize->currentIndex()));
+ s.setValue("streamurl", ui_->streamurl->itemData(ui_->streamurl->currentIndex()));
s.endGroup();
service_->ReloadSettings();
@@ -115,7 +118,7 @@ void TidalSettingsPage::Save() {
}
void TidalSettingsPage::LoginClicked() {
- emit Login(ui_->username->text(), ui_->password->text());
+ emit Login(ui_->username->text(), ui_->password->text(), ui_->token->text());
ui_->button_login->setEnabled(false);
}
diff --git a/src/settings/tidalsettingspage.h b/src/settings/tidalsettingspage.h
index d71ac4abc..e791e2160 100644
--- a/src/settings/tidalsettingspage.h
+++ b/src/settings/tidalsettingspage.h
@@ -43,8 +43,8 @@ class TidalSettingsPage : public SettingsPage {
bool eventFilter(QObject *object, QEvent *event);
-signals:
- void Login(const QString &username, const QString &password);
+ signals:
+ void Login(const QString &username, const QString &password, const QString &token);
private slots:
void LoginClicked();
diff --git a/src/settings/tidalsettingspage.ui b/src/settings/tidalsettingspage.ui
index a961f7c49..0a4a544ce 100644
--- a/src/settings/tidalsettingspage.ui
+++ b/src/settings/tidalsettingspage.ui
@@ -7,7 +7,7 @@
0
0
715
- 594
+ 650
@@ -95,7 +95,47 @@
-
-
+
+
-
+
+
+
+ 150
+ 0
+
+
+
+ Token
+
+
+
+ -
+
+
+
+ 200
+ 0
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
-
@@ -110,7 +150,7 @@
-
-
+
-
@@ -128,7 +168,7 @@
-
-
+
-
@@ -143,7 +183,7 @@
-
-
+
ms
@@ -177,7 +217,7 @@
-
-
+
-
@@ -192,7 +232,7 @@
-
-
+
1
@@ -220,7 +260,7 @@
-
-
+
-
@@ -235,7 +275,7 @@
-
-
+
1
@@ -263,7 +303,7 @@
-
-
+
-
@@ -278,7 +318,7 @@
-
-
+
1
@@ -313,7 +353,7 @@
-
-
+
-
@@ -328,7 +368,7 @@
-
-
+
-
@@ -346,7 +386,7 @@
-
-
+
-
@@ -361,10 +401,10 @@
-
-
+
-
-
+
Qt::Horizontal
diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp
index 82a3bf689..e343c3d4e 100644
--- a/src/tidal/tidalservice.cpp
+++ b/src/tidal/tidalservice.cpp
@@ -118,14 +118,16 @@ void TidalService::ReloadSettings() {
QByteArray password = s.value("password").toByteArray();
if (password.isEmpty()) password_.clear();
else password_ = QString::fromUtf8(QByteArray::fromBase64(password));
- quality_ = s.value("quality").toString();
+ token_ = s.value("token").toString();
+ if (token_.isEmpty()) token_ = QString::fromUtf8(QByteArray::fromBase64(kApiTokenB64));
+ quality_ = s.value("quality", "LOSSLESS").toString();
search_delay_ = s.value("searchdelay", 1500).toInt();
artistssearchlimit_ = s.value("artistssearchlimit", 5).toInt();
albumssearchlimit_ = s.value("albumssearchlimit", 100).toInt();
songssearchlimit_ = s.value("songssearchlimit", 100).toInt();
fetchalbums_ = s.value("fetchalbums", false).toBool();
coversize_ = s.value("coversize", "320x320").toString();
- streamurl_ = s.value("streamurl", "http").toString();
+ streamurl_ = s.value("streamurl", "default").toString();
s.endGroup();
}
@@ -144,10 +146,10 @@ void TidalService::LoadSessionID() {
}
void TidalService::SendLogin() {
- SendLogin(username_, password_);
+ SendLogin(username_, password_, token_);
}
-void TidalService::SendLogin(const QString &username, const QString &password) {
+void TidalService::SendLogin(const QString &username, const QString &password, const QString &token) {
if (search_id_ != 0) emit UpdateStatus(tr("Authenticating..."));
@@ -163,7 +165,7 @@ void TidalService::SendLogin(const QString &username, const QString &password) {
typedef QPair EncodedArg;
typedef QList EncodedArgList;
- ArgList args = ArgList() << Arg("token", QByteArray::fromBase64(kApiTokenB64))
+ ArgList args = ArgList() << Arg("token", token_)
<< Arg("username", username)
<< Arg("password", password)
<< Arg("clientVersion", "2.2.1--7");
@@ -180,7 +182,7 @@ void TidalService::SendLogin(const QString &username, const QString &password) {
QNetworkRequest req(url);
req.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
- req.setRawHeader("X-Tidal-Token", QByteArray::fromBase64(kApiTokenB64));
+ req.setRawHeader("X-Tidal-Token", token_.toUtf8());
QNetworkReply *reply = network_->post(req, url_query.toString(QUrl::FullyEncoded).toUtf8());
NewClosure(reply, SIGNAL(finished()), this, SLOT(HandleAuthReply(QNetworkReply*)), reply);
@@ -1037,7 +1039,7 @@ void TidalService::StreamURLReceived(QNetworkReply *reply, const int song_id, co
filetype = Song::FileType_Stream;
}
- if (new_url.scheme() != streamurl_) new_url.setScheme(streamurl_);
+ if (new_url.scheme() != streamurl_ && streamurl_.toLower() != "default") new_url.setScheme(streamurl_);
emit StreamURLFinished(original_url, new_url, filetype);
diff --git a/src/tidal/tidalservice.h b/src/tidal/tidalservice.h
index 3555e48d7..34c821569 100644
--- a/src/tidal/tidalservice.h
+++ b/src/tidal/tidalservice.h
@@ -62,6 +62,7 @@ class TidalService : public InternetService {
const bool login_sent() { return login_sent_; }
const bool authenticated() { return (!session_id_.isEmpty() && !country_code_.isEmpty()); }
+ QString token() { return token_; }
QString session_id() { return session_id_; }
QString country_code() { return country_code_; }
@@ -81,7 +82,7 @@ class TidalService : public InternetService {
public slots:
void ShowConfig();
- void SendLogin(const QString &username, const QString &password);
+ void SendLogin(const QString &username, const QString &password, const QString &token);
private slots:
void SendLogin();
@@ -128,6 +129,7 @@ class TidalService : public InternetService {
QTimer *timer_search_delay_;
QTimer *timer_login_attempt_;
+ QString token_;
QString username_;
QString password_;
QString quality_;