From 7ba5a812f1cb92f4429336a9d8b57bc8c87d1a7c Mon Sep 17 00:00:00 2001 From: Lukas Simon Date: Thu, 1 Feb 2024 15:50:04 +0100 Subject: [PATCH] Replace device activation during app installation with license validation --- daemon/modules/apps/src/impl/apps_impl.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/daemon/modules/apps/src/impl/apps_impl.cpp b/daemon/modules/apps/src/impl/apps_impl.cpp index 36099f070..fb0055d6d 100644 --- a/daemon/modules/apps/src/impl/apps_impl.cpp +++ b/daemon/modules/apps/src/impl/apps_impl.cpp @@ -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(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");