migration: do not overwrite settings during migration

Change-Id: I9c0fbf2afe1fff0d3c5816203824dd7d004d85c6

src/jamidht/archive_account_manager.cpp

@@ -286,6 +286,8 @@ ArchiveAccountManager::migrateAccount(AuthContext& ctx)
         return;
     }
 
+    updateArchive(archive);
+
     if (updateCertificates(archive, ctx.credentials->updateIdentity)) {
         onArchiveLoaded(ctx, std::move(archive));
     } else

src/jamidht/jamiaccount.cpp

@@ -995,11 +995,11 @@ JamiAccount::loadAccount(const std::string& archive_password, const std::string&
                     ringDeviceName_ = info.deviceId.substr(8);
 
                 auto nameServerIt = config.find(DRing::Account::ConfProperties::RingNS::URI);
-                if (nameServerIt != config.end()) {
+                if (nameServerIt != config.end() && !nameServerIt->second.empty()) {
                     nameServer_ = nameServerIt->second;
                 }
                 auto displayNameIt = config.find(DRing::Account::ConfProperties::DISPLAYNAME);
-                if (displayNameIt != config.end()) {
+                if (displayNameIt != config.end() && !displayNameIt->second.empty()) {
                     displayName_ = displayNameIt->second;
                 }