1
0
Fork 0

Launcher: improve feedback entering invalid hangar URL.

Catch XML validation/parse errors, and mention the possibility that
the URL is not correct, in the feedback message.
This commit is contained in:
James Turner 2021-03-17 12:11:30 +00:00
parent 5ccae24f81
commit 85da09d5d5
2 changed files with 6 additions and 3 deletions

View file

@ -325,7 +325,9 @@ CatalogListModel::CatalogStatus CatalogListModel::translateStatusForCatalog(Cata
case Delegate::FAIL_NOT_FOUND: return NotFoundOnServer; case Delegate::FAIL_NOT_FOUND: return NotFoundOnServer;
case Delegate::FAIL_VERSION: return IncompatibleVersion; case Delegate::FAIL_VERSION: return IncompatibleVersion;
case Delegate::FAIL_HTTP_FORBIDDEN: return HTTPForbidden; case Delegate::FAIL_HTTP_FORBIDDEN: return HTTPForbidden;
case Delegate::FAIL_VALIDATION: return InvalidData; case Delegate::FAIL_VALIDATION:
case Delegate::FAIL_EXTRACT:
return InvalidData;
default: default:
return UnknownError; return UnknownError;
} }

View file

@ -139,8 +139,9 @@ Rectangle {
+ "(This is version %1)").arg(_launcher.versionString); + "(This is version %1)").arg(_launcher.versionString);
case FG.CatalogListModel.InvalidData: case FG.CatalogListModel.InvalidData:
return qsTr("The requested hangar seems to be invalid (damaged or incomplete). " return qsTr("The requested URL doesn't contain valid hangar data. "
+ "Please contact the hangar authors, or try again later"); + "Check you entered a valid hangar URL. If it's correct, "
+ "please contact the hangar authors, or try again later." );
default: default:
return qsTr("Unknown error: " + _addOns.catalogs.statusOfAddingCatalog); return qsTr("Unknown error: " + _addOns.catalogs.statusOfAddingCatalog);