diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp index b3a553290b9591395e9697f4fa93015654008a84..4f3397103a994de208251c0919622b85c0fd6b0b 100644 --- a/src/jamidht/jamiaccount.cpp +++ b/src/jamidht/jamiaccount.cpp @@ -1981,6 +1981,7 @@ JamiAccount::doRegister() JAMI_DBG("[Account %s] Starting account..", getAccountID().c_str()); + /** / JAMI_INFO("[Account %s] Start loading conversations…", getAccountID().c_str()); auto conversationsRepositories = fileutils::readDirectory(idPath_ + DIR_SEPARATOR_STR + "conversations"); @@ -1998,6 +1999,7 @@ JamiAccount::doRegister() loadConvInfos(); loadConvRequests(); JAMI_INFO("[Account %s] Conversations loaded!", getAccountID().c_str()); + /**/ // invalid state transitions: // INITIALIZING: generating/loading certificates, can't register @@ -2333,7 +2335,8 @@ JamiAccount::doRegister_() context.identityAnnouncedCb = [this](bool ok) { if (!ok) return; - accountManager_->startSync([this](const std::shared_ptr<dht::crypto::Certificate>& crt) { + accountManager_->startSync({}); + /*[this](const std::shared_ptr<dht::crypto::Certificate>& crt) { if (!crt) return; auto deviceId = crt->getId().toString(); @@ -2357,7 +2360,7 @@ JamiAccount::doRegister_() if (socket) syncWith(deviceId.toString(), socket); }); - }); + });*/ }; setRegistrationState(RegistrationState::TRYING); @@ -2402,7 +2405,7 @@ JamiAccount::doRegister_() return true; } else if (name == "sip") { return true; - } else if (name.find("sync://") == 0) { + } /*else if (name.find("sync://") == 0) { // Check if sync request is from same account std::promise<bool> accept; std::future<bool> fut = accept.get_future(); @@ -2420,7 +2423,7 @@ JamiAccount::doRegister_() fut.wait(); auto result = fut.get(); return result; - } else if (isFile or isVCard) { + } */else if (isFile or isVCard) { auto tid_str = isFile ? name.substr(7) : name.substr(8); uint64_t tid; std::istringstream iss(tid_str); @@ -2445,9 +2448,9 @@ JamiAccount::doRegister_() auto isVCard = name.substr(0, 8) == "vcard://"; if (name == "sip") { cacheSIPConnection(std::move(channel), peerId, deviceId); - } else if (name.find("sync://") == 0) { + } /*else if (name.find("sync://") == 0) { cacheSyncConnection(std::move(channel), peerId, deviceId); - } else if (isFile or isVCard) { + }*/ else if (isFile or isVCard) { auto tid_str = isFile ? name.substr(7) : name.substr(8); std::unique_lock<std::mutex> lk(transfersMtx_); auto it = incomingFileTransfers_.find(tid_str);