0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #96 from dada513/develop

Browse Source 
rebase with upstream
This commit is contained in:
swirl 2022-01-24 19:36:31 -05:00 committed by GitHub
commit 0680945839
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/java/JavaChecker.cpp
View File

@ -111,7 +111,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
auto parts = line.split('=', QString::SkipEmptyParts); auto parts = line.split('=', QString::SkipEmptyParts);
if(parts.size() != 2 || parts[0].isEmpty() || parts[1].isEmpty()) if(parts.size() != 2 || parts[0].isEmpty() || parts[1].isEmpty())
{ {
success = false; continue;
} }
else else
{ {

2
launcher/minecraft/auth/AuthRequest.cpp
View File

@ -44,7 +44,7 @@ void AuthRequest::onRequestFinished() {
if (reply_ != qobject_cast<QNetworkReply *>(sender())) { if (reply_ != qobject_cast<QNetworkReply *>(sender())) {
return; return;
} }
httpStatus_ = 200; httpStatus_ = reply_->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
finish(); finish();
} }

2
launcher/minecraft/auth/Parsers.cpp
View File

@ -94,7 +94,7 @@ bool parseXTokenResponse(QByteArray & data, Katabasis::Token &output, QString na
return false; return false;
} }
if(!getString(obj.value("Token"), output.token)) { if(!getString(obj.value("Token"), output.token)) {
qWarning() << "User Token is not a timestamp"; qWarning() << "User Token is not a string";
return false; return false;
} }
auto arrayVal = obj.value("DisplayClaims").toObject().value("xui"); auto arrayVal = obj.value("DisplayClaims").toObject().value("xui");

8
launcher/minecraft/auth/steps/MinecraftProfileStep.cpp
View File

@ -56,6 +56,14 @@ void MinecraftProfileStep::onRequestDone(
return; return;
} }
if (error != QNetworkReply::NoError) { if (error != QNetworkReply::NoError) {
qWarning() << "Error getting profile:";
qWarning() << " HTTP Status: " << requestor->httpStatus_;
qWarning() << " Internal error no.: " << error;
qWarning() << " Error string: " << requestor->errorString_;
qWarning() << " Response:";
qWarning() << QString::fromUtf8(data);
emit finished( emit finished(
AccountTaskState::STATE_FAILED_SOFT, AccountTaskState::STATE_FAILED_SOFT,
tr("Minecraft Java profile acquisition failed.") tr("Minecraft Java profile acquisition failed.")