From 9725082b06f24fb6a4f61223be2edcdbc0886b3d Mon Sep 17 00:00:00 2001
From: David Sparer <David.Sparer@pearson.com>
Date: Tue, 9 May 2017 11:58:30 -0600
Subject: [PATCH] hooked up the cred upgrader form to the connections loader
 code

---
 .../Connections/XmlConnectionsLoader.cs       | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/mRemoteV1/Config/Connections/XmlConnectionsLoader.cs b/mRemoteV1/Config/Connections/XmlConnectionsLoader.cs
index 1e37a6592..10df253d9 100644
--- a/mRemoteV1/Config/Connections/XmlConnectionsLoader.cs
+++ b/mRemoteV1/Config/Connections/XmlConnectionsLoader.cs
@@ -9,6 +9,7 @@ using mRemoteNG.Config.Serializers.Versioning;
 using mRemoteNG.Credential;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
+using mRemoteNG.UI.Forms;
 
 namespace mRemoteNG.Config.Connections
 {
@@ -16,8 +17,7 @@ namespace mRemoteNG.Config.Connections
     {
         private readonly string _connectionFilePath;
         private readonly IEnumerable<ICredentialRecord> _credentialRecords;
-        private readonly string _credentialFilePath = Path.Combine(CredentialsFileInfo.CredentialsPath,
-            CredentialsFileInfo.CredentialsFile);
+        private readonly string _credentialFilePath = Path.Combine(CredentialsFileInfo.CredentialsPath, CredentialsFileInfo.CredentialsFile);
 
         public XmlConnectionsLoader(string connectionFilePath, IEnumerable<ICredentialRecord> credentialRecords)
         {
@@ -35,11 +35,16 @@ namespace mRemoteNG.Config.Connections
             var dataProvider = new FileDataProvider(_connectionFilePath);
             var xmlString = dataProvider.Load();
             var credServiceFactory = new CredentialServiceFactory();
-            var deserializer = new XmlCredentialManagerUpgrader(
-                credServiceFactory.Build(),
-                _credentialFilePath,
-                new XmlConnectionsDeserializer(_credentialRecords, PromptForPassword)
-            );
+            var deserializer = new CredentialManagerUpgradeForm
+            {
+                ConnectionFilePath = _connectionFilePath,
+                NewCredentialRepoPath = _credentialFilePath,
+                DecoratedDeserializer = new XmlCredentialManagerUpgrader(
+                    credServiceFactory.Build(),
+                    _credentialFilePath,
+                    new XmlConnectionsDeserializer(_credentialRecords, PromptForPassword)
+                )
+            };
             return deserializer.Deserialize(xmlString);
         }