Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix OAuthenticator reply parsing. #5603

Closed
wants to merge 2 commits into from
Closed

Fix OAuthenticator reply parsing. #5603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
948e113
Fix OAuthenticator reply parsing.
gooseensky Jan 18, 2017
9ce63d5
Update all places with QJsonParser + QNetworkReply usage.
gooseensky Jan 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/internet/box/boxservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ void BoxService::FetchUserInfoFinished(QNetworkReply* reply) {
reply->deleteLater();

QJson::Parser parser;
QVariantMap response = parser.parse(reply).toMap();
QVariantMap response = parser.parse(reply->readAll()).toMap();

QString name = response["name"].toString();
if (!name.isEmpty()) {
Expand Down Expand Up @@ -173,7 +173,7 @@ void BoxService::InitialiseEventsCursor() {
void BoxService::InitialiseEventsFinished(QNetworkReply* reply) {
reply->deleteLater();
QJson::Parser parser;
QVariantMap response = parser.parse(reply).toMap();
QVariantMap response = parser.parse(reply->readAll()).toMap();
if (response.contains("next_stream_position")) {
QSettings s;
s.beginGroup(kSettingsGroup);
Expand Down Expand Up @@ -286,7 +286,7 @@ void BoxService::FetchEventsFinished(QNetworkReply* reply) {
// TODO(John Maguire): Page through events.
reply->deleteLater();
QJson::Parser parser;
QVariantMap response = parser.parse(reply).toMap();
QVariantMap response = parser.parse(reply->readAll()).toMap();

QSettings s;
s.beginGroup(kSettingsGroup);
Expand Down
2 changes: 1 addition & 1 deletion src/internet/core/geolocator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ void Geolocator::RequestFinished(QNetworkReply* reply) {

QJson::Parser parser;
bool ok = false;
QVariant result = parser.parse(reply, &ok);
QVariant result = parser.parse(reply->readAll(), &ok);
if (!ok) {
emit Finished(LatLng());
return;
Expand Down
4 changes: 2 additions & 2 deletions src/internet/core/oauthenticator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ void OAuthenticator::FetchAccessTokenFinished(QNetworkReply* reply) {

QJson::Parser parser;
bool ok = false;
QVariantMap result = parser.parse(reply, &ok).toMap();
QVariantMap result = parser.parse(reply->readAll(), &ok).toMap();
if (!ok) {
qLog(Error) << "Failed to parse oauth reply";
return;
Expand Down Expand Up @@ -186,7 +186,7 @@ void OAuthenticator::RefreshAccessTokenFinished(QNetworkReply* reply) {
QJson::Parser parser;
bool ok = false;

QVariantMap result = parser.parse(reply, &ok).toMap();
QVariantMap result = parser.parse(reply->readAll(), &ok).toMap();
access_token_ = result["access_token"].toString();
if (result.contains("refresh_token")) {
refresh_token_ = result["refresh_token"].toString();
Expand Down
4 changes: 2 additions & 2 deletions src/internet/digitally/digitallyimportedclient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ DigitallyImportedClient::AuthReply DigitallyImportedClient::ParseAuthReply(
}

QJson::Parser parser;
QVariantMap data = parser.parse(reply).toMap();
QVariantMap data = parser.parse(reply->readAll()).toMap();

if (!data.contains("subscriptions")) {
return ret;
Expand Down Expand Up @@ -124,7 +124,7 @@ DigitallyImportedClient::ChannelList DigitallyImportedClient::ParseChannelList(
ChannelList ret;

QJson::Parser parser;
QVariantMap data = parser.parse(reply).toMap();
QVariantMap data = parser.parse(reply->readAll()).toMap();

if (!data.contains("channel_filters")) return ret;

Expand Down
8 changes: 4 additions & 4 deletions src/internet/dropbox/dropboxservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ void DropboxService::RequestFileListFinished(QNetworkReply* reply) {
reply->deleteLater();

QJson::Parser parser;
QVariantMap response = parser.parse(reply).toMap();
QVariantMap response = parser.parse(reply->readAll()).toMap();

QSettings settings;
settings.beginGroup(kSettingsGroup);
Expand Down Expand Up @@ -210,7 +210,7 @@ void DropboxService::LongPollDelta() {
void DropboxService::LongPollFinished(QNetworkReply* reply) {
reply->deleteLater();
QJson::Parser parser;
QVariantMap response = parser.parse(reply).toMap();
QVariantMap response = parser.parse(reply->readAll()).toMap();
if (response["changes"].toBool()) {
// New changes, we should request deltas again.
qLog(Debug) << "Detected new dropbox changes; fetching...";
Expand Down Expand Up @@ -239,7 +239,7 @@ void DropboxService::FetchContentUrlFinished(QNetworkReply* reply,
const QVariantMap& data) {
reply->deleteLater();
QJson::Parser parser;
QVariantMap response = parser.parse(reply).toMap();
QVariantMap response = parser.parse(reply->readAll()).toMap();
QFileInfo info(data["path_lower"].toString());

QUrl url;
Expand All @@ -265,6 +265,6 @@ QUrl DropboxService::GetStreamingUrlFromSongId(const QUrl& url) {
WaitForSignal(reply, SIGNAL(finished()));

QJson::Parser parser;
QVariantMap response = parser.parse(reply).toMap();
QVariantMap response = parser.parse(reply->readAll()).toMap();
return QUrl::fromEncoded(response["link"].toByteArray());
}
6 changes: 3 additions & 3 deletions src/internet/googledrive/googledriveclient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ void Client::FetchUserInfoFinished(ConnectResponse* response,
} else {
QJson::Parser parser;
bool ok = false;
QVariantMap result = parser.parse(reply, &ok).toMap();
QVariantMap result = parser.parse(reply->readAll(), &ok).toMap();
if (!ok) {
qLog(Error) << "Failed to parse user info reply";
return;
Expand Down Expand Up @@ -159,7 +159,7 @@ void Client::GetFileFinished(GetFileResponse* response, QNetworkReply* reply) {

QJson::Parser parser;
bool ok = false;
QVariantMap result = parser.parse(reply, &ok).toMap();
QVariantMap result = parser.parse(reply->readAll(), &ok).toMap();
if (!ok) {
qLog(Error) << "Failed to fetch file with ID" << response->file_id_;
emit response->Finished();
Expand Down Expand Up @@ -204,7 +204,7 @@ void Client::ListChangesFinished(ListChangesResponse* response,
QJson::Parser parser;
bool ok = false;
// TODO(John Maguire): Put this on a separate thread as the response could be large.
QVariantMap result = parser.parse(reply, &ok).toMap();
QVariantMap result = parser.parse(reply->readAll(), &ok).toMap();
if (!ok) {
qLog(Error) << "Failed to fetch changes" << response->cursor();
emit response->Finished();
Expand Down
2 changes: 1 addition & 1 deletion src/internet/podcasts/itunessearchpage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void ITunesSearchPage::SearchFinished(QNetworkReply* reply) {
}

QJson::Parser parser;
QVariant data = parser.parse(reply);
QVariant data = parser.parse(reply->readAll());

// Was it valid JSON?
if (data.isNull()) {
Expand Down
6 changes: 3 additions & 3 deletions src/internet/skydrive/skydriveservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ void SkydriveService::AddAuthorizationHeader(QNetworkRequest* request) {
void SkydriveService::FetchUserInfoFinished(QNetworkReply* reply) {
reply->deleteLater();
QJson::Parser parser;
QVariantMap response = parser.parse(reply).toMap();
QVariantMap response = parser.parse(reply->readAll()).toMap();

QString name = response["name"].toString();
if (!name.isEmpty()) {
Expand Down Expand Up @@ -137,7 +137,7 @@ void SkydriveService::ListFiles(const QString& folder) {
void SkydriveService::ListFilesFinished(QNetworkReply* reply) {
reply->deleteLater();
QJson::Parser parser;
QVariantMap response = parser.parse(reply).toMap();
QVariantMap response = parser.parse(reply->readAll()).toMap();

QVariantList files = response["data"].toList();
for (const QVariant& f : files) {
Expand Down Expand Up @@ -177,7 +177,7 @@ QUrl SkydriveService::GetStreamingUrlFromSongId(const QString& file_id) {
WaitForSignal(reply.get(), SIGNAL(finished()));

QJson::Parser parser;
QVariantMap response = parser.parse(reply.get()).toMap();
QVariantMap response = parser.parse(reply->readAll()).toMap();
return response["source"].toUrl();
}

Expand Down
2 changes: 1 addition & 1 deletion src/internet/soundcloud/soundcloudservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ QVariant SoundCloudService::ExtractResult(QNetworkReply* reply) {
}
QJson::Parser parser;
bool ok;
QVariant result = parser.parse(reply, &ok);
QVariant result = parser.parse(reply->readAll(), &ok);
if (!ok) {
qLog(Error) << "Error while parsing SoundCloud result";
}
Expand Down
2 changes: 1 addition & 1 deletion src/musicbrainz/acoustidclient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ void AcoustidClient::RequestFinished(QNetworkReply* reply, int request_id) {

QJson::Parser parser;
bool ok = false;
QVariantMap result = parser.parse(reply, &ok).toMap();
QVariantMap result = parser.parse(reply->readAll(), &ok).toMap();
if (!ok) {
emit Finished(request_id, QStringList());
return;
Expand Down
8 changes: 4 additions & 4 deletions src/songinfo/artistbiography.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void ArtistBiography::FetchInfo(int id, const Song& metadata) {
reply->deleteLater();

QJson::Parser parser;
QVariantMap response = parser.parse(reply).toMap();
QVariantMap response = parser.parse(reply->readAll()).toMap();

QString body = response["articleBody"].toString();
QString url = response["url"].toString();
Expand Down Expand Up @@ -194,7 +194,7 @@ void ArtistBiography::FetchWikipediaImages(int id, const QString& wikipedia_url,
reply->deleteLater();

QJson::Parser parser;
QVariantMap response = parser.parse(reply).toMap();
QVariantMap response = parser.parse(reply->readAll()).toMap();

QStringList image_titles = ExtractImageTitles(response);

Expand All @@ -209,7 +209,7 @@ void ArtistBiography::FetchWikipediaImages(int id, const QString& wikipedia_url,
NewClosure(reply, SIGNAL(finished()), [this, id, reply, latch]() {
reply->deleteLater();
QJson::Parser parser;
QVariantMap json = parser.parse(reply).toMap();
QVariantMap json = parser.parse(reply->readAll()).toMap();
QUrl url = ExtractImageUrl(json);
qLog(Debug) << "Found wikipedia image url:" << url;
if (!url.isEmpty()) {
Expand Down Expand Up @@ -247,7 +247,7 @@ void ArtistBiography::FetchWikipediaArticle(int id,
reply->deleteLater();

QJson::Parser parser;
QVariantMap json = parser.parse(reply).toMap();
QVariantMap json = parser.parse(reply->readAll()).toMap();
QString html = ExtractExtract(json);

CollapsibleInfoPane::Data data;
Expand Down
4 changes: 2 additions & 2 deletions src/songinfo/songkickconcerts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void SongkickConcerts::ArtistSearchFinished(QNetworkReply* reply, int id) {
reply->deleteLater();

QJson::Parser parser;
QVariantMap json = parser.parse(reply).toMap();
QVariantMap json = parser.parse(reply->readAll()).toMap();

QVariantMap results_page = json["resultsPage"].toMap();
QVariantMap results = results_page["results"].toMap();
Expand Down Expand Up @@ -95,7 +95,7 @@ void SongkickConcerts::FetchSongkickCalendar(const QString& artist_id, int id) {
void SongkickConcerts::CalendarRequestFinished(QNetworkReply* reply, int id) {
QJson::Parser parser;
bool ok = false;
QVariant result = parser.parse(reply, &ok);
QVariant result = parser.parse(reply->readAll(), &ok);

if (!ok) {
qLog(Error) << "Error parsing Songkick reply";
Expand Down
4 changes: 2 additions & 2 deletions src/songinfo/spotifyimages.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void SpotifyImages::FetchInfo(int id, const Song& metadata) {
NewClosure(reply, SIGNAL(finished()), [this, id, reply]() {
reply->deleteLater();
QJson::Parser parser;
QVariantMap result = parser.parse(reply).toMap();
QVariantMap result = parser.parse(reply->readAll()).toMap();
QVariantMap artists = result["artists"].toMap();
if (artists.isEmpty()) {
emit Finished(id);
Expand All @@ -70,7 +70,7 @@ void SpotifyImages::FetchImagesForArtist(int id, const QString& spotify_id) {
NewClosure(reply, SIGNAL(finished()), [this, id, reply]() {
reply->deleteLater();
QJson::Parser parser;
QVariantMap result = parser.parse(reply).toMap();
QVariantMap result = parser.parse(reply->readAll()).toMap();
QVariantList images = result["images"].toList();
QList<QPair<QUrl, QSize>> image_candidates;
for (QVariant i : images) {
Expand Down