Moved otaServerUrl and otaServerBranch into newsettings

This commit is contained in:
2021-12-29 15:29:48 +01:00
parent 6138c187f4
commit 2c1aca079f
5 changed files with 12 additions and 20 deletions

View File

@@ -167,10 +167,10 @@ namespace buildserver {
std::string get_descriptor_url(std::string base_url)
{
if (stringSettings.otaServerBranch.empty())
if (configs.otaServerBranch.value.empty())
return fmt::format("{}/otaDescriptor?username={}", base_url, configs.otaUsername.value);
else
return fmt::format("{}/otaDescriptor?username={}&branch={}", base_url, configs.otaUsername.value, stringSettings.otaServerBranch);
return fmt::format("{}/otaDescriptor?username={}&branch={}", base_url, configs.otaUsername.value, configs.otaServerBranch.value);
}
void parse_response_into_variables(std::string response)