From a6e3ed733618f0a866d3b1f865543680e511a275 Mon Sep 17 00:00:00 2001
From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
Date: Tue, 14 Mar 2017 15:28:22 +0100
Subject: [PATCH] device migration: emit MigrationEnded signal
Change-Id: I8e767772711d2158e911a34a99fb5550961c2e5e
---
src/ringdht/ringaccount.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp
index 8cedfa2b65..3c8d6c9274 100644
--- a/src/ringdht/ringaccount.cpp
+++ b/src/ringdht/ringaccount.cpp
@@ -1470,7 +1470,13 @@ RingAccount::loadAccount(const std::string& archive_password, const std::string&
migrateAccount(archive_password);
} else {
RING_WARN("[Account %s] archive present but no valid receipt: creating new device", getAccountID().c_str());
- initRingDevice(readArchive(archive_password));
+ try {
+ initRingDevice(readArchive(archive_password));
+ } catch (...) {
+ Migration::setState(accountID_, Migration::State::INVALID);
+ return;
+ }
+ Migration::setState(accountID_, Migration::State::SUCCESS);
}
Manager::instance().saveConfig();
}
--
GitLab