diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/core/function/DataObjectOperator.cpp | 6 | ||||
-rw-r--r-- | src/ui/struct/SettingsObject.cpp | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/core/function/DataObjectOperator.cpp b/src/core/function/DataObjectOperator.cpp index f1395152..1c7bd31a 100644 --- a/src/core/function/DataObjectOperator.cpp +++ b/src/core/function/DataObjectOperator.cpp @@ -62,6 +62,9 @@ GpgFrontend::DataObjectOperator::DataObjectOperator(int channel) std::string GpgFrontend::DataObjectOperator::SaveDataObj( const std::string& _key, const nlohmann::json& value) { + + LOG(INFO) << _("Save data object") << _key; + std::string _hash_obj_key = {}; if (_key.empty()) { _hash_obj_key = @@ -121,8 +124,11 @@ std::optional<nlohmann::json> GpgFrontend::DataObjectOperator::GetDataObject( auto decoded = encryption.removePadding(encryption.decode(encoded, hash_key_)); + LOG(INFO) << _("Load data object") << _key; + return nlohmann::json::parse(decoded.toStdString()); } catch (...) { + LOG(ERROR) << _("Failed to get data object") << _key; return {}; } } diff --git a/src/ui/struct/SettingsObject.cpp b/src/ui/struct/SettingsObject.cpp index 5405611e..63df0900 100644 --- a/src/ui/struct/SettingsObject.cpp +++ b/src/ui/struct/SettingsObject.cpp @@ -36,12 +36,11 @@ nlohmann::json& GpgFrontend::UI::SettingsObject::Check( this->nlohmann::json::operator=(nlohmann::json::object()); } - LOG(INFO) << "Checking key: " << key; - try { if (!this->nlohmann::json::contains(key) || this->nlohmann::json::at(key).is_null() || - this->nlohmann::json::at(key).type() != default_value.type()) { + this->nlohmann::json::at(key).type_name() != + default_value.type_name()) { LOG(INFO) << "Added missing key: " << key; if (default_value.is_null()) { LOG(WARNING) << "Default value is null, using empty object"; @@ -65,8 +64,6 @@ GpgFrontend::UI::SettingsObject GpgFrontend::UI::SettingsObject::Check( this->nlohmann::json::operator=(nlohmann::json::object()); } - LOG(INFO) << "Checking key: " << key; - if (!nlohmann::json::contains(key) || this->nlohmann::json::at(key).is_null() || this->nlohmann::json::at(key).type() != nlohmann::json::value_t::object) { |