diff --git a/app/controllers/about-controller.js b/app/controllers/about-controller.js index 8d1fb7d..af27329 100644 --- a/app/controllers/about-controller.js +++ b/app/controllers/about-controller.js @@ -1,8 +1,13 @@ const angApp = (await import('../init.js')).default; -angApp.controller('AboutController', function($scope, AppStateService, AppInfo) { +angApp.controller('AboutController', function ($scope, AppStateService, AppInfo, DesktopService) { - $scope.appInfo = AppInfo + $scope.appInfo = AppInfo; + $scope.converseVersion = 'unknown'; + DesktopService.getConverseVersion().then((version) => { + $scope.converseVersion = version; + $scope.$apply(); + }); $scope.closeAbout = () => { AppStateService.set(AppStateService.APP_STATE_DEFAULT) diff --git a/app/init.js b/app/init.js index 06d647b..d7e23c4 100644 --- a/app/init.js +++ b/app/init.js @@ -5,7 +5,6 @@ angApp.constant('AppInfo', { APP_HOME: 'https://github.com/conversejs/converse-desktop', APP_RELEASES_CHECK_URL: 'https://api.github.com/repos/conversejs/converse-desktop/releases', APP_RELEASES_URL: 'https://github.com/conversejs/converse-desktop/releases', - CONVERSE_VERSION: 'v9.0.0', ELECTRON_VERSION: '13.6.6' }); diff --git a/app/services/desktop-service.js b/app/services/desktop-service.js index 2e757e2..61a357d 100644 --- a/app/services/desktop-service.js +++ b/app/services/desktop-service.js @@ -2,11 +2,26 @@ const angApp = (await import('../init.js')).default; const desktopPlugin = (await import('../../libs/converse.js/converse-desktop/desktop-plugin.js')).default; angApp.factory('DesktopService', ( - $window, $timeout, CredentialsService, SystemService, AppStateService, - SettingsService, XmppHelperService - ) => { + $window, $timeout, CredentialsService, SystemService, AppStateService, + SettingsService, XmppHelperService +) => { let desktopService = {} + let promise = new Promise((resolve) => { + function checkVersion() { + if (converse.getVersion) { + resolve(converse.getVersion()); + } else { + $timeout(checkVersion, 50); + } + } + + $timeout(checkVersion, 50); + }); + + desktopService.getConverseVersion = () => { + return promise; + }; desktopService._notifyMessage = () => { SystemService.playAudio() @@ -36,8 +51,8 @@ angApp.factory('DesktopService', ( let omemoDefault = SettingsService.get('omemoDefault') let xmppResource = XmppHelperService.getResourceFromJid(login) if (!xmppResource) { - xmppResource = '.' + (Math.random().toString(36)+'00000000000000000').slice(2, 7) // Generate 5 char unique str - login = login + '/converseDesktop'+xmppResource + xmppResource = '.' + (Math.random().toString(36) + '00000000000000000').slice(2, 7) // Generate 5 char unique str + login = login + '/converseDesktop' + xmppResource } let conversejsParams = { assets_path: './node_modules/converse.js/dist/', @@ -60,7 +75,7 @@ angApp.factory('DesktopService', ( conversejsParams.bosh_service_url = connectionManager } $timeout(() => { - converse.initialize(conversejsParams) + converse.initialize(conversejsParams); }, 50) } diff --git a/app/views/about/page.html b/app/views/about/page.html index a959743..470998b 100644 --- a/app/views/about/page.html +++ b/app/views/about/page.html @@ -10,7 +10,7 @@