dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Tidal login handling

Browse Source
This commit is contained in:
Jonas Kvinge
2019-03-31 03:41:25 +02:00
parent 1226bc214d
commit 79406b20f2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tidal/tidalservice.cpp
View File

@@ -199,14 +199,14 @@ void TidalService::HandleAuthReply(QNetworkReply *reply) {
return; return;
} }
else { else {
// See if there is Json data containing "userMessage" - then use that instead. // See if there is Json data containing "status" and "userMessage" - then use that instead.
QByteArray data(reply->readAll()); QByteArray data(reply->readAll());
QJsonParseError json_error; QJsonParseError json_error;
QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error);
QString failure_reason; QString failure_reason;
if (json_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { if (json_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) {
QJsonObject json_obj = json_doc.object(); QJsonObject json_obj = json_doc.object();
if (!json_obj.isEmpty() && json_obj.contains("userMessage")) { if (!json_obj.isEmpty() && json_obj.contains("status") && json_obj.contains("userMessage")) {
int status = json_obj["status"].toInt(); int status = json_obj["status"].toInt();
int sub_status = json_obj["subStatus"].toInt(); int sub_status = json_obj["subStatus"].toInt();
QString user_message = json_obj["userMessage"].toString(); QString user_message = json_obj["userMessage"].toString();
@@ -631,7 +631,7 @@ void TidalService::AlbumsReceived(QNetworkReply *reply, int search_id, int artis
QString error; QString error;
QByteArray data = GetReplyData(reply, error, true); QByteArray data = GetReplyData(reply, error, (artist_id == 0));
if (data.isEmpty()) { if (data.isEmpty()) {
AlbumsFinished(artist_id, offset_requested); AlbumsFinished(artist_id, offset_requested);
return; return;
@@ -1066,7 +1066,7 @@ QString TidalService::LoginError(QString error, QVariant debug) {
emit LoginFailure(error); emit LoginFailure(error);
for (QUrl url : queue_stream_url_) { for (QUrl url : queue_stream_url_) {
emit StreamURLFinished(url, url, Song::FileType_Stream, error); emit StreamURLFinished(url, url, Song::FileType_Stream, error);
} }
queue_stream_url_.clear(); queue_stream_url_.clear();