From 1740df6218a41e818927f8a1b81e9c5c3b683a73 Mon Sep 17 00:00:00 2001
From: Thomas Nordquist <xxnerowingerxx@gmail.com>
Date: Sun, 17 Feb 2019 13:14:02 +0100
Subject: [PATCH] Fix legacy connection profile migration

---
 app/src/actions/ConnectionManager.ts | 7 ++++---
 app/src/model/ConnectionOptions.ts   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/actions/ConnectionManager.ts b/app/src/actions/ConnectionManager.ts
index 4d3d9d5..7b8c084 100644
--- a/app/src/actions/ConnectionManager.ts
+++ b/app/src/actions/ConnectionManager.ts
@@ -2,7 +2,7 @@ import { AppState } from '../reducers'
 import { ConnectionOptions, createEmptyConnection, makeDefaultConnections } from '../model/ConnectionOptions'
 import { default as persistantStorage, StorageIdentifier } from '../PersistantStorage'
 import { Dispatch } from 'redux'
-import { loadLegacyConnectionOptions } from '../model/LegacyConnectionSettings'
+import { loadLegacyConnectionOptions, clearLegacyConnectionOptions } from '../model/LegacyConnectionSettings'
 import {
   ActionTypes,
   Action,
@@ -92,17 +92,18 @@ export const deleteConnection = (connectionId: string) => (dispatch: Dispatch<an
   }
 }
 
-export function ensureConnectionsHaveBeenInitialized() {
+function ensureConnectionsHaveBeenInitialized() {
   const connections = persistantStorage.load(storedConnectionsIdentifier)
 
   const requiresInitialization = !connections
   if (requiresInitialization) {
-    console.log('requires initialization')
     const migratedConnection = loadLegacyConnectionOptions()
     const defaultConnections = makeDefaultConnections()
     persistantStorage.store(storedConnectionsIdentifier, {
       ...migratedConnection,
       ...defaultConnections,
     })
+
+    clearLegacyConnectionOptions()
   }
 }
diff --git a/app/src/model/ConnectionOptions.ts b/app/src/model/ConnectionOptions.ts
index 43086c9..0a5ca13 100644
--- a/app/src/model/ConnectionOptions.ts
+++ b/app/src/model/ConnectionOptions.ts
@@ -55,7 +55,7 @@ export function createEmptyConnection(): ConnectionOptions {
   }
 }
 
-export function defaultConnections() {
+export function makeDefaultConnections() {
   return {
     'iot.eclipse.org': {
       ...createEmptyConnection(),