From 1af799789d44634a92e50b9a05c90a8837eed8d9 Mon Sep 17 00:00:00 2001 From: Thomas Nordquist Date: Sun, 16 Jun 2019 21:29:37 +0200 Subject: [PATCH] Only migrate eclipse mqtt server when not using ssl --- app/src/actions/ConnectionManager.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/actions/ConnectionManager.ts b/app/src/actions/ConnectionManager.ts index 063bcb1..b1b7951 100644 --- a/app/src/actions/ConnectionManager.ts +++ b/app/src/actions/ConnectionManager.ts @@ -194,7 +194,13 @@ async function ensureConnectionsHaveBeenInitialized() { function addMigratedConnection(newConnections: { [key: string]: ConnectionOptions }, connection: ConnectionOptions) { // The host has been renamed, only change the host if it has not been changed - if (connection.id === 'iot.eclipse.org' && connection.host === 'iot.eclipse.org') { + // Also check for ssl since SSL is not yet working + if ( + connection.id === 'iot.eclipse.org' && + connection.host === 'iot.eclipse.org' && + connection.port === 1883 && + !connection.encryption + ) { connection.id = 'mqtt.eclipse.org' connection.host = 'mqtt.eclipse.org' connection.name = 'mqtt.eclipse.org'