From 4fed6ab29816bc64f4bb42310446587a5629eaaf Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 14 Jun 2019 23:02:57 +0200 Subject: [PATCH] Hide tidal oauth settings until streaming is possible --- src/settings/tidalsettingspage.cpp | 11 ++++++++++- src/tidal/tidalservice.cpp | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/settings/tidalsettingspage.cpp b/src/settings/tidalsettingspage.cpp index 152950116..b9983b476 100644 --- a/src/settings/tidalsettingspage.cpp +++ b/src/settings/tidalsettingspage.cpp @@ -70,6 +70,14 @@ TidalSettingsPage::TidalSettingsPage(SettingsDialog *parent) ui_->streamurl->addItem("urlpostpaywall", StreamUrlMethod_UrlPostPaywall); ui_->streamurl->addItem("playbackinfopostpaywall", StreamUrlMethod_PlaybackInfoPostPaywall); + ui_->oauth->hide(); + ui_->label_client_id->hide(); + ui_->client_id->hide(); + ui_->label_user_id->hide(); + ui_->user_id->hide(); + ui_->label_country_code->hide(); + ui_->country_code->hide(); + } TidalSettingsPage::~TidalSettingsPage() { delete ui_; } @@ -80,7 +88,8 @@ void TidalSettingsPage::Load() { s.beginGroup(kSettingsGroup); ui_->enable->setChecked(s.value("enabled", false).toBool()); - ui_->oauth->setChecked(s.value("oauth", false).toBool()); + //ui_->oauth->setChecked(s.value("oauth", false).toBool()); + ui_->oauth->setChecked(false); ui_->client_id->setText(s.value("client_id").toString()); ui_->api_token->setText(s.value("api_token").toString()); diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp index 0760f6798..15c8ceca6 100644 --- a/src/tidal/tidalservice.cpp +++ b/src/tidal/tidalservice.cpp @@ -199,7 +199,8 @@ void TidalService::ReloadSettings() { QSettings s; s.beginGroup(TidalSettingsPage::kSettingsGroup); - oauth_ = s.value("oauth", false).toBool(); + //oauth_ = s.value("oauth", false).toBool(); + oauth_ = false; client_id_ = s.value("client_id").toString(); if (client_id_.isEmpty()) client_id_ = QString::fromUtf8(QByteArray::fromBase64(kClientIdB64)); api_token_ = s.value("api_token").toString();