From 0fbca6861cbafcc95d9fe16069651e853023b7c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 21 Jul 2021 15:40:38 -0400
Subject: [PATCH] jamiaccount: finish convInfos transition
Change-Id: I9c320f52a4eea7cd5af6df67375f20cd7936511a
GitLab: #455
---
src/jamidht/jamiaccount.cpp | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index d4f8199277..83dc2b9fae 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -5138,7 +5138,6 @@ void
JamiAccount::loadConvInfos()
{
std::map<std::string, ConvInfo> convInfos;
- std::vector<ConvInfo> oldCi; // TODO remove when public beta, just to avoid to break
try {
// read file
auto file = fileutils::loadFile("convInfo", idPath_);
@@ -5146,20 +5145,8 @@ JamiAccount::loadConvInfos()
msgpack::object_handle oh = msgpack::unpack((const char*) file.data(), file.size());
oh.get().convert(convInfos);
} catch (const std::exception& e) {
- // TODO remove when public beta, just to avoid to break
- try {
- // read file
- auto file = fileutils::loadFile("convInfo", idPath_);
- // load values
- msgpack::object_handle oh = msgpack::unpack((const char*) file.data(), file.size());
- oh.get().convert(oldCi);
- for (auto ci : oldCi) {
- convInfos[ci.id] = ci;
- }
- } catch (const std::exception& e) {
- JAMI_WARN("[convInfo] error loading convInfo: %s", e.what());
- return;
- }
+ JAMI_WARN("[convInfo] error loading convInfo: %s", e.what());
+ return;
}
for (auto& [key, info] : convInfos) {
--
GitLab