mirror of
https://git.jami.net/savoirfairelinux/jami-daemon.git
synced 2025-08-07 22:02:12 +08:00
jamiaccount: cleanup
Change-Id: I5a126b0172108f1af15438f933a280236d839b23
This commit is contained in:

committed by
Adrien Béraud

parent
123fd551a4
commit
a8b1354d3f
@ -1345,7 +1345,7 @@ JamiAccount::loadAccount(const std::string& archive_password_scheme,
|
||||
acreds->uri = archive_path;
|
||||
} else if (!conf.archive_url.empty() && conf.archive_url == "jami-auth") {
|
||||
// Importing over a Peer2Peer TLS connection with DHT as DNS
|
||||
JAMI_DEBUG("[JamiAccount] [LinkDevice] scheme p2p & uri {}", conf.archive_url);
|
||||
JAMI_DEBUG("[Account {}] [LinkDevice] scheme p2p & uri {}", getAccountID(), conf.archive_url);
|
||||
acreds->scheme = "p2p";
|
||||
acreds->uri = conf.archive_url;
|
||||
} else if (!archive_pin.empty()) {
|
||||
@ -1412,7 +1412,9 @@ JamiAccount::loadAccount(const std::string& archive_password_scheme,
|
||||
|
||||
if (not conf.managerUri.empty()) {
|
||||
conf.registeredName = conf.managerUsername;
|
||||
#if HAVE_RINGNS
|
||||
registeredName_ = conf.managerUsername;
|
||||
#endif
|
||||
}
|
||||
conf.username = info.accountId;
|
||||
conf.deviceName = accountManager_->getAccountDeviceName();
|
||||
|
Reference in New Issue
Block a user