Skip to content
Snippets Groups Projects
Commit c6294d0d authored by Marton Ady's avatar Marton Ady
Browse files

replace updater fetch status with enum class

parent 4be48653
Branches
Tags molflow_v2.9.27
No related merge requests found
......@@ -193,7 +193,7 @@ int AppUpdater::RequestUpdateCheck() {
}
void AppUpdater::NotifyServerWarning() {
if (lastFetchStatus == FetchStatus::NONE) return; //didn't perform an update check yet
if (lastFetchStatus == FetchStatus::None) return; //didn't perform an update check yet
if (nbUpdateFailsInRow >= askAfterNbUpdateFails) {
// Issue the warning in a new window
if(!updateWarning) {
......@@ -311,20 +311,20 @@ void AppUpdater::PerformUpdateCheck(bool forceCheck) {
//availableUpdates.insert(availableUpdates.end(), availableUpdates_old.begin(), availableUpdates_old.end());
resultCategory = "updateCheck";
resultDetail << "updateCheck_" << applicationName << "_" << currentVersionId;
lastFetchStatus = FetchStatus::OKAY;
lastFetchStatus = FetchStatus::OK;
}
else { //parse error
errorState = true;
resultCategory = "parseError";
resultDetail << "parseError_" << parseResult.status << "_" << applicationName << "_" << currentVersionId;
lastFetchStatus = FetchStatus::PARSE_ERROR;
lastFetchStatus = FetchStatus::ParseError;
}
}
else { //download error
errorState = true;
resultCategory = "stringDownloadError";
resultDetail << "stringDownloadError_" << downloadResult << "_" << applicationName << "_" << currentVersionId;
lastFetchStatus = FetchStatus::DOWNLOAD_ERROR;
lastFetchStatus = FetchStatus::DownloadError;
}
//Send result for analytics
......@@ -1111,7 +1111,7 @@ void ManualUpdateCheckDialog::Refresh() {
}
else { // no updates found at startup, try again now
updater->PerformImmediateCheck();
if(updater->GetStatus() != (int)FetchStatus::OKAY){
if(updater->GetStatus() != FetchStatus::OK){
updateError = true;
}
if (updater->IsUpdateAvailable()) {
......
......@@ -193,11 +193,13 @@ private:
UpdateFoundDialog* foundWnd;
};
enum FetchStatus
enum class FetchStatus
{
NONE = 0,
DOWNLOAD_ERROR = 1,
OTHER_ERROR = 2, OKAY, PARSE_ERROR
None = 0,
DownloadError = 1,
OtherError = 2,
OK,
ParseError
};
class AppUpdater {
......@@ -235,7 +237,7 @@ private:
//Initialized by constructor:
int currentVersionId;
FetchStatus lastFetchStatus = FetchStatus::NONE;
FetchStatus lastFetchStatus = FetchStatus::None;
std::string applicationName;
std::string configFileName;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment