Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
J
jami-daemon
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
120
Issues
120
List
Boards
Labels
Milestones
Security & Compliance
Security & Compliance
Dependency List
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-daemon
Commits
a6e3ed73
Commit
a6e3ed73
authored
Mar 14, 2017
by
Adrien Béraud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
device migration: emit MigrationEnded signal
Change-Id: I8e767772711d2158e911a34a99fb5550961c2e5e
parent
0eed7ec5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
src/ringdht/ringaccount.cpp
src/ringdht/ringaccount.cpp
+7
-1
No files found.
src/ringdht/ringaccount.cpp
View file @
a6e3ed73
...
...
@@ -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
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment