device migration: emit MigrationEnded signal

Change-Id: I8e767772711d2158e911a34a99fb5550961c2e5e

device migration: emit MigrationEnded signal
Change-Id: I8e767772711d2158e911a34a99fb5550961c2e5e
a6e3ed73 · Adrien Béraud · 0eed7ec5 · a6e3ed73
Commit a6e3ed73 authored Mar 14, 2017 by Adrien Béraud
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

src/ringdht/ringaccount.cpp src/ringdht/ringaccount.cpp +7 -1

No files found.
--- 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();
            }