jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

jamiaccount: remove account if import from backup is failing

Browse Source 
Change-Id: I18bbe04999e7fe92ec71672644bb2dc3fd725ec2
This commit is contained in:
Sébastien Blin
2019-11-04 10:57:51 -05:00
committed by Adrien Béraud
parent 8d06c9de37
commit eccacbc451
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/jamidht/jamiaccount.cpp
View File

@ -968,6 +968,7 @@ JamiAccount::loadAccount(const std::string& archive_password, const std::string&
acreds->scheme = "local";
acreds->uri = std::move(archivePath);
acreds->updateIdentity = id;
migrating = true;
}
creds = std::move(acreds);
} else {
@ -977,6 +978,7 @@ JamiAccount::loadAccount(const std::string& archive_password, const std::string&
}
creds->password = archive_password;
archiveHasPassword_ = !archive_password.empty();
bool isManaged = !managerUri_.empty();
accountManager_->initAuthentication(
std::move(fReq),
@ -1019,13 +1021,15 @@ JamiAccount::loadAccount(const std::string& archive_password, const std::string&
setRegistrationState(RegistrationState::UNREGISTERED);
saveConfig();
doRegister();
}, [w = weak(), id = getAccountID()](AccountManager::AuthError error, const std::string& message) {
}, [w = weak(), id = getAccountID(), isManaged, migrating](AccountManager::AuthError error, const std::string& message) {
JAMI_WARN("[Account %s] Auth error: %d %s", id.c_str(), (int)error, message.c_str());
if (error == AccountManager::AuthError::INVALID_ARGUMENTS) {
if ((isManaged || migrating) && error == AccountManager::AuthError::INVALID_ARGUMENTS) {
// In cast of a migration or manager connexion failure stop the migration and block the account
Migration::setState(id, Migration::State::INVALID);
if (auto acc = w.lock())
acc->setRegistrationState(RegistrationState::ERROR_NEED_MIGRATION);
} else {
// In case of a DHT or backup import failure, just remove the account
if (auto acc = w.lock())
acc->setRegistrationState(RegistrationState::ERROR_GENERIC);
runOnMainThread([id = std::move(id)] {