diff --git a/electron-projects/ucap-webmessenger-electron/src/index.ts b/electron-projects/ucap-webmessenger-electron/src/index.ts index b8d3935b..73bbcf9e 100644 --- a/electron-projects/ucap-webmessenger-electron/src/index.ts +++ b/electron-projects/ucap-webmessenger-electron/src/index.ts @@ -47,7 +47,11 @@ import { } from '@ucap-webmessenger/native'; import { ElectronAppChannel } from '@ucap-webmessenger/electron-core'; -import { autoUpdater, CancellationToken } from 'electron-updater'; +import { + autoUpdater, + CancellationToken, + UpdateCheckResult +} from 'electron-updater'; import log from 'electron-log'; import { RendererUpdater } from './lib/renderer-updater'; @@ -124,6 +128,7 @@ let rendererUpdater: RendererUpdater | undefined; log.transports.file.level = 'debug'; let autoUpdaterCancellationToken: CancellationToken; +let updateCheckResult: UpdateCheckResult; autoUpdater.autoDownload = false; autoUpdater.logger = log; @@ -299,6 +304,8 @@ app.on(ElectronAppChannel.Ready, () => { }, onDenyUpdate: () => { log.info('OnDenyUpdate'); + + updateCheckResult.cancellationToken.cancel(); updateWindowService.close(); }, onCancelDownload: () => { @@ -353,20 +360,19 @@ function onDidLoad(fn: OnDidLoadFn) { } ipcMain.on(UpdaterChannel.Apply, (event: IpcMainEvent, ...args: any[]) => { - // if (__DEV__) { - // event.returnValue = false; - // return; - // } + if (!autoUpdater.isUpdaterActive()) { + log.info('autoUpdater is not active'); + return; + } const ver = args[0]; if (semver.lt(app.getVersion(), ver)) { - autoUpdater - .checkForUpdatesAndNotify() - .then(result => {}) - .catch(reason => { - log.error(reason); - }); + updateCheckResult = undefined; + autoUpdater.checkForUpdatesAndNotify().then(r => { + log.debug('checkForUpdatesAndNotify.then'); + updateCheckResult = r; + }); } }); @@ -770,6 +776,8 @@ autoUpdater.on('update-not-available', info => { log.info('Update not available.'); }); autoUpdater.on('error', err => { + updateWindowService.close(); + log.info('Error in auto-updater. ' + err); }); autoUpdater.on('download-progress', progressObj => { diff --git a/package.json b/package.json index 3f20a6b8..6343ed6d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ucap-webmessenger", - "version": "0.0.14", + "version": "0.0.13", "author": { "name": "LG CNS", "email": "lgucap@lgcns.com" diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html index e59e270a..3fcf99a9 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html @@ -5,8 +5,10 @@
DS Talk
+ *ngIf="!!loginRes" + (search)="onIntegratedSearch($event)" + class="input-lineless integrated-search" + >
@@ -498,7 +501,7 @@