From 6d83e1d4d38709f929a0324bb271c55b893c8d39 Mon Sep 17 00:00:00 2001 From: timoreo Date: Tue, 12 Dec 2023 19:38:48 +0100 Subject: [PATCH] Fix keys upload --- source/matrixclient.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/source/matrixclient.cpp b/source/matrixclient.cpp index 43e78a6..3ee5fcb 100644 --- a/source/matrixclient.cpp +++ b/source/matrixclient.cpp @@ -967,23 +967,20 @@ json_t* Client::get_device_keys() { size_t acclen = acc.get_identity_json_length(); std::unique_ptr acckeys = std::make_unique(acclen); size_t bytes = acc.get_identity_json(acckeys.get(), acclen); - std::cout << "Parsing bytes" << std::endl; json_error_t error; - sleep(5); - std::cout << "Heading into it..." << std::endl; json_t* keys = json_loadb(reinterpret_cast(acckeys.get()), bytes, 0, &error); if (keys == nullptr) { printf("error: on line %d at char %d: %s\n", error.line, error.column, error.text); sleep(10); } - std::cout << "Reloaded data" << std::endl; - std::cout << "Adding bits" << std::endl; // Merge keys - json_object_set(device_keys, ("ed25519:" + getDeviceId()).c_str(), json_object_get(keys, "ed25519")); - json_object_set(device_keys, ("curve25519:" + getDeviceId()).c_str(), json_object_get(keys, "curve25519")); + json_t* keysobj = json_object(); + json_object_set(keysobj, ("ed25519:" + getDeviceId()).c_str(), json_object_get(keys, "ed25519")); + json_object_set(keysobj, ("curve25519:" + getDeviceId()).c_str(), json_object_get(keys, "curve25519")); json_decref(keys); - std::cout << "Finalizing" << std::endl; + + json_object_set_new(device_keys, "keys", keysobj); return device_keys; } json_t* Client::get_fallback_keys() {