From 1957f7cede5123b745516d5b2c6a6cddc35a28b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 31 Jan 2023 15:13:21 -0500
Subject: [PATCH] conversationrepository: use loadFile instead of loadTextFile
Seems loadTextFile is failing for files written on GNU/Linux and
loaded on Windows.
Change-Id: Idca4fc87f0039df26f97e8627c444ad518fd8dc8
GitLab: #810
---
src/jamidht/conversationrepository.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/jamidht/conversationrepository.cpp b/src/jamidht/conversationrepository.cpp
index 7944c82e47..de2eacc5c8 100644
--- a/src/jamidht/conversationrepository.cpp
+++ b/src/jamidht/conversationrepository.cpp
@@ -3481,7 +3481,7 @@ ConversationRepository::Impl::resolveBan(const std::string_view type, const std:
if (type != "devices") {
for (const auto& certificate : fileutils::readDirectory(devicesPath)) {
auto certPath = fileutils::getFullPath(devicesPath, certificate);
- auto deviceCert = fileutils::loadTextFile(certPath);
+ auto deviceCert = fileutils::loadFile(certPath);
try {
crypto::Certificate cert(deviceCert);
if (auto issuer = cert.issuer)
@@ -3798,8 +3798,8 @@ ConversationRepository::infos() const
auto profilePath = repoPath + "profile.vcf";
std::map<std::string, std::string> result;
if (fileutils::isFile(profilePath)) {
- auto content = fileutils::loadTextFile(profilePath);
- result = ConversationRepository::infosFromVCard(vCard::utils::toMap(content));
+ auto content = fileutils::loadFile(profilePath);
+ result = ConversationRepository::infosFromVCard(vCard::utils::toMap(std::string_view {(const char*)content.data(), content.size()}));
}
result["mode"] = std::to_string(static_cast<int>(mode()));
return result;
--
GitLab