mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-19 01:04:20 +00:00
Code Activity

Projucer: Fixed default avatar image

Browse source
This commit is contained in:
ed 2020-06-10 19:24:20 +01:00
parent cbfbd8cf12
commit eb671a6809
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
extras/Projucer/Source/Application/UserAccount/jucer_LicenseQueryThread.h
View file

@ -68,6 +68,7 @@ private:
virtual bool isPOSTLikeRequest() const = 0;
virtual String getEndpointURLSuffix() const = 0;
virtual StringPairArray getParameterNamesAndValues() const = 0;
virtual String getExtraHeaders() const = 0;
virtual int getSuccessCode() const = 0;
virtual String errorCodeToString (int) const = 0;
virtual bool parseServerResponse (const String&, LicenseState&) = 0;
@ -93,6 +94,11 @@ private:
return namesAndValues;
}
String getExtraHeaders() const override
{
return "Content-Type: application/json";
}
String errorCodeToString (int errorCode) const override
{
switch (errorCode)
@ -145,10 +151,12 @@ private:
StringPairArray getParameterNamesAndValues() const override
{
StringPairArray namesAndValues;
namesAndValues.set ("token", userAuthToken);
return {};
}
return namesAndValues;
String getExtraHeaders() const override
{
return "x-access-token: " + userAuthToken;
}
String errorCodeToString (int errorCode) const override
@ -213,7 +221,6 @@ private:
String runJob (std::unique_ptr<AccountEnquiryBase> accountEnquiryJob, LicenseState& state)
{
const String endpointURL = "https://api.roli.com/api/v1";
const String extraHeaders = "Content-Type: application/json";
auto url = URL (endpointURL + accountEnquiryJob->getEndpointURLSuffix());
@ -221,14 +228,14 @@ private:
if (isPOST)
url = url.withPOSTData (postDataStringAsJSON (accountEnquiryJob->getParameterNamesAndValues()));
else
url = url.withParameters (accountEnquiryJob->getParameterNamesAndValues());
if (threadShouldExit())
return "Cancelled.";
int statusCode = 0;
auto urlStream = url.createInputStream (isPOST, nullptr, nullptr, extraHeaders, 5000, nullptr, &statusCode);
auto urlStream = url.createInputStream (isPOST, nullptr, nullptr,
accountEnquiryJob->getExtraHeaders(),
5000, nullptr, &statusCode);
if (urlStream == nullptr)
return "Failed to connect to the web server.";

2
extras/Projucer/Source/Project/UI/jucer_UserAvatarComponent.h
View file

@ -106,7 +106,7 @@ private:
setTooltip (formattedUserString);
}
userAvatarImage = state.isValid() ? state.avatar : defaultAvatarImage;
userAvatarImage = state.isValid() && state.avatar.isValid() ? state.avatar : defaultAvatarImage;
repaint();
sendChangeMessage();
}