Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

FLX-507 remove device activation from app installation #727

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions daemon/modules/apps/src/impl/apps_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,12 @@ auto apps_t::do_install_from_marketplace(apps::key_t app_key, jobs::progress_t&
progress.num_steps(8);
progress.next_step("Verifying device activation");
auto device_api = std::dynamic_pointer_cast<module::device_t>(api::query_module("device"));
const auto [res, message] = device_api->activate_license();
if (res != 0) {
return {-1, "Device not activated and no activations remaining"};
const auto [res, message] = device_api->validate_license();
if (res == 0) {
return {-1, "Device not activated"};
}
if (res != 1) {
return {-1, "Device activation could not be verified: " + message};
}

progress.next_step("Downloading manifest");
Expand Down
Loading