From a411d21133d0d4164ae1ea634f081a7f77ed4d8c Mon Sep 17 00:00:00 2001
From: Thomas Nordquist <xxnerowingerxx@gmail.com>
Date: Thu, 2 May 2019 08:40:56 +0200
Subject: [PATCH] Fix auto update

---
 backend/src/index.ts | 18 ------------------
 events/Events.ts     |  4 ----
 src/autoUpdater.ts   | 13 +++++--------
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/backend/src/index.ts b/backend/src/index.ts
index 39aea1e..93ec108 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -1,18 +1,14 @@
 import { Base64Message } from './Model/Base64Message'
 import { DataSource, MqttSource } from './DataSource'
-import { UpdateInfo } from 'builder-util-runtime'
 import {
   AddMqttConnection,
-  EventDispatcher,
   MqttMessage,
   addMqttConnectionEvent,
   backendEvents,
-  checkForUpdates,
   makeConnectionMessageEvent,
   makeConnectionStateEvent,
   makePublishEvent,
   removeConnection,
-  updateAvailable
 } from '../../events'
 
 export class ConnectionManager {
@@ -76,17 +72,3 @@ export class ConnectionManager {
       .forEach(conenctionId => this.removeConnection(conenctionId))
   }
 }
-
-class UpdateNotifier {
-  public onCheckUpdateRequest = new EventDispatcher<void, UpdateNotifier>()
-  constructor() {
-    backendEvents.subscribe(checkForUpdates, () => {
-      this.onCheckUpdateRequest.dispatch()
-    })
-  }
-  public notify(updateInfo: UpdateInfo) {
-    backendEvents.emit(updateAvailable, updateInfo)
-  }
-}
-
-export const updateNotifier = new UpdateNotifier()
diff --git a/events/Events.ts b/events/Events.ts
index 0f9d305..5ad47a4 100644
--- a/events/Events.ts
+++ b/events/Events.ts
@@ -28,10 +28,6 @@ export function makeConnectionStateEvent(connectionId: string): Event<DataSource
   }
 }
 
-export const checkForUpdates: Event<void> = {
-  topic: 'app/update/check',
-}
-
 export const updateAvailable: Event<UpdateInfo> = {
   topic: 'app/update/available',
 }
diff --git a/src/autoUpdater.ts b/src/autoUpdater.ts
index 44958e7..84056fd 100644
--- a/src/autoUpdater.ts
+++ b/src/autoUpdater.ts
@@ -1,7 +1,6 @@
 import { autoUpdater } from 'electron-updater'
 import { BuildInfo } from 'electron-telemetry/build/Model'
 import { UpdateInfo } from '../events'
-import { updateNotifier } from '../backend/src/index'
 
 export function shouldAutoUpdate(build: BuildInfo) {
   return build.package !== 'portable'
@@ -16,11 +15,9 @@ export function handleAutoUpdate() {
     console.log('could not update due to error')
   })
 
-  updateNotifier.onCheckUpdateRequest.subscribe(() => {
-    try {
-      autoUpdater.checkForUpdatesAndNotify()
-    } catch (error) {
-      console.error(error)
-    }
-  })
+  try {
+    autoUpdater.checkForUpdatesAndNotify()
+  } catch (error) {
+    console.error(error)
+  }
 }